December 2023 - U-Boot

[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

Pull request: Please pull u-boot-imx-next-20231220
by Fabio Estevam 20 Dec '23

20 Dec '23

Hi Tom, Please pull this u-boot-imx material targetted for 'next', thanks. The following changes since commit f7655af980dc376783bbdac833e450a86e3255f4: Merge tag 'u-boot-amlogic-next-20231220' of https://source.denx.de/u-boot/custodians/u-boot-amlogic into next (2023-12-20 08:34:12 -0500) are available in the Git repository at: https://gitlab.denx.de/u-boot/custodians/u-boot-imx.git tags/u-boot-imx-next-20231220 for you to fetch changes up to 8a72d193cf15cf0d6936886db4b2dd75956fb4d8: colibri-imx8x: configure usb hub to bypass mode (2023-12-20 15:04:46 -0300) u-boot-imx-next-20231220 ------------------------ CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/19043 - Put the USB hub out of reset on colibri-imx8x - Fix VDDx brownout interrupt register of i.MX23/i.MX28 - Fix Phytec imx8m SoM detection - Add TPM support for gw72xx boards ---------------------------------------------------------------- Andrejs Cainikovs (3): apalis-imx8: remove -u-boot.dtsi include colibri-imx8x: remove -u-boot.dtsi include colibri-imx8x: configure usb hub to bypass mode Cody Green (1): mxs: Fix VDDx brownout interrupt disable/enable Tim Harvey (3): arm: dts: imx8mm-venice-gw72xx: add TPM device arm: dts: imx8mp-venice-gw72xx: add TPM device configs: imx8m{m, n, p}_venice_defconfig: add arch_misc_init Yannic Moog (5): board: phytec: imx8m_som_detection: change phytec_imx8m_detect return type board: phytec: imx8m_som_detection: fix uninitialized pointer bug board: phytec: phytec_som_detection: fix eeprom_data zero check board: phytec: som_detection: move definitions to source file board: phytec: phytec_som_detection: fix uninitialized bug arch/arm/cpu/arm926ejs/mxs/spl_power_init.c | 8 +++-- arch/arm/dts/fsl-imx8qm-apalis.dts | 1 - arch/arm/dts/fsl-imx8qxp-colibri-u-boot.dtsi | 15 ++++++++ arch/arm/dts/fsl-imx8qxp-colibri.dts | 3 -- arch/arm/dts/imx8mm-venice-gw72xx-0x-u-boot.dtsi | 7 ++++ arch/arm/dts/imx8mm-venice-gw72xx.dtsi | 10 +++++- arch/arm/dts/imx8mp-venice-gw72xx-2x-u-boot.dtsi | 9 +++++ arch/arm/dts/imx8mp-venice-gw72xx.dtsi | 9 ++++- board/phytec/common/imx8m_som_detection.c | 40 ++++++++++++++++++--- board/phytec/common/imx8m_som_detection.h | 34 +----------------- board/phytec/common/phytec_som_detection.c | 46 ++++++++++++++++++++++-- board/phytec/common/phytec_som_detection.h | 38 -------------------- configs/colibri-imx8x_defconfig | 1 + configs/imx8mm_venice_defconfig | 1 + configs/imx8mn_venice_defconfig | 1 + configs/imx8mp_venice_defconfig | 1 + 16 files changed, 137 insertions(+), 87 deletions(-)

2 1

Pull request: Please pull u-boot-imx-master-20231220
by Fabio Estevam 20 Dec '23

20 Dec '23

Hi Tom, Please pull these fixes from u-boot-imx, thanks. The following changes since commit 3ac22891cfc0dc6d8eec25d2b0fbdd2eb8f3d3ed: Merge tag 'u-boot-imx-20231214' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx (2023-12-15 08:22:31 -0500) are available in the Git repository at: https://gitlab.denx.de/u-boot/custodians/u-boot-imx.git tags/u-boot-imx-master-20231220 for you to fetch changes up to 1f25c75619d7fdacbaa8c2c9c152ebc9aec807b3: ARM: dts: imx: Power off display output on Data Modul i.MX8M Mini/Plus eDM SBC (2023-12-18 20:25:57 -0300) u-boot-imx-master-20231220 -------------------------- CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/19007 - Make DRAM stable on i.MX8MP DHCOM SoM by using FPWM mode and updating the DRAM timing - Fix display artifacts when booting Linux on i.MX8M Mini/Plus eDM SBC ---------------------------------------------------------------- Marek Vasut (3): ARM: imx: Force DRAM regulators into FPWM mode on DH i.MX8MP DHCOM SoM ARM: imx: Update DRAM timings with inline ECC on DH i.MX8MP DHCOM SoM ARM: dts: imx: Power off display output on Data Modul i.MX8M Mini/Plus eDM SBC arch/arm/dts/imx8mm-data-modul-edm-sbc-u-boot.dtsi | 49 +++++++ arch/arm/dts/imx8mp-data-modul-edm-sbc-u-boot.dtsi | 48 +++++++ board/dhelectronics/dh_imx8mp/imx8mp_dhcom_pdk2.c | 5 +- board/dhelectronics/dh_imx8mp/lpddr4_timing.h | 6 + .../dhelectronics/dh_imx8mp/lpddr4_timing_2G_32.c | 130 ++++++++++-------- .../dhelectronics/dh_imx8mp/lpddr4_timing_4G_32.c | 149 ++++++++++++--------- board/dhelectronics/dh_imx8mp/spl.c | 33 +++++ configs/imx8mp_dhcom_pdk2_defconfig | 3 +- configs/imx8mp_dhcom_pdk3_defconfig | 3 +- 9 files changed, 310 insertions(+), 116 deletions(-)

2 1

[PATCH 0/5] Handoff bloblist from previous boot stage
by Raymond Mao 20 Dec '23

20 Dec '23

This patch set depends on another series: "[PATCH v3 00/14] Support Firmware Handoff spec via bloblist". This patch set implements Qemu-Arm platform custom functions to retrieve the bloblist (aka. Transfer List) from previous loader via boot arguments when CONFIG_OF_BOARD option is enabled and all boot arguments are compliant to the register conventions defined in the Firmware Handoff spec v0.9. Qemu-Arm platform custom function will load the FDT from the bloblist if it exists. Otherwise it fallbacks to get the FDT from the specified memory address. If a platform vendor wish to have different behaviors for loading bloblist or FDT from the previous boot stage, it is required to implement the custom functions board_bloblist_from_boot_arg() and board_fdt_blob_setup(). Raymond Mao (5): bloblist: add API to check the register conventions qemu-arm: Get bloblist from boot arguments bloblist: Load the bloblist from the previous loader fdt: update the document and Kconfig description qemu-arm: get FDT from bloblist board/emulation/qemu-arm/Makefile | 1 + board/emulation/qemu-arm/lowlevel_init.S | 19 +++++++ board/emulation/qemu-arm/qemu-arm.c | 66 +++++++++++++++++++++++- common/bloblist.c | 62 +++++++++++++++------- configs/qemu_arm64_defconfig | 3 ++ doc/develop/devicetree/control.rst | 6 +-- dts/Kconfig | 7 ++- include/bloblist.h | 28 ++++++++++ 8 files changed, 167 insertions(+), 25 deletions(-) create mode 100644 board/emulation/qemu-arm/lowlevel_init.S -- 2.25.1

3 15

[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

[PATCH v2 0/5] This series fixes various bugs in the phytec som_detection unit.
by Yannic Moog 20 Dec '23

20 Dec '23

--- Changes in v2: - fixed accidental squashing of changes -> split into 2 separate patches --- Yannic Moog (5): board: phytec: imx8m_som_detection: change phytec_imx8m_detect return type board: phytec: imx8m_som_detection: fix uninitialized pointer bug board: phytec: phytec_som_detection: fix eeprom_data zero check board: phytec: som_detection: move definitions to source file board: phytec: phytec_som_detection: fix uninitialized bug board/phytec/common/imx8m_som_detection.c | 40 +++++++++++++++++++++++--- board/phytec/common/imx8m_som_detection.h | 34 +--------------------- board/phytec/common/phytec_som_detection.c | 46 ++++++++++++++++++++++++++++-- board/phytec/common/phytec_som_detection.h | 38 ------------------------ 4 files changed, 80 insertions(+), 78 deletions(-) --- base-commit: 8f5043ee6d378d7c10d947cf48b047a5954ef5b3 change-id: 20231218-wip-y-moog-phytec-de-upstream_som_detection_fixes-b442a1e16334 Best regards, -- Yannic Moog <y.moog(a)phytec.de>

2 6

[PATCH v1 0/3] colibri-imx8x: configure module usb hub to bypass mode
by Andrejs Cainikovs 20 Dec '23

20 Dec '23

From: Andrejs Cainikovs <andrejs.cainikovs(a)toradex.com> This series: - Drops -u-boot.dtsi includes in apalis-imx8 and colibri-imx8x device trees. This file is included automatically since quite some time now. - Configures Toradex Colibri iMX8X SoM USB hub to bypass mode, and brings out of the reset state. Andrejs Cainikovs (3): apalis-imx8: remove -u-boot.dtsi include colibri-imx8x: remove -u-boot.dtsi include colibri-imx8x: configure usb hub to bypass mode arch/arm/dts/fsl-imx8qm-apalis.dts | 1 - arch/arm/dts/fsl-imx8qxp-colibri-u-boot.dtsi | 15 +++++++++++++++ arch/arm/dts/fsl-imx8qxp-colibri.dts | 3 --- configs/colibri-imx8x_defconfig | 1 + 4 files changed, 16 insertions(+), 4 deletions(-) -- 2.34.1

3 9