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 -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEK7wKXt3/btL6/yA+hO4vgnE3U0sFAmEHkH0ACgkQhO4vgnE3 U0tTbg//WNWkO66IHDj8aBePNP2SKaRgXrRd/FP20flm38lokaDySu0cVQeONdwJ 19NNz/2ScuX2EA1ZR96ozC+p2WI2HkXHVzNtXJ8u18yxxFxPAnLZHtoS6RPpp6Vd aWC9cDG1zPeUev+ja8g075snslcADBY3idZ+Y2u0NvHfAygutibLcvRCHaA8Guns R2nIZqbfGwKQ0fr1x1I7Yso9HxWMFJ2fp1srvAXDEUVumvVLRib0J49cDU2KgmhV MK0UXQfAYYfObklyDnsdQBf4lh30fzKuvZmoBKIDDurSxj59/c9HIG4SKhb/6V63 qLtJ/hI+lHbQ5XmJ+CZvSszwesZG6y/s9ysZHuDR0XUtRdglW380DFQFNiyCkhPJ LGoNg7eSatElFtUCLshFKHfAkemol7HwXRTZd5O7wo2xZ0a87HmVQbYq6J+tSg8q SybuTTfitDQptDREghw58tU1HGKcBpzYVwDlQY3jUjEvQudqkwa7UsBdYWOsDlK2 aszUA6AGu2pRAv7dOL1Hf6fULJ2YLNaMphZELSR20UPkv9HkWo+AZYVbA6g7XkdH UC52nqnSTbZKi9+QzwnFv/lZZ4C9mu+PnxT/nldq9ZJsIDcshdIQTlDCbxY33BFy E8v0KTCdJSPsZNBOD3+tygv1A0SiGmvvCYF87/HQccn5tzJhSEM= =1toh -----END PGP SIGNATURE----- Merge tag 'efi-2021-10-rc2' of https://source.denx.de/u-boot/custodians/u-boot-efi 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
2021-08-02 08:54:23 -04:00 · 2021-08-02 08:54:23 -04:00 · 73994c452f
commit 73994c452f
parent 99bb5f248a 78e6b871fd
9 changed files with 54 additions and 46 deletions
--- a/configs/sandbox_spl_defconfig
+++ b/configs/sandbox_spl_defconfig
@ -224,6 +224,8 @@ CONFIG_RSA_VERIFY_WITH_PKEY=y
 CONFIG_TPM=y
 CONFIG_LZ4=y
 CONFIG_ERRNO_STR=y
+CONFIG_HEXDUMP=y
+CONFIG_SPL_HEXDUMP=y
 CONFIG_UNIT_TEST=y
 CONFIG_SPL_UNIT_TEST=y
 CONFIG_UT_TIME=y
--- a/doc/Makefile
+++ b/doc/Makefile
@ -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
--- a/doc/board/sifive/unleashed.rst
+++ b/doc/board/sifive/unleashed.rst
@ -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
 ~~~~~~~
--- a/doc/board/sifive/unmatched.rst
+++ b/doc/board/sifive/unmatched.rst
@ -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
 -------
--- a/doc/board/ti/index.rst
+++ b/doc/board/ti/index.rst
@ -0,0 +1,9 @@
+.. SPDX-License-Identifier: GPL-2.0+
+
+Texas Instruments
+=================
+
+.. toctree::
+   :maxdepth: 2
+
+   j721e_evm
--- a/doc/build/gcc.rst
+++ b/doc/build/gcc.rst
@ -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
--- a/drivers/video/console_truetype.c
+++ b/drivers/video/console_truetype.c
@ -128,38 +128,36 @@ static int console_truetype_set_row(struct udevice *dev, uint row, int clr)
 	struct video_priv *vid_priv = dev_get_uclass_priv(dev->parent);
 	struct console_tt_priv *priv = dev_get_priv(dev);
 	void *end, *line;
-	int pixels = priv->font_size * vid_priv->line_length;
-	int i, ret;
+	int ret;

 	line = vid_priv->fb + row * priv->font_size * vid_priv->line_length;
+	end = line + priv->font_size * vid_priv->line_length;
+
 	switch (vid_priv->bpix) {
 #ifdef CONFIG_VIDEO_BPP8
 	case VIDEO_BPP8: {
-		uint8_t *dst = line;
+		u8 *dst;

-		for (i = 0; i < pixels; i++)
-			*dst++ = clr;
-		end = dst;
+		for (dst = line; dst < (u8 *)end; ++dst)
+			*dst = clr;
 		break;
 	}
 #endif
 #ifdef CONFIG_VIDEO_BPP16
 	case VIDEO_BPP16: {
-		uint16_t *dst = line;
+		u16 *dst = line;

-		for (i = 0; i < pixels; i++)
-			*dst++ = clr;
-		end = dst;
+		for (dst = line; dst < (u16 *)end; ++dst)
+			*dst = clr;
 		break;
 	}
 #endif
 #ifdef CONFIG_VIDEO_BPP32
 	case VIDEO_BPP32: {
-		uint32_t *dst = line;
+		u32 *dst = line;

-		for (i = 0; i < pixels; i++)
-			*dst++ = clr;
-		end = dst;
+		for (dst = line; dst < (u32 *)end; ++dst)
+			*dst = clr;
 		break;
 	}
 #endif
--- a/lib/Kconfig
+++ b/lib/Kconfig
@ -566,8 +566,7 @@ config HEXDUMP

 config SPL_HEXDUMP
 	bool "Enable hexdump in SPL"
-	depends on HEXDUMP
-	default y
+	depends on SPL && HEXDUMP
 	help
 	  This enables functions for printing dumps of binary data in
 	  SPL.
--- a/lib/efi_loader/Makefile
+++ b/lib/efi_loader/Makefile
@ -23,7 +23,7 @@ endif
 ifeq ($(CONFIG_EFI_CAPSULE_AUTHENTICATE),y)
 EFI_CAPSULE_KEY_PATH := $(subst $\",,$(CONFIG_EFI_CAPSULE_KEY_PATH))
 ifeq ("$(wildcard $(EFI_CAPSULE_KEY_PATH))","")
-$(error .esl cerificate not found. Configure your CONFIG_EFI_CAPSULE_KEY_PATH)
+$(error .esl certificate not found. Configure your CONFIG_EFI_CAPSULE_KEY_PATH)
 endif
 endif