November 2023 - U-Boot

[PATCH v2 0/3] efi: Minor improvements for the EFI app
by Simon Glass 26 Dec '23

26 Dec '23

This series collects a few fixes and improvements useful when booting U-Boot as an EFI app. Changes in v2: - Drop duplicate acpi_xsdt patch - Put the board_early_init_r code into board/ Simon Glass (3): efi: Collect the ACPI tables in the app efi: Correct display of table GUIDs efi: Avoid using dm_scan_other() board/efi/efi-x86_app/Makefile | 5 + board/efi/efi-x86_app/efi_app.c | 205 ++++++++++++++++++++++++++++++++ cmd/efi_common.c | 4 +- configs/efi-x86_app64_defconfig | 1 + lib/efi/efi_app.c | 199 +++---------------------------- 5 files changed, 227 insertions(+), 187 deletions(-) create mode 100644 board/efi/efi-x86_app/Makefile create mode 100644 board/efi/efi-x86_app/efi_app.c -- 2.42.0.869.gea05f2083d-goog

4 14

[PATCH v2] fs: Fix SPL build if FS_LOADER is enabled
by Mayuresh Chitale 21 Dec '23

21 Dec '23

If FS_LOADER is enabled for the SPL then the build fails with the error: fs/fs.o:(.data.rel.fstypes+0x128): undefined reference to `smh_fs_set_blk_dev' fs/fs.o:(.data.rel.fstypes+0x140): undefined reference to `smh_fs_size' fs/fs.o:(.data.rel.fstypes+0x148): undefined reference to `smh_fs_read' fs/fs.o:(.data.rel.fstypes+0x150): undefined reference to `smh_fs_write' Fix the error by populating the semihosting entry in the fs_types array only for non-SPL builds. Signed-off-by: Mayuresh Chitale <mchitale(a)ventanamicro.com> --- Changes in v2: - Use CONFIG_IS_ENABLED instead of CONFIG_SPL_BUILD fs/fs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/fs.c b/fs/fs.c index 4cb4310c9c..5c27ae2fe1 100644 --- a/fs/fs.c +++ b/fs/fs.c @@ -256,7 +256,7 @@ static struct fstype_info fstypes[] = { .ln = fs_ln_unsupported, }, #endif -#ifdef CONFIG_SEMIHOSTING +#if CONFIG_IS_ENABLED(SEMIHOSTING) { .fstype = FS_TYPE_SEMIHOSTING, .name = "semihosting", -- 2.34.1

3 3

[PATCH 0/2 v2] Provide a fallback to smbios tables
by Ilias Apalodimas 21 Dec '23

21 Dec '23

Hi, Tom asked me to clean up and resend [0]. I've made some adjustments -- The DT nodes are tokenized and a single string is used. The DT node 'model' is used to fill the SMBIOS 'Product Name' and 'compatible' is used for 'Manufacturer'. The reason is explained in patch#2 but the tl;dr is that model doesn't always include the manufacturer despite the suggestions of the DT spec. [0] https://lore.kernel.org/u-boot/20220906134426.53748-1-ilias.apalodimas@lina… Ilias Apalodimas (2): smbios: Simplify reporting of unknown values smbios: Fallback to the default DT if sysinfo nodes are missing lib/smbios.c | 109 +++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 92 insertions(+), 17 deletions(-) -- 2.40.1

6 31

[PATCH] xilinx: Enable DNS/WGET and BLKMAP for http boot
by Michal Simek 21 Dec '23

21 Dec '23

Enable DNS/WGET and BLKMAP to be able to download images over HTTP and map them. Signed-off-by: Michal Simek <michal.simek(a)amd.com> --- Can be applied on v5 version of this when this is fixed https://lore.kernel.org/all/cc0cff36-359a-4c3b-9ba6-bce0834358bf@amd.com/ --- configs/xilinx_versal_net_virt_defconfig | 3 +++ configs/xilinx_versal_virt_defconfig | 3 +++ configs/xilinx_zynqmp_virt_defconfig | 4 ++++ 3 files changed, 10 insertions(+) diff --git a/configs/xilinx_versal_net_virt_defconfig b/configs/xilinx_versal_net_virt_defconfig index 62322af458d6..c190bf532705 100644 --- a/configs/xilinx_versal_net_virt_defconfig +++ b/configs/xilinx_versal_net_virt_defconfig @@ -46,6 +46,8 @@ CONFIG_CMD_USB=y CONFIG_BOOTP_MAY_FAIL=y CONFIG_BOOTP_BOOTFILESIZE=y CONFIG_CMD_TFTPPUT=y +CONFIG_CMD_WGET=y +CONFIG_CMD_DNS=y CONFIG_CMD_CACHE=y CONFIG_CMD_EFIDEBUG=y CONFIG_CMD_TIME=y @@ -69,6 +71,7 @@ CONFIG_NETCONSOLE=y CONFIG_IP_DEFRAG=y CONFIG_SYS_FAULT_ECHO_LINK_DOWN=y CONFIG_TFTP_BLOCKSIZE=4096 +CONFIG_BLKMAP=y CONFIG_CLK_VERSAL=y CONFIG_DFU_RAM=y CONFIG_ZYNQ_GPIO=y diff --git a/configs/xilinx_versal_virt_defconfig b/configs/xilinx_versal_virt_defconfig index 89566c7d52c0..5ee694a4ff73 100644 --- a/configs/xilinx_versal_virt_defconfig +++ b/configs/xilinx_versal_virt_defconfig @@ -47,6 +47,8 @@ CONFIG_CMD_USB=y CONFIG_BOOTP_MAY_FAIL=y CONFIG_BOOTP_BOOTFILESIZE=y CONFIG_CMD_TFTPPUT=y +CONFIG_CMD_WGET=y +CONFIG_CMD_DNS=y CONFIG_CMD_CACHE=y CONFIG_CMD_EFIDEBUG=y CONFIG_CMD_TIME=y @@ -71,6 +73,7 @@ CONFIG_NETCONSOLE=y CONFIG_IP_DEFRAG=y CONFIG_SYS_FAULT_ECHO_LINK_DOWN=y CONFIG_TFTP_BLOCKSIZE=4096 +CONFIG_BLKMAP=y CONFIG_CLK_VERSAL=y CONFIG_DFU_TIMEOUT=y CONFIG_DFU_RAM=y diff --git a/configs/xilinx_zynqmp_virt_defconfig b/configs/xilinx_zynqmp_virt_defconfig index 30e420951dad..d1bdea09ebab 100644 --- a/configs/xilinx_zynqmp_virt_defconfig +++ b/configs/xilinx_zynqmp_virt_defconfig @@ -82,6 +82,8 @@ CONFIG_CMD_USB_MASS_STORAGE=y CONFIG_BOOTP_MAY_FAIL=y CONFIG_BOOTP_BOOTFILESIZE=y CONFIG_CMD_TFTPPUT=y +CONFIG_CMD_WGET=y +CONFIG_CMD_DNS=y CONFIG_CMD_BMP=y CONFIG_CMD_CACHE=y CONFIG_CMD_EFIDEBUG=y @@ -119,6 +121,8 @@ CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_SATA=y CONFIG_SCSI_AHCI=y CONFIG_SATA_CEVA=y +# CONFIG_SPL_BLK is not set +CONFIG_BLKMAP=y CONFIG_BUTTON=y CONFIG_BUTTON_GPIO=y CONFIG_CLK_ZYNQMP=y -- 2.36.1

1 1

[PATCH] bootflow: Allow setting a cmdline arg with no value
by Simon Glass 20 Dec '23

20 Dec '23

This is supposed to be supported by the 'bootflow cmd' command, at least according to the help. There is a 'bootflow cmd clear' but it is often more intuitive to use 'bootcmd cmd set' with an empty value. Update the command to pass BOOTFLOWCL_EMPTY in this case. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- cmd/bootflow.c | 4 ++-- test/boot/bootflow.c | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cmd/bootflow.c b/cmd/bootflow.c index 3aeb40d690f..c6aa06b9ce9 100644 --- a/cmd/bootflow.c +++ b/cmd/bootflow.c @@ -524,9 +524,9 @@ static int do_bootflow_cmdline(struct cmd_tbl *cmdtp, int flag, int argc, op = argv[1]; arg = argv[2]; if (*op == 's') { - if (argc < 4) + if (argc < 3) return CMD_RET_USAGE; - val = argv[3]; + val = argv[3] ?: (const char *)BOOTFLOWCL_EMPTY; } switch (*op) { diff --git a/test/boot/bootflow.c b/test/boot/bootflow.c index b97c566f000..43cba3cc783 100644 --- a/test/boot/bootflow.c +++ b/test/boot/bootflow.c @@ -1013,6 +1013,10 @@ static int bootflow_cmdline(struct unit_test_state *uts) ut_asserteq(0, run_command("bootflow cmdline get mary", 0)); ut_assert_nextline_empty(); + ut_asserteq(0, run_command("bootflow cmdline set mary abc", 0)); + ut_asserteq(0, run_command("bootflow cmdline set mary", 0)); + ut_assert_nextline_empty(); + ut_assert_console_end(); return 0; -- 2.43.0.rc2.451.g8631bc7472-goog

2 1

[PATCH] bootm: Fix flags used for bootargs string substitution
by Piotr Kubik 20 Dec '23

20 Dec '23

Commit <51bb33846ad2> introduced a feature of bootargs string substitution and changed a flag used in bootm_process_cmdline_env() call to be either true or false. With this flag value, condition in bootm_process_cmdline() `if (flags & BOOTM_CL_SUBST)` is never true and process_subst() is never called. Signed-off-by: Piotr Kubik <piotr.kubik(a)iopsys.eu> --- boot/bootm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/boot/bootm.c b/boot/bootm.c index 8f96a80d42..e96489e549 100644 --- a/boot/bootm.c +++ b/boot/bootm.c @@ -778,7 +778,8 @@ int do_bootm_states(struct cmd_tbl *cmdtp, int flag, int argc, if (!ret && (states & BOOTM_STATE_OS_BD_T)) ret = boot_fn(BOOTM_STATE_OS_BD_T, argc, argv, images); if (!ret && (states & BOOTM_STATE_OS_PREP)) { - ret = bootm_process_cmdline_env(images->os.os == IH_OS_LINUX); + ret = bootm_process_cmdline_env(images->os.os == IH_OS_LINUX ? + BOOTM_CL_ALL : 0); if (ret) { printf("Cmdline setup failed (err=%d)\n", ret); ret = CMD_RET_FAILURE; -- 2.42.0

3 7

[PATCH 1/1] arm: afs: Set the filesize env. var. on load
by Robert Catherall 20 Dec '23

20 Dec '23

The `afs load` command copies data to RAM. Set the filesize environment variable to record how much data was 'loaded' Signed-off-by: Robert Catherall <robert.catherall(a)arm.com> --- cmd/armflash.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/cmd/armflash.c b/cmd/armflash.c index d1466f73aa..fdaea5ad81 100644 --- a/cmd/armflash.c +++ b/cmd/armflash.c @@ -180,6 +180,7 @@ static int load_image(const char * const name, const ulong address) { struct afs_image *afi = NULL; int i; + loff_t len_read = 0; parse_flash(); for (i = 0; i < num_afs_images; i++) { @@ -197,6 +198,7 @@ static int load_image(const char * const name, const ulong address) for (i = 0; i < afi->region_count; i++) { ulong from, to; + u32 size; from = afi->flash_mem_start + afi->regions[i].offset; if (address) { @@ -208,14 +210,20 @@ static int load_image(const char * const name, const ulong address) return CMD_RET_FAILURE; } - memcpy((void *)to, (void *)from, afi->regions[i].size); + size = afi->regions[i].size; + memcpy((void *)to, (void *)from, size); printf("loaded region %d from %08lX to %08lX, %08X bytes\n", i, from, to, - afi->regions[i].size); + size); + + len_read += size; } + + env_set_hex("filesize", len_read); + return CMD_RET_SUCCESS; } -- 2.17.1

3 2

[PATCH] rsa: use pkcs11 uri as defined in rfc7512
by Ayoub Zaki 20 Dec '23

20 Dec '23

pkcs11 : change engine uri to use full pk11-URI as defined in: https://www.rfc-editor.org/rfc/rfc7512.html Signed-off-by: Ayoub Zaki <ayoub.zaki(a)embetrix.com> --- doc/uImage.FIT/signature.txt | 2 +- lib/rsa/rsa-sign.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/uImage.FIT/signature.txt b/doc/uImage.FIT/signature.txt index c71280b63b..2ff0db3f98 100644 --- a/doc/uImage.FIT/signature.txt +++ b/doc/uImage.FIT/signature.txt @@ -681,7 +681,7 @@ $ ./tools/mkimage -f fit-image.its fitImage Sign the fitImage with the hardware key: $ ./tools/mkimage -F -k \ -"model=PKCS%2315%20emulated;manufacturer=ZeitControl;serial=000xxxxxxxxx;token=OpenPGP%20card%20%28User%20PIN%20%28sig%29%29" \ +"pkcs11:model=PKCS%2315%20emulated;manufacturer=ZeitControl;serial=000xxxxxxxxx;token=OpenPGP%20card%20%28User%20PIN%20%28sig%29%29" \ -K u-boot.dtb -N pkcs11 -r fitImage diff --git a/lib/rsa/rsa-sign.c b/lib/rsa/rsa-sign.c index d20bdb58a5..7ae163f264 100644 --- a/lib/rsa/rsa-sign.c +++ b/lib/rsa/rsa-sign.c @@ -116,15 +116,15 @@ static int rsa_engine_get_pub_key(const char *keydir, const char *name, if (keydir) if (strstr(keydir, "object=")) snprintf(key_id, sizeof(key_id), - "pkcs11:%s;type=public", + "%s;type=public", keydir); else snprintf(key_id, sizeof(key_id), - "pkcs11:%s;object=%s;type=public", + "%s;object=%s;type=public", keydir, name); else snprintf(key_id, sizeof(key_id), - "pkcs11:object=%s;type=public", + "object=%s;type=public", name); } else if (engine_id) { if (keydir) @@ -238,15 +238,15 @@ static int rsa_engine_get_priv_key(const char *keydir, const char *name, if (keydir) if (strstr(keydir, "object=")) snprintf(key_id, sizeof(key_id), - "pkcs11:%s;type=private", + "%s;type=private", keydir); else snprintf(key_id, sizeof(key_id), - "pkcs11:%s;object=%s;type=private", + "%s;object=%s;type=private", keydir, name); else snprintf(key_id, sizeof(key_id), - "pkcs11:object=%s;type=private", + "object=%s;type=private", name); } else if (engine_id) { if (keydir && name) -- 2.34.1

2 1

[PATCH] imxtract: specify max gunzip size
by Nikita Shubin 20 Dec '23

20 Dec '23

From: Nikita Shubin <n.shubin(a)yadro.com> Specify max gunzip size from config to override SYS_XIMG_LEN default value wich is 0x800000. Signed-off-by: Nikita Shubin <n.shubin(a)yadro.com> --- cmd/Kconfig | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/cmd/Kconfig b/cmd/Kconfig index d93731f2af6..06e200802d1 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -481,6 +481,13 @@ config CMD_XXD help Print file as hexdump to standard output +config SYS_XIMG_LEN + hex "imxtract max gunzip size" + default 0x800000 + depends on CMD_XIMG + help + Specify max gunzip size for imxtract tool. + config CMD_SPL bool "spl export - Export boot information for Falcon boot" depends on SPL -- 2.37.4

3 4

[PATCH v2] test/py: i2c: Add tests for i2c command
by Love Kumar 20 Dec '23

20 Dec '23

Add below test cases for i2c commands: i2c_bus - To show i2c bus info, i2c_dev - To set or show the current bus, i2c_probe - To probe the i2c device, i2c_eeprom - To test i2c eeprom device, i2c_probe_all_buses - To list down all the buses and probes it Signed-off-by: Love Kumar <love.kumar(a)amd.com> --- Changes in v2: - Take the configured eeprom value from env to read back and compare --- test/py/tests/test_i2c.py | 108 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 108 insertions(+) create mode 100644 test/py/tests/test_i2c.py diff --git a/test/py/tests/test_i2c.py b/test/py/tests/test_i2c.py new file mode 100644 index 000000000000..75321ee2fc20 --- /dev/null +++ b/test/py/tests/test_i2c.py @@ -0,0 +1,108 @@ +# SPDX-License-Identifier: GPL-2.0 +# (C) Copyright 2023, Advanced Micro Devices, Inc. + +import pytest +import random +import re + +""" +Note: This test doesn't rely on boardenv_* configuration value but they can +change test behavior. + +For example: + +# Setup env__i2c_device_test_skip to True if tests with i2c devices should be +# skipped. For example: Missing QEMU model or broken i2c device +env__i2c_device_test_skip = True + +# Setup env__i2c_eeprom_device_test to set the i2c bus number, eeprom address +# and configured value for i2c_eeprom test case. Test will be skipped if +# env__i2c_eeprom_device_test is not set +env__i2c_eeprom_device_test = { + "bus": 3, + "eeprom_addr": 0x54, + "eeprom_val": "30 31", +} + +# Setup env__i2c_device_test to provide the i2c bus list to test against it +# for i2c_probe_all_buses case instead of probing all the buses available. If +# it is not set, it list down all the buses and probes it +env__i2c_device_test = { + "bus_list": [0, 2, 5, 12, 16, 18] +} +""" + +(a)pytest.mark.buildconfigspec("cmd_i2c") +def test_i2c_bus(u_boot_console): + if u_boot_console.config.env.get("env__i2c_device_test_skip", False): + pytest.skip("I2C device test is not enabled!") + expected_response = "Bus" + response = u_boot_console.run_command("i2c bus") + assert expected_response in response + +(a)pytest.mark.buildconfigspec("cmd_i2c") +def test_i2c_dev(u_boot_console): + if u_boot_console.config.env.get("env__i2c_device_test_skip", False): + pytest.skip("I2C device test is not enabled!") + expected_response = "Current bus" + response = u_boot_console.run_command("i2c dev") + assert expected_response in response + +(a)pytest.mark.buildconfigspec("cmd_i2c") +def test_i2c_probe(u_boot_console): + if u_boot_console.config.env.get("env__i2c_device_test_skip", False): + pytest.skip("I2C device test is not enabled!") + expected_response = "Setting bus to 0" + response = u_boot_console.run_command("i2c dev 0") + assert expected_response in response + expected_response = "Valid chip addresses:" + response = u_boot_console.run_command("i2c probe") + assert expected_response in response + +(a)pytest.mark.buildconfigspec("cmd_i2c") +def test_i2c_eeprom(u_boot_console): + f = u_boot_console.config.env.get("env__i2c_eeprom_device_test", None) + if not f: + pytest.skip("No I2C eeprom to test!") + + bus = f.get("bus", 0) + if bus < 0: + pytest.fail("No bus specified via env__i2c_eeprom_device_test!") + + addr = f.get("eeprom_addr", -1) + if addr < 0: + pytest.fail("No eeprom address specified via env__i2c_eeprom_device_test!") + + value = f.get("eeprom_val") + if not value: + pytest.fail("No eeprom configured value provided via env__i2c_eeprom_device_test!") + + # Enable i2c mux bridge + u_boot_console.run_command("i2c dev %x" % bus) + u_boot_console.run_command("i2c probe") + output = u_boot_console.run_command("i2c md %x 0 5" % addr) + assert value in output + +(a)pytest.mark.buildconfigspec("cmd_i2c") +def test_i2c_probe_all_buses(u_boot_console): + if u_boot_console.config.env.get("env__i2c_device_test_skip", False): + pytest.skip("I2C device test is not enabled!") + expected_response = "Bus" + response = u_boot_console.run_command("i2c bus") + assert expected_response in response + + # Get all the bus list + f = u_boot_console.config.env.get("env__i2c_device_test", None) + if f: + bus_list = f.get("bus_list") + else: + buses = re.findall("Bus (.+?):", response) + bus_list = [int(x) for x in buses] + + for dev in bus_list: + expected_response = f"Setting bus to {dev}" + response = u_boot_console.run_command(f"i2c dev {dev}") + assert expected_response in response + expected_response = "Valid chip addresses:" + response = u_boot_console.run_command("i2c probe") + assert expected_response in response -- 2.25.1

3 4