leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge tag 'efi-2021-10-rc2' of https://source.denx.de/u-boot/custodians/u-boot-efi

Browse Source 
Pull request for efi-2021-10-rc2

Documentation:

* handle 'make htmldocs' warnings as errors
* add missing board/ti/index.rst

Bug fixes:

* avoid buffer overrun in TrueType console
* lib: disable CONFIG_SPL_HEXDUMP by default
This commit is contained in:
Tom Rini
2021-08-02 08:54:23 -04:00
parent 99bb5f248a 78e6b871fd
commit 73994c452f
9 changed files with 54 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/Makefile
View File

@@ -6,7 +6,7 @@ subdir-y :=
# You can set these variables from the command line.
SPHINXBUILD = sphinx-build
SPHINXOPTS =
SPHINXOPTS = -W
SPHINXDIRS = .
_SPHINXDIRS = $(patsubst $(srctree)/doc/%/conf.py,%,$(wildcard $(srctree)/doc/*/conf.py))
SPHINX_CONF = conf.py

20
doc/board/sifive/unleashed.rst
View File

@@ -456,21 +456,21 @@ device tree blob (hifive-unleashed-a00.dtb)
Format the SD card (make sure the disk has GPT, otherwise use gdisk to switch)
.. code-block:: none
.. code-block:: bash
# sudo sgdisk --clear \
> --set-alignment=2 \
> --new=1:34:2081 --change-name=1:loader1 --typecode=1:5B193300-FC78-40CD-8002-E86C45580B47 \
> --new=2:2082:10273 --change-name=2:loader2 --typecode=2:2E54B353-1271-4842-806F-E436D6AF6985 \
> --new=3:10274: --change-name=3:rootfs --typecode=3:0FC63DAF-8483-4772-8E79-3D69D8477DE4 \
> /dev/sda
sudo sgdisk --clear \
--set-alignment=2 \
--new=1:34:2081 --change-name=1:loader1 --typecode=1:5B193300-FC78-40CD-8002-E86C45580B47 \
--new=2:2082:10273 --change-name=2:loader2 --typecode=2:2E54B353-1271-4842-806F-E436D6AF6985 \
--new=3:10274: --change-name=3:rootfs --typecode=3:0FC63DAF-8483-4772-8E79-3D69D8477DE4 \
/dev/sdX
Program the SD card
.. code-block:: none
.. code-block:: bash
sudo dd if=spl/u-boot-spl.bin of=/dev/sda seek=34
sudo dd if=u-boot.itb of=/dev/sda seek=2082
sudo dd if=spl/u-boot-spl.bin of=/dev/sdX seek=34
sudo dd if=u-boot.itb of=/dev/sdX seek=2082
Booting
~~~~~~~

30
doc/board/sifive/unmatched.rst
View File

@@ -61,31 +61,31 @@ device tree blob (hifive-unmatched-a00.dtb)
Format the SD card (make sure the disk has GPT, otherwise use gdisk to switch)
.. code-block:: none
.. code-block:: bash
# sudo sgdisk -g --clear -a 1 \
> --new=1:34:2081 --change-name=1:spl --typecode=1:5B193300-FC78-40CD-8002-E86C45580B47 \
> --new=2:2082:10273 --change-name=2:uboot --typecode=2:2E54B353-1271-4842-806F-E436D6AF6985 \
> --new=3:16384:282623 --change-name=3:boot --typecode=3:0x0700 \
> --new=4:286720:13918207 --change-name=4:root --typecode=4:0x8300 \
> /dev/sdb
sudo sgdisk -g --clear -a 1 \
--new=1:34:2081 --change-name=1:spl --typecode=1:5B193300-FC78-40CD-8002-E86C45580B47 \
--new=2:2082:10273 --change-name=2:uboot --typecode=2:2E54B353-1271-4842-806F-E436D6AF6985 \
--new=3:16384:282623 --change-name=3:boot --typecode=3:0x0700 \
--new=4:286720:13918207 --change-name=4:root --typecode=4:0x8300 \
/dev/sdX
Copy linux Image.gz and hifive-unmatched-a00.dtb to boot partition
.. code-block:: none
.. code-block:: bash
sudo mkfs.vfat /dev/sdb3
sudo mkfs.ext4 /dev/sdb4
sudo mkfs.vfat /dev/sdX3
sudo mkfs.ext4 /dev/sdX4
sudo mount /dev/sdb3 /media/sdb3
sudo cp Image.gz hifive-unmatched-a00.dtb /media/sdb3/
sudo mount /dev/sdX3 /media/sdX3
sudo cp Image.gz hifive-unmatched-a00.dtb /media/sdX3/
Program the SD card
.. code-block:: none
.. code-block:: bash
sudo dd if=spl/u-boot-spl.bin of=/dev/sda seek=34
sudo dd if=u-boot.itb of=/dev/sda seek=2082
sudo dd if=spl/u-boot-spl.bin of=/dev/sdX seek=34
sudo dd if=u-boot.itb of=/dev/sdX seek=2082
Booting
-------

9
doc/board/ti/index.rst Normal file
View File

@@ -0,0 +1,9 @@
.. SPDX-License-Identifier: GPL-2.0+
Texas Instruments
=================
.. toctree::
:maxdepth: 2
j721e_evm

6
doc/build/gcc.rst vendored
View File

@@ -24,9 +24,9 @@ Depending on the build targets further packages maybe needed
.. code-block:: bash
sudo apt-get install bc bison build-essential coccinelle \
device-tree-compiler dfu-util efitools flex gdisk liblz4-tool \
libguestfs-tools libncurses-dev libpython3-dev libsdl2-dev libssl-dev \
lz4 lzma lzma-alone openssl python3 python3-coverage \
device-tree-compiler dfu-util efitools flex gdisk graphviz imagemagick \
liblz4-tool libguestfs-tools libncurses-dev libpython3-dev libsdl2-dev \
libssl-dev lz4 lzma lzma-alone openssl python3 python3-coverage \
python3-pycryptodome python3-pyelftools python3-pytest \
python3-sphinxcontrib.apidoc python3-sphinx-rtd-theme python3-virtualenv \
swig