From d1c758ed3163531627b663911af1506e60d643a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=2E=20Stani=C4=87?= Date: Tue, 17 Oct 2023 21:46:58 +0200 Subject: [PATCH 1/6] doc: build: update description of build dependencies for Alpine Linux MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Milan P. Stanić Reviewed-by: Simon Glass Reformat and keep ncurses-dev needed for 'make menuconfig' Signed-off-by: Heinrich Schuchardt --- doc/build/gcc.rst | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/doc/build/gcc.rst b/doc/build/gcc.rst index a0650a51db4..23501dea376 100644 --- a/doc/build/gcc.rst +++ b/doc/build/gcc.rst @@ -60,8 +60,14 @@ For building U-Boot on Alpine Linux at least the following packages are needed: .. code-block:: bash - apk add alpine-sdk bc bison dtc flex linux-headers ncurses-dev \ - openssl-dev perl python3 py3-setuptools python3-dev sdl2-dev + apk add alpine-sdk bc bison dtc flex gnutls-dev linux-headers ncurses-dev \ + openssl-dev py3-elftools py3-setuptools python3-dev swig util-linux-dev + +Depending on the build target further packages may be needed: + +* sandbox with lcd: sdl2-dev +* riscv64 S-mode targests: opensbi +* some arm64 targets: arm-trusted-firmware Prerequisites ------------- From f83dd7d0295146fd6cf7fd8e9fea8ea842b3ce3c Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Wed, 18 Oct 2023 08:33:48 -0400 Subject: [PATCH 2/6] sphinx: Bump urllib3 version While unlikely to be a direct issue for us, urllib3 before 2.0.7 is vulnerable to CVE-2023-45803, so bump our version up. Reported-by: GitHub dependabot Signed-off-by: Tom Rini Reviewed-by: Heinrich Schuchardt --- doc/sphinx/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/sphinx/requirements.txt b/doc/sphinx/requirements.txt index 6d45a3fefff..39ececb96c2 100644 --- a/doc/sphinx/requirements.txt +++ b/doc/sphinx/requirements.txt @@ -23,4 +23,4 @@ sphinxcontrib-htmlhelp==2.0.0 sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.3 sphinxcontrib-serializinghtml==1.1.5 -urllib3==2.0.6 +urllib3==2.0.7 From 63507f9f1f8b3506e21fec78a6cd8d99fe8de2a2 Mon Sep 17 00:00:00 2001 From: Dylan Corrales Date: Thu, 19 Oct 2023 10:02:30 -0400 Subject: [PATCH 3/6] doc: Replace dm_dump_all() with dm_dump_tree() Replace dm_dump_all() with dm_dump_tree() in driver model documentation, to reflect changes introduced in commit 145287040480 ("dm: core: Rename dm_dump_all()"). Fixes: 145287040480 ("dm: core: Rename dm_dump_all()") Signed-off-by: Dylan Corrales Reviewed-by: Mattijs Korpershoek Reivewed-by: Heinrich Schuchardt --- doc/develop/driver-model/debugging.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/develop/driver-model/debugging.rst b/doc/develop/driver-model/debugging.rst index bbb2794340f..e13abddae66 100644 --- a/doc/develop/driver-model/debugging.rst +++ b/doc/develop/driver-model/debugging.rst @@ -49,7 +49,7 @@ to see errors. Common ones are: of_to_plat() method in the driver. If there is no error, you should check if the device is actually bound. Call -dm_dump_all() just before you locate the device to make sure it exists. +dm_dump_tree() just before you locate the device to make sure it exists. If it does not exist, check your device tree compatible strings match up with what the driver expects (in the struct udevice_id array). From 4416a9c7692e5bd9838e4d6149619dd787257cfb Mon Sep 17 00:00:00 2001 From: Tom Fitzhenry Date: Tue, 24 Oct 2023 22:59:06 +1100 Subject: [PATCH 4/6] doc: gpt: fix example of echoing variable Fixes: 44c5d7764bf4 ("doc: Add gpt command documentation") Signed-off-by: Tom Fitzhenry Reviewed-by: Simon Glass Signed-off-by: Heinrich Schuchardt --- doc/usage/cmd/gpt.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/usage/cmd/gpt.rst b/doc/usage/cmd/gpt.rst index f6115ecb0ee..cbbe44ab58d 100644 --- a/doc/usage/cmd/gpt.rst +++ b/doc/usage/cmd/gpt.rst @@ -156,6 +156,7 @@ read', 'gpt swap' and 'gpt rename', you must specify CONFIG_CMD_GPT_RENAME=y. Examples ~~~~~~~~ + Create 6 partitions on a disk:: => setenv gpt_parts 'uuid_disk=bec9fc2a-86c1-483d-8a0e-0109732277d7; @@ -192,10 +193,9 @@ Get the information about the partition named 'rootfs':: Get the list of partition names on the disk:: => gpt enumerate - => echo gpt_partition_list + => echo ${gpt_partition_list} boot rootfs system-data [ext] user modules ramdisk - Get the GUID for a disk:: => gpt guid mmc 0 @@ -209,6 +209,7 @@ Set the bootable flag for the 'boot' partition and clear it for all others:: => gpt set-bootable mmc 0 boot Swap the order of the 'boot' and 'rootfs' partition table entries:: + => gpt setenv mmc 0 rootfs => echo ${gpt_partition_entry} 2 From 526697d01cdfd5a9fdf505e934dd6f5131918c43 Mon Sep 17 00:00:00 2001 From: Tom Fitzhenry Date: Tue, 24 Oct 2023 23:03:00 +1100 Subject: [PATCH 5/6] doc: usage: fix ordering of shell commands I initially didn't find the bootz docs when I went looking for them. :) Signed-off-by: Tom Fitzhenry Reviewed-by: Simon Glass Reviewed-by: Heinrich Schuchardt --- doc/usage/index.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/usage/index.rst b/doc/usage/index.rst index 98b4719c408..839589c2147 100644 --- a/doc/usage/index.rst +++ b/doc/usage/index.rst @@ -37,8 +37,8 @@ Shell commands cmd/bootm cmd/bootmenu cmd/bootmeth - cmd/button cmd/bootz + cmd/button cmd/cat cmd/cbsysinfo cmd/cedit @@ -56,8 +56,8 @@ Shell commands cmd/env cmd/event cmd/exception - cmd/extension cmd/exit + cmd/extension cmd/false cmd/fatinfo cmd/fatload @@ -93,15 +93,15 @@ Shell commands cmd/rng cmd/saves cmd/sbi - cmd/sf cmd/scp03 cmd/seama cmd/setexpr + cmd/sf cmd/size cmd/sleep + cmd/sm cmd/sound cmd/source - cmd/sm cmd/temperature cmd/tftpput cmd/trace From 946b311e47da22e409f2b0af5a3930db465e7eb8 Mon Sep 17 00:00:00 2001 From: Ilias Apalodimas Date: Thu, 19 Oct 2023 11:21:55 -0500 Subject: [PATCH 6/6] efi_loader: fix EFI_ENTRY point on get_active_pcr_banks efi_tcg2_get_active_pcr_banks doesn't immediately call the EFI_ENTRY() wrapper once it enters the function. Move the call a few lines above to cover the error cases properly as well. Signed-off-by: Ilias Apalodimas Reviewed-by: Heinrich Schuchardt --- lib/efi_loader/efi_tcg2.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/efi_loader/efi_tcg2.c b/lib/efi_loader/efi_tcg2.c index 7b7926a0d46..626df12a377 100644 --- a/lib/efi_loader/efi_tcg2.c +++ b/lib/efi_loader/efi_tcg2.c @@ -1211,12 +1211,13 @@ efi_tcg2_get_active_pcr_banks(struct efi_tcg2_protocol *this, { efi_status_t ret; + EFI_ENTRY("%p, %p", this, active_pcr_banks); + if (!this || !active_pcr_banks) { ret = EFI_INVALID_PARAMETER; goto out; } - EFI_ENTRY("%p, %p", this, active_pcr_banks); ret = __get_active_pcr_banks(active_pcr_banks); out: