January 2025 - U-Boot

[PATCH v2 00/44] test: Improvements to ut command and test-suite running
by Simon Glass 24 Jan '25

24 Jan '25

The current method of running unit tests relies on subcommands of the ut command. Only the code in each subcommand knows how to find the tests related to that subcomand. This is not ideal and we now have quite a few subcommands which do nothing but locate the relevant tests in a linker list, then call a common function to run them. This series adds a list of test suites, so that these subcommands can be removed. An issue with 'ut all' is that it doesn't record how many tests failed overall, so it is necessary to examine copious amounts of output to look for failures. This series adds a new 'total' feature allow recording the total number of failed tests. To help with 'ut all' a new pytest is created which runs it (as well as 'ut info') and makes sure that all is well. Due to the 'ut all' failures this does not pass, so the test is disabled for now. It is here because it provides security against misnaming a test suite and causing it not to run. Future work may: - get 'ut all' passing - enable test_suite() in CL, to ensure that 'ut all' keeps passing - record duration of each suite - allow running the tests in random order to tease out dependencies - tweak the output to remove common prefixes - getting rid of bootstd, optee and seame 'ut' subcommands Changes in v2: - Correct linker-list documentation - Add a little more debugging - Strip lines before processing - Correct the comment on collect_info() - Show a better assertion message with missing/extra suites - Tidy up the comments for struct suite - Show a message when a suite is not compiled in - Adjust ut_report() to take a run-count - Add missing comment for 'total' - Add new patch to update ut documentation - Drop patch to disable test_suite.py Simon Glass (44): test: Drop unused suite prototypes test: Rename test_get_state() to ut_get_state() test: Add functions to init and uninit the test state test: Pass the test-state into ut_run_list() Improve support for linker lists in data structures test: Add newlines to hush-test messages test: Rename test suites to match their linker-list name test: Update ut info to show suites test/py: Add a test which runs all unit tests test: Drop the _test suffix on linker lists test: Introduce a better array of test suites test: Drop the function for running bdinfo tests test: Drop the function for running cmd tests test: Drop the function for running common tests test: Drop the function for running dm tests test: Drop the function for running env tests test: Drop the function for running exit tests test: Drop the function for running fdt tests test: Drop the function for running font tests test: Drop the function for running lib tests test: Drop the function for running log tests test: Drop the function for running mbr tests test: Drop the function for running mem tests test: Drop the function for running setexpr tests test: Drop the function for running measurement tests test: Drop the function for running bloblist tests test: Drop the function for running bootm tests test: Drop the function for running addrmap tests test: Drop the function for running hush tests test: Drop the function for running loadm tests test: Drop the function for running pci_mps tests test: Drop the function for running seama tests test: Drop the function for running upl tests test: Drop the info test from the list test: Drop conditional compilation for suites test: Pass the test state to cmd_ut_category() test: Move stats into a struct test: Keep a track of the numbers of tests run test: Move stat-printing into its own function test: Record and show the totals for all test runs test: Sort the test suites test: Disable test_suite test: Move help into the suite declaration doc: Update ut documentation arch/sandbox/cpu/spl.c | 6 +- doc/usage/cmd/ut.rst | 74 +++---- include/dm/test.h | 2 +- include/linker_lists.h | 57 ++++++ include/test/cmd.h | 2 +- include/test/common.h | 2 +- include/test/env.h | 2 +- include/test/hush.h | 2 +- include/test/lib.h | 2 +- include/test/log.h | 4 +- include/test/optee.h | 2 +- include/test/overlay.h | 2 +- include/test/suites.h | 53 ++--- include/test/test.h | 24 ++- include/test/ut.h | 45 ++++- test/boot/bootm.c | 11 +- test/boot/bootstd_common.c | 9 +- test/boot/bootstd_common.h | 3 +- test/boot/measurement.c | 12 +- test/boot/upl.c | 11 +- test/cmd/Makefile | 4 +- test/cmd/addrmap.c | 11 +- test/cmd/bdinfo.c | 10 +- test/cmd/cmd_ut_cmd.c | 20 -- test/cmd/exit.c | 11 +- test/cmd/fdt.c | 10 +- test/cmd/font.c | 10 +- test/cmd/loadm.c | 11 +- test/cmd/mbr.c | 10 +- test/cmd/mem.c | 19 -- test/cmd/mem_copy.c | 2 +- test/cmd/mem_search.c | 2 +- test/cmd/pci_mps.c | 12 +- test/cmd/seama.c | 11 +- test/cmd/setexpr.c | 11 +- test/cmd_ut.c | 366 +++++++++++++++++++++------------- test/common/Makefile | 1 - test/common/bloblist.c | 12 +- test/common/cmd_ut_common.c | 21 -- test/dm/Makefile | 2 - test/dm/test-dm.c | 16 -- test/dm/test-driver.c | 10 +- test/dm/test-uclass.c | 8 +- test/env/cmd_ut_env.c | 10 - test/hush/Makefile | 1 - test/hush/cmd_ut_hush.c | 19 -- test/hush/dollar.c | 7 +- test/hush/loop.c | 4 +- test/lib/Makefile | 1 - test/lib/cmd_ut_lib.c | 19 -- test/log/Makefile | 2 - test/log/log_ut.c | 20 -- test/optee/cmd_ut_optee.c | 4 +- test/overlay/cmd_ut_overlay.c | 14 +- test/py/conftest.py | 7 +- test/py/tests/test_spl.py | 2 +- test/py/tests/test_suite.py | 188 +++++++++++++++++ test/py/tests/test_upl.py | 2 +- test/py/tests/test_ut.py | 2 +- test/py/tests/test_vbe.py | 2 +- test/py/tests/test_vpl.py | 2 +- test/test-main.c | 106 ++++++---- test/ut.c | 4 +- 63 files changed, 715 insertions(+), 616 deletions(-) delete mode 100644 test/cmd/cmd_ut_cmd.c delete mode 100644 test/cmd/mem.c delete mode 100644 test/common/cmd_ut_common.c delete mode 100644 test/dm/test-dm.c delete mode 100644 test/hush/cmd_ut_hush.c delete mode 100644 test/lib/cmd_ut_lib.c delete mode 100644 test/log/log_ut.c create mode 100644 test/py/tests/test_suite.py -- 2.43.0

3 48

[PATCH v2 1/1] test: str_ut.c depends on CONFIG_STRTO
by Heinrich Schuchardt 24 Jan '25

24 Jan '25

The string conversion functions are implemented in lib/strto.c which is only compiled if CONFIG_STRTO=y. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- v2: rebased on origin/master --- test/lib/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/lib/Makefile b/test/lib/Makefile index 24ce6ed8f00..f15a76cec2e 100644 --- a/test/lib/Makefile +++ b/test/lib/Makefile @@ -17,7 +17,7 @@ obj-y += lmb.o obj-$(CONFIG_HAVE_SETJMP) += longjmp.o obj-$(CONFIG_CONSOLE_RECORD) += test_print.o obj-$(CONFIG_SSCANF) += sscanf.o -obj-$(CONFIG_$(XPL_)CMDLINE) += str.o +obj-$(CONFIG_$(PHASE_)STRTO) += str.o obj-y += string.o obj-y += strlcat.o obj-$(CONFIG_ERRNO_STR) += test_errno_str.o -- 2.47.1

2 1

[PATCH] arm64: configs: Remove obsolete TI config
by Aashvij Shenai 24 Jan '25

24 Jan '25

This config is causing conflicts with how fdtfile variable is initialized. For K3 devices, CONFIG_DEFAULT_DEVICE_TREE= "ti/k3-<board>.dtb". With CONFIG_TI_FDT_FOLDER_PATH also prefixing "ti", fdtfile is then "ti/ti/k3-<board>.dtb". This variable is updated when fitImage is booted and fails to boot due to the parsing error "ti/ti/". Given that there are no other users of this config other than K3 for now, it is being removed. Since am64x, j721e and j721s2 also define a DEFAULT_FDT_FILE, update them to conform to the DEFAULT_DEVICE_TREE standard. Signed-off-by: Aashvij Shenai <a-shenai(a)ti.com> --- board/beagle/beagleboneai64/beagleboneai64.c | 3 +-- board/beagle/beagleplay/beagleplay.c | 3 +-- board/ti/am64x/evm.c | 4 ++-- board/ti/common/Kconfig | 11 ----------- board/ti/common/fdt_ops.c | 9 +++------ board/ti/j721e/evm.c | 6 +++--- board/ti/j721s2/evm.c | 4 ++-- 7 files changed, 12 insertions(+), 28 deletions(-) diff --git a/board/beagle/beagleboneai64/beagleboneai64.c b/board/beagle/beagleboneai64/beagleboneai64.c index 1e43d1c1bd2..e8d07f1f95f 100644 --- a/board/beagle/beagleboneai64/beagleboneai64.c +++ b/board/beagle/beagleboneai64/beagleboneai64.c @@ -73,8 +73,7 @@ int board_late_init(void) { char fdtfile[50]; - snprintf(fdtfile, sizeof(fdtfile), "%s/%s.dtb", - CONFIG_TI_FDT_FOLDER_PATH, CONFIG_DEFAULT_DEVICE_TREE); + snprintf(fdtfile, sizeof(fdtfile), "%s.dtb", CONFIG_DEFAULT_DEVICE_TREE); env_set("fdtfile", fdtfile); diff --git a/board/beagle/beagleplay/beagleplay.c b/board/beagle/beagleplay/beagleplay.c index a21f09e3122..fae69b37585 100644 --- a/board/beagle/beagleplay/beagleplay.c +++ b/board/beagle/beagleplay/beagleplay.c @@ -69,8 +69,7 @@ int board_late_init(void) { char fdtfile[50]; - snprintf(fdtfile, sizeof(fdtfile), "%s/%s.dtb", - CONFIG_TI_FDT_FOLDER_PATH, CONFIG_DEFAULT_DEVICE_TREE); + snprintf(fdtfile, sizeof(fdtfile), "%s.dtb", CONFIG_DEFAULT_DEVICE_TREE); env_set("fdtfile", fdtfile); diff --git a/board/ti/am64x/evm.c b/board/ti/am64x/evm.c index 00b8317d6bf..c0033db2078 100644 --- a/board/ti/am64x/evm.c +++ b/board/ti/am64x/evm.c @@ -217,8 +217,8 @@ int checkboard(void) #ifdef CONFIG_BOARD_LATE_INIT static struct ti_fdt_map ti_am64_evm_fdt_map[] = { - {"am64x_gpevm", "k3-am642-evm.dtb"}, - {"am64x_skevm", "k3-am642-sk.dtb"}, + {"am64x_gpevm", "ti/k3-am642-evm.dtb"}, + {"am64x_skevm", "ti/k3-am642-sk.dtb"}, { /* Sentinel. */ } }; diff --git a/board/ti/common/Kconfig b/board/ti/common/Kconfig index de44e4de211..b8b691aa06c 100644 --- a/board/ti/common/Kconfig +++ b/board/ti/common/Kconfig @@ -50,14 +50,3 @@ config TI_COMMON_CMD_OPTIONS imply CMD_TIME imply CMD_USB if USB -config TI_FDT_FOLDER_PATH - string "Location of Folder path where dtb is present" - default "ti/davinci" if ARCH_DAVINCI - default "ti/keystone" if ARCH_KEYSTONE - default "ti/omap" if ARCH_OMAP2PLUS - default "ti" if ARCH_K3 - depends on ARCH_DAVINCI || ARCH_KEYSTONE || ARCH_OMAP2PLUS || ARCH_K3 - help - Folder path for kernel device tree default. - This is used along with fdtfile path to locate the kernel - device tree blob. diff --git a/board/ti/common/fdt_ops.c b/board/ti/common/fdt_ops.c index 8a3300993ed..47df5726ff0 100644 --- a/board/ti/common/fdt_ops.c +++ b/board/ti/common/fdt_ops.c @@ -35,17 +35,14 @@ void ti_set_fdt_env(const char *board_name, struct ti_fdt_map *fdt_map) */ #ifdef CONFIG_DEFAULT_FDT_FILE if (strlen(CONFIG_DEFAULT_FDT_FILE)) { - snprintf(fdtfile, sizeof(fdtfile), "%s/%s", - CONFIG_TI_FDT_FOLDER_PATH, CONFIG_DEFAULT_FDT_FILE); + snprintf(fdtfile, sizeof(fdtfile), "%s", CONFIG_DEFAULT_FDT_FILE); } else #endif { - snprintf(fdtfile, sizeof(fdtfile), "%s/%s.dtb", - CONFIG_TI_FDT_FOLDER_PATH, CONFIG_DEFAULT_DEVICE_TREE); + snprintf(fdtfile, sizeof(fdtfile), "%s.dtb", CONFIG_DEFAULT_DEVICE_TREE); } } else { - snprintf(fdtfile, sizeof(fdtfile), "%s/%s", CONFIG_TI_FDT_FOLDER_PATH, - fdt_file_name); + snprintf(fdtfile, sizeof(fdtfile), "%s", fdt_file_name); } env_set("fdtfile", fdtfile); diff --git a/board/ti/j721e/evm.c b/board/ti/j721e/evm.c index 6221be9dcff..c54816e9e18 100644 --- a/board/ti/j721e/evm.c +++ b/board/ti/j721e/evm.c @@ -395,9 +395,9 @@ static int probe_daughtercards(void) #ifdef CONFIG_BOARD_LATE_INIT static struct ti_fdt_map ti_j721e_evm_fdt_map[] = { - {"j721e", "k3-j721e-common-proc-board.dtb"}, - {"j721e-sk", "k3-j721e-sk.dtb"}, - {"j7200", "k3-j7200-common-proc-board.dtb"}, + {"j721e", "ti/k3-j721e-common-proc-board.dtb"}, + {"j721e-sk", "ti/k3-j721e-sk.dtb"}, + {"j7200", "ti/k3-j7200-common-proc-board.dtb"}, { /* Sentinel. */ } }; static void setup_board_eeprom_env(void) diff --git a/board/ti/j721s2/evm.c b/board/ti/j721s2/evm.c index 2cfeb3bec6c..6627e0ce466 100644 --- a/board/ti/j721s2/evm.c +++ b/board/ti/j721s2/evm.c @@ -116,8 +116,8 @@ int checkboard(void) } static struct ti_fdt_map ti_j721s2_evm_fdt_map[] = { - {"j721s2", "k3-j721s2-common-proc-board.dtb"}, - {"am68-sk", "k3-am68-sk-base-board.dtb"}, + {"j721s2", "ti/k3-j721s2-common-proc-board.dtb"}, + {"am68-sk", "ti/k3-am68-sk-base-board.dtb"}, { /* Sentinel. */ } }; -- 2.34.1

2 1

[PATCH] treewide: Replace Maximumm with Maximum in Kconfig symbol description
by Marek Vasut 24 Jan '25

24 Jan '25

Replace Maximumm with Maximum in Kconfig symbol description, fix a typo. No functional change. Signed-off-by: Marek Vasut <marek.vasut+renesas(a)mailbox.org> --- Cc: Anurag Dutta <a-dutta(a)ti.com> Cc: Christoph Niedermaier <cniedermaier(a)dh-electronics.com> Cc: Francesco Dolcini <francesco.dolcini(a)toradex.com> Cc: Heinrich Schuchardt <xypron.glpk(a)gmx.de> Cc: Hiago De Franco <hiago.franco(a)toradex.com> Cc: Joe Hershberger <joe.hershberger(a)ni.com> Cc: Michael Trimarchi <michael(a)amarulasolutions.com> Cc: Michal Simek <michal.simek(a)amd.com> Cc: Peter Robinson <pbrobinson(a)gmail.com> Cc: Quentin Schulz <quentin.schulz(a)cherry.de> Cc: Tom Rini <trini(a)konsulko.com> Cc: Venkatesh Yadav Abbarapu <venkatesh.abbarapu(a)amd.com> Cc: u-boot(a)lists.denx.de --- drivers/block/Kconfig | 2 +- drivers/mtd/Kconfig | 2 +- env/Kconfig | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig index cc75bad02b8..750b0bd2082 100644 --- a/drivers/block/Kconfig +++ b/drivers/block/Kconfig @@ -147,7 +147,7 @@ config IDE if IDE config SYS_IDE_MAXBUS - hex "Maximumm number of IDE buses" + hex "Maximum number of IDE buses" default 2 help This is the number of IDE buses provided by the board. Each one diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig index 185e8346213..2b7f5e5ed7b 100644 --- a/drivers/mtd/Kconfig +++ b/drivers/mtd/Kconfig @@ -216,7 +216,7 @@ config STM32_FLASH STM32 MCU. config SYS_MAX_FLASH_SECT - int "Maximumm number of sectors on a flash chip" + int "Maximum number of sectors on a flash chip" depends on MTD_NOR_FLASH || FLASH_CFI_DRIVER default 512 diff --git a/env/Kconfig b/env/Kconfig index aaf0b1fe9ac..4438f0b392c 100644 --- a/env/Kconfig +++ b/env/Kconfig @@ -60,7 +60,7 @@ config ENV_MIN_ENTRIES to store the environment settings. config ENV_MAX_ENTRIES - int "Maximumm number of entries in the environment hashtable" + int "Maximum number of entries in the environment hashtable" default 512 help Maximum number of entries in the hash table that is used internally -- 2.45.2

3 2

[PATCH 00/21] EFI driver to support multiple network interfaces
by Adriano Cordova 24 Jan '25

24 Jan '25

This series introduces an EFI driver to manage EFI net objects. The main functionalities implemented here are the following: - Support multiple efi_net_obj - Manage efi_net_obj with EFI driver - Support calling [dis]connect_controller with a handle having a snp protocol installed. The patches can be found at https://github.com/0n41rd4/u-boot/tree/efi-net-driver on top of upstream/next. Best regards, Adriano Adriano Cordova (21): legacy-net: wget: fix wget_info handling after new tcp legacy stack efi_loader: expose symbols to be used by the EFI network stack efi_loader: efi_setup: Add efi_start_obj_list() to efi_setup.c efi_loader: efi_net: Add efi_net_do_start() to efi_net.c efi_loader: efi_device_path: Let network device paths receive the net udevice as an argument efi_loader: efi_net: Add support for multiple efi_net_obj efi_driver: efi_net: Add EFI network device driver efi_loader: efi_net: Reuse efi_net_obj's efi_loader: efi_net: Let efi_net_obj store pointers to efi_simple_network, efi_simple_network_mode, and the efi handle efi_net: efi_loader: Add efi_netobj_alloc to allocate an efi_net_obj efi_loader: efi_net: Manage EFI net objects with efi_[dis]connect_controller eth_uclass: Add eth_create_device to create a net udevice efi_driver: efi_net: UCLASS_ETH "efi_netdev" U-Boot driver efi_driver: efi_uclass: Add unbind method to efi_driver_ops efi_driver: efi_net: Add efi_net_unbind_drv method to efi_net driver efi_loader: efi_net: Add functions to [un]register http and ip4_config2 protocols, and add pxe protocol on demand efi_loader: efi_net: add snp_owner field to efi_net_obj struct efi_selftest: Add selftest for counting EFI netdevices py/tests: test_efi_selftest: Add test for counting EFI netdevices py/tests: test_efi_selftest: Add test for removing EFI netdevices efi_selftest: Add test for efi_netdev driver include/efi_driver.h | 4 + include/efi_loader.h | 80 +- include/net-common.h | 3 + lib/efi_driver/Makefile | 1 + lib/efi_driver/efi_net_device.c | 289 ++++++ lib/efi_driver/efi_uclass.c | 6 +- lib/efi_loader/efi_bootbin.c | 3 +- lib/efi_loader/efi_boottime.c | 23 +- lib/efi_loader/efi_device_path.c | 23 +- lib/efi_loader/efi_http.c | 36 +- lib/efi_loader/efi_ipconfig.c | 41 +- lib/efi_loader/efi_net.c | 1063 ++++++++++++++++---- lib/efi_loader/efi_setup.c | 27 +- lib/efi_selftest/Makefile | 2 +- lib/efi_selftest/efi_selftest_net_device.c | 65 ++ lib/efi_selftest/efi_selftest_net_driver.c | 310 ++++++ lib/efi_selftest/efi_selftest_snp.c | 1 - net/eth-uclass.c | 32 + net/wget.c | 18 +- test/py/tests/test_efi_selftest.py | 45 + 20 files changed, 1810 insertions(+), 262 deletions(-) create mode 100644 lib/efi_driver/efi_net_device.c create mode 100644 lib/efi_selftest/efi_selftest_net_device.c create mode 100644 lib/efi_selftest/efi_selftest_net_driver.c -- 2.43.0

3 27

[PATCH v3 00/46] pxe: Support read_all() for extlinux and PXE
by Simon Glass 24 Jan '25

24 Jan '25

This series implements read_all() so that it is possible to read all the files relating to a bootflow, make adjustments and then boot. Unfortunately quite a few things stand in the way, so this series finishes off several pending items: zboot without CONFIG_CMDLINE, required support in pxe_utils and the differing code in the extlinux and PXE bootmeths. There is very little new code, but quite a lot of refactoring. The bootm, booti and bootz commands have all been refactored previously, so that they can operate without needing CONFIG_CMDLINE to be enabled. At the, time, zboot was left alone, since it is x86-specific and a bit more trouble. However it turns out that the booti support doesn't work with compressed booti images, so this series resolved that problem too. This series adds a programatic API for zboot and uses the forthcoming bootstd 'image list' to collect information from an extlinux file. It is therefore possible to parse the file, load the resulting images and then examine/adjust the resulting bootflow, before booting. The addition of options to extlinux resulted in the PXE and extlinux bootmeth having slightly different features. This is tidied up in this series, with common functions for both. This allows the same features (loading images as a separate step) to be provided for PXE. Changes in v3: - Add new patch to convert IMAGE_FORMAT into an enum - Add new patch to add a format for the booti file - Add new patch to support booti format in bootm - Add new patch to support compressed booti images in bootm - Pass through the bootfile since extlinux and PXE are different - Pass through the bootfile since extlinux and PXE are different - Add new patch to detect booti format properly in pxe_utils - Pass through the bootfile since extlinux and PXE are different Changes in v2: - Split out strlcpy() change into new patch - Move strlcpy() change into an earlier patch - Fix 'initaddr' typo' - Rebase on earlier change - Add new patch to simplify the code reading fdtcontroladdr and fdt_addr Simon Glass (46): x86: Make do_zboot_states() static x86: Rename zboot_run() to zboot_run_args() x86: Drop duplicate definition of zimage_dump() x86: Move x86 zboot state into struct bootm_info x86: Rename state to bmi x86: Move the bootm state for zimage into cmd/ bootstd: Correct display of kernel version x86: Drop the unnecessary base_ptr argument to zboot_dump() boot: Use strlcpy() in label_boot() boot: Split pxe label_boot() into two parts boot: Split pxe label_run_boot() into two parts boot: Pass just the FDT argument to label_process_fdt() bootm: Allow building bootm.c without CONFIG_SYS_BOOTM_LEN boot: Convert IMAGE_FORMAT into an enum boot: arm: riscv: sandbox: Add a format for the booti file boot: Support booti format in bootm boot: Support compressed booti images in bootm boot: pxe: Use bootm_...() functions where possible pxe_utils: Simplify default fdt in label_run_boot() boot: pxe: Refactor label_run_boot() to avoid cmdline net: Keep the bootstage functions together net: Tidy up the comments to parse_args() net: Simplify parse_args() net: Return the load address from parse_args() net: Return the address and size from parse_addr_size() net: Return the size from parse_args() net: Refactor part of netboot_common() into a function net: Drop #ifdef in parse_args() net: Provide a function to run network operations boot: Avoid using the cmdline in bootmeth_pxe and pxe cmd pxe: Drop the cmdline parameter pxe: Record the bootflow in the PXE context pxe: Allow skipping the boot test: Update bootm test to restore silent_console bootmeth_extlinux: Move extlinux_info into plat bootmeth_extlinux: Move pxe_context into plat bootmeth: Refactor to put options in a common file bootmeth_pxe: Implement the fallback option bootmeth_pxe: Drop the driver-private data bootmeth_extlinux: Move boot code into common file bootstd: Update extlinux and pxe to allow boot interruption pxe: Collect the FDT in the bootflow pxe: Deal with a missing FDT in the bootflow boot: Detect booti format properly in pxe_utils pxe_utils: Refactor to separate reading from booting bootmeth_extlinux: Refactor extlinux to split boot arch/arm/lib/image.c | 9 +- arch/riscv/lib/image.c | 9 +- arch/sandbox/lib/bootm.c | 5 + arch/x86/include/asm/zimage.h | 57 +--- arch/x86/lib/zimage.c | 102 ++++--- boot/Makefile | 6 +- boot/bootm.c | 76 ++++- boot/bootmeth_cros.c | 6 +- boot/bootmeth_extlinux.c | 98 +------ boot/bootmeth_pxe.c | 50 ++-- boot/ext_pxe_common.c | 139 +++++++++ boot/image-board.c | 36 +-- boot/pxe_utils.c | 513 +++++++++++++++++++++------------- cmd/bootflow.c | 8 +- cmd/net.c | 92 +++--- cmd/pxe.c | 30 +- cmd/sysboot.c | 4 +- cmd/x86/zboot.c | 33 ++- include/bootm.h | 63 ++++- include/bootmeth.h | 8 +- include/extlinux.h | 60 +++- include/image.h | 48 +++- include/net-common.h | 30 ++ include/pxe_utils.h | 56 +++- net/net.c | 44 +++ test/boot/bootflow.c | 71 +++++ test/boot/bootm.c | 7 + 27 files changed, 1127 insertions(+), 533 deletions(-) create mode 100644 boot/ext_pxe_common.c -- 2.34.1

3 99

[GIT PULL] Please pull u-boot-dfu-20250124
by Mattijs Korpershoek 24 Jan '25

24 Jan '25

Hi Tom, Please find some fixes for master: Android: - Fix kcmdline null pointer dereference (reported by coverity and multiple users) - Move Igor to reviewers instead of maintainers for avb/ab - Fix booting Android with AVB built-in, but disabled via fastboot flash --disable-verity vbmeta vbmeta.img CI Job: - https://source.denx.de/u-boot/custodians/u-boot-dfu/-/pipelines/24323 Thanks, Mattijs The following changes since commit a3b71cc6f5cc74d4edc5808790a3d2999ea3f7fe: Merge patch series "upl: Prerequite patches for updated spec" (2025-01-22 17:08:47 -0600) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-dfu.git tags/u-boot-dfu-20250124 for you to fetch changes up to 6745cbed6edc06fae7fbc4b360e39c3963d57b13: bootstd: android: Allow boot with AVB failures when unlocked (2025-01-23 15:23:05 +0100) ---------------------------------------------------------------- u-boot-dfu-20250124 Android: - Fix kcmdline null pointer dereference (reported by coverity and multiple users) - Move Igor to reviewers instead of maintainers for avb/ab - Fix booting Android with AVB built-in, but disabled via fastboot flash --disable-verity vbmeta vbmeta.img ---------------------------------------------------------------- Aaron Kling (1): boot: android: Check kcmdline's for NULL in android_image_get_kernel() Igor Opaniuk (1): MAINTAINERS: move myself to reviewers for avb/ab Mattijs Korpershoek (2): bootstd: android: Add missing NULL in the avb partition list bootstd: android: Allow boot with AVB failures when unlocked MAINTAINERS | 4 ++-- boot/bootmeth_android.c | 39 +++++++++++++++++++++++++-------------- boot/image-android.c | 8 ++++---- 3 files changed, 31 insertions(+), 20 deletions(-)

2 1

[PATCH v2 1/1] cmd: sbi: add bhyve SBI implementation ID
by Heinrich Schuchardt 24 Jan '25

24 Jan '25

Bhyve is the hypervisor used by FreeBSD. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- v2: Fix typo in subject --- cmd/riscv/sbi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/cmd/riscv/sbi.c b/cmd/riscv/sbi.c index 5ecf56781c1..b013c8c8d4e 100644 --- a/cmd/riscv/sbi.c +++ b/cmd/riscv/sbi.c @@ -30,6 +30,7 @@ static struct sbi_imp implementations[] = { { 8, "PolarFire Hart Software Services" }, { 9, "coreboot" }, { 10, "oreboot" }, + { 11, "bhyve" }, }; static struct sbi_ext extensions[] = { -- 2.47.1

1 0

[PATCH 1/1] cmd: sbi: add bhype SBI implementation
by Heinrich Schuchardt 24 Jan '25

24 Jan '25

Bhyve is the hypervisor used by FreeBSD. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- cmd/riscv/sbi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/cmd/riscv/sbi.c b/cmd/riscv/sbi.c index 5ecf56781c1..b013c8c8d4e 100644 --- a/cmd/riscv/sbi.c +++ b/cmd/riscv/sbi.c @@ -30,6 +30,7 @@ static struct sbi_imp implementations[] = { { 8, "PolarFire Hart Software Services" }, { 9, "coreboot" }, { 10, "oreboot" }, + { 11, "bhyve" }, }; static struct sbi_ext extensions[] = { -- 2.47.1

1 0

[PATCH v1] toradex: tdx-cfg-block: fix switch to user partition
by Stefan Eichenberger 24 Jan '25

24 Jan '25

From: Stefan Eichenberger <stefan.eichenberger(a)toradex.com> The Toradex configuration block is stored in the first boot partition of the eMMC. After reading the configuration block, U-Boot switches back to the user partition. Currently, this operation always targets mmc device 0, even when the configuration block is stored on mmc device 2. This patch addresses the issue by switching the mmc device set in CONFIG_TDX_CFG_BLOCK_DEV to the user partition, rather than using the hardcoded device 0. Fixes: a2777ecb9d11 ("toradex: config block handling") Signed-off-by: Stefan Eichenberger <stefan.eichenberger(a)toradex.com> --- board/toradex/common/tdx-cfg-block.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/toradex/common/tdx-cfg-block.c b/board/toradex/common/tdx-cfg-block.c index 3855e15b83b..b2149438b88 100644 --- a/board/toradex/common/tdx-cfg-block.c +++ b/board/toradex/common/tdx-cfg-block.c @@ -312,7 +312,7 @@ static int tdx_cfg_block_mmc_storage(u8 *config_block, int write) out: /* Switch back to regular eMMC user partition */ - blk_select_hwpart_devnum(UCLASS_MMC, 0, 0); + blk_select_hwpart_devnum(UCLASS_MMC, dev, 0); return ret; } -- 2.45.2

2 1