September 2024 - U-Boot

Please pull u-boot-dm
by Simon Glass 02 Sep '24

02 Sep '24

Hi Tom, The following changes since commit 57949a99b7bd0aa21abbde1ffa7e50e5d9e10a4e: https://source.denx.de/u-boot/custodians/u-boot-dm/-/pipelines/22192 https://dev.azure.com/simon0972/u-boot/_build/results?buildId=67&view=resul… Merge tag 'u-boot-imx-master-20240829' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx (2024-08-29 08:15:37 -0600) are available in the Git repository at: git://git.denx.de/u-boot-dm.git tags/dm-pull-1sep24 for you to fetch changes up to 4597acbd5943a53afb8aeb9595f2ea5a40e1f99f: qconfig: Fix an incorrect format-string with negative value (2024-09-01 11:05:43 -0600) ---------------------------------------------------------------- Minor fixes for qconfig and patman ---------------------------------------------------------------- Brian Norris (1): patman: Resolve python string vs. regex escaping syntax Simon Glass (1): qconfig: Fix an incorrect format-string with negative value tools/patman/commit.py | 2 +- tools/patman/patchstream.py | 2 +- tools/qconfig.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) Regards, Simon

2 1

[PATCH 0/4] Rockchip: Allow to silent TPL/SPL debug console
by Lukasz Czechowski 02 Sep '24

02 Sep '24

Currently it is not possible to completely silent the debug console in i.e. PX30, what might be required in some embedded devices Disabling DEBUG_UART results in errors, due to missing symbols. In particular, rockchip sdram driver performs calls to debug_uart functions (i.e. printascii), defined directly in serial driver. This patch series fixes the dependencies in Kconfig and provides dummy implementation of debug_uart functions that are linked in case serial driver is not used. Lukasz Czechowski (4): debug_uart: Replace debug functions with dummies if CONFIG_DEBUG_UART is not set ram: rockchip: Kconfig: Fix dependency of RAM_ROCKCHIP_DEBUG rockchip: Kconfig: PX30: Weaken dependency TPL/SPL serial arm: rockchip: PX30: Fix hard dependency to DEBUG_UART_BOARD_INIT arch/arm/mach-rockchip/Kconfig | 5 ++--- drivers/ram/rockchip/Kconfig | 2 ++ include/debug_uart.h | 16 ++++++++++++++++ 3 files changed, 20 insertions(+), 3 deletions(-) -- 2.43.0

4 10

[PATCH] regulator: rk8xx: Fix buck get and set enabled state on RK806
by Jonas Karlman 02 Sep '24

02 Sep '24

Wrong POWER_EN reg is used to get and set enabled state for the RK806 buck 4 and 8 regulators, also wrong POWER_SLP_EN0 bit is used for suspend state for the RK806 buck 1-8 regulators. Fix this by not adding one to the zero based buck variable. Fixes: f172575d92cd ("power: rk8xx: add support for RK806") Signed-off-by: Jonas Karlman <jonas(a)kwiboo.se> --- drivers/power/regulator/rk8xx.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/power/regulator/rk8xx.c b/drivers/power/regulator/rk8xx.c index 34e61511d884..3f5ec02b3824 100644 --- a/drivers/power/regulator/rk8xx.c +++ b/drivers/power/regulator/rk8xx.c @@ -415,7 +415,7 @@ static int _buck_set_enable(struct udevice *pmic, int buck, bool enable) break; case RK806_ID: value = RK806_POWER_EN_CLRSETBITS(buck % 4, enable); - en_reg = RK806_POWER_EN((buck + 1) / 4); + en_reg = RK806_POWER_EN(buck / 4); ret = pmic_reg_write(pmic, en_reg, value); break; case RK808_ID: @@ -494,7 +494,7 @@ static int _buck_get_enable(struct udevice *pmic, int buck) break; case RK806_ID: mask = BIT(buck % 4); - ret = pmic_reg_read(pmic, RK806_POWER_EN((buck + 1) / 4)); + ret = pmic_reg_read(pmic, RK806_POWER_EN(buck / 4)); break; case RK808_ID: case RK818_ID: @@ -541,10 +541,10 @@ static int _buck_set_suspend_enable(struct udevice *pmic, int buck, bool enable) if (buck + 1 >= 9) { reg = RK806_POWER_SLP_EN1; - mask = BIT(buck + 1 - 3); + mask = BIT(buck - 2); } else { reg = RK806_POWER_SLP_EN0; - mask = BIT(buck + 1); + mask = BIT(buck); } ret = pmic_clrsetbits(pmic, reg, mask, enable ? mask : 0); } @@ -592,10 +592,10 @@ static int _buck_get_suspend_enable(struct udevice *pmic, int buck) if (buck + 1 >= 9) { reg = RK806_POWER_SLP_EN1; - mask = BIT(buck + 1 - 3); + mask = BIT(buck - 2); } else { reg = RK806_POWER_SLP_EN0; - mask = BIT(buck + 1); + mask = BIT(buck); } val = pmic_reg_read(pmic, reg); } -- 2.46.0

3 4

[PATCH] mmc: Hide mmc speed command under mmc command
by Marek Vasut 02 Sep '24

02 Sep '24

The mmc speed command configuration option keeps showing up in Kconfig even if CMD_MMC is not set. Move MMC_SPEED_MODE_SET under CMD_MMC to show up the Kconfig option only if MMC command is enabled. Signed-off-by: Marek Vasut <marek.vasut+renesas(a)mailbox.org> --- Cc: AKASHI Takahiro <akashi.tkhro(a)gmail.com> Cc: Francis Laniel <francis.laniel(a)amarulasolutions.com> Cc: Heinrich Schuchardt <xypron.glpk(a)gmx.de> Cc: Mattijs Korpershoek <mkorpershoek(a)baylibre.com> Cc: Michal Simek <michal.simek(a)amd.com> Cc: Simon Glass <sjg(a)chromium.org> Cc: Tom Rini <trini(a)konsulko.com> Cc: u-boot(a)lists.denx.de --- cmd/Kconfig | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/cmd/Kconfig b/cmd/Kconfig index 978f44eda42..efe2357d044 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1399,6 +1399,15 @@ config CMD_MMC_SWRITE Enable support for the "mmc swrite" command to write Android sparse images to eMMC. +config MMC_SPEED_MODE_SET + bool "set speed mode using mmc command" + help + Enable setting speed mode using mmc rescan and mmc dev commands. + The speed mode is provided as the last argument in these commands + and is indicated using the index from enum bus_mode in + include/mmc.h. A speed mode can be set only if it has already + been enabled in the device tree. + endif config CMD_CLONE @@ -2963,16 +2972,6 @@ config CMD_UBIFS help UBIFS is a file system for flash devices which works on top of UBI. -config MMC_SPEED_MODE_SET - bool "set speed mode using mmc command" - depends on CMD_MMC - help - Enable setting speed mode using mmc rescan and mmc dev commands. - The speed mode is provided as the last argument in these commands - and is indicated using the index from enum bus_mode in - include/mmc.h. A speed mode can be set only if it has already - been enabled in the device tree. - config CMD_MESON bool "Amlogic Meson commands" depends on ARCH_MESON -- 2.45.2

4 3

[PATCH] net: guard call to tftp_start() with #if defined(CONFIG_CMD_TFTPBOOT)
by Jerome Forissier 02 Sep '24

02 Sep '24

net_auto_load() cannot call tftp_start() if CONFIG_CMD_TFTPBOOT is disabled. Signed-off-by: Jerome Forissier <jerome.forissier(a)linaro.org> --- net/net.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/net.c b/net/net.c index d9bc9df643f..35961ba1c7d 100644 --- a/net/net.c +++ b/net/net.c @@ -334,6 +334,7 @@ void net_auto_load(void) net_set_state(NETLOOP_SUCCESS); return; } +#if defined(CONFIG_CMD_TFTPBOOT) if (net_check_prereq(TFTPGET)) { /* We aren't expecting to get a serverip, so just accept the assigned IP */ if (IS_ENABLED(CONFIG_BOOTP_SERVERIP)) { @@ -345,6 +346,7 @@ void net_auto_load(void) return; } tftp_start(TFTPGET); +#endif } static int net_init_loop(void) -- 2.40.1

2 2

[PATCH] versal2: Update the sys prompt name
by Love Kumar 02 Sep '24

02 Sep '24

versal2 refers as "Versal Gen 2" as a generic approved name so using the same as u-boot prompt name for all versal2 defconfig Signed-off-by: Love Kumar <love.kumar(a)amd.com> --- configs/amd_versal2_mini_defconfig | 2 +- configs/amd_versal2_mini_emmc_defconfig | 2 +- configs/amd_versal2_mini_ospi_defconfig | 2 +- configs/amd_versal2_mini_qspi_defconfig | 2 +- configs/amd_versal2_virt_defconfig | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/configs/amd_versal2_mini_defconfig b/configs/amd_versal2_mini_defconfig index 0dd2305bfb2d..2af9ff4d8377 100644 --- a/configs/amd_versal2_mini_defconfig +++ b/configs/amd_versal2_mini_defconfig @@ -32,7 +32,7 @@ CONFIG_BOARD_EARLY_INIT_R=y # CONFIG_CMDLINE_EDITING is not set # CONFIG_AUTO_COMPLETE is not set # CONFIG_SYS_LONGHELP is not set -CONFIG_SYS_PROMPT="versal2> " +CONFIG_SYS_PROMPT="VersalGen2> " # CONFIG_CMD_CONSOLE is not set # CONFIG_CMD_BOOTD is not set # CONFIG_CMD_BOOTI is not set diff --git a/configs/amd_versal2_mini_emmc_defconfig b/configs/amd_versal2_mini_emmc_defconfig index 7ad44386a6da..520dabbf7c8b 100644 --- a/configs/amd_versal2_mini_emmc_defconfig +++ b/configs/amd_versal2_mini_emmc_defconfig @@ -24,7 +24,7 @@ CONFIG_BOARD_EARLY_INIT_R=y # CONFIG_CMDLINE_EDITING is not set # CONFIG_AUTO_COMPLETE is not set # CONFIG_SYS_LONGHELP is not set -CONFIG_SYS_PROMPT="versal2> " +CONFIG_SYS_PROMPT="VersalGen2> " # CONFIG_CMD_BDI is not set # CONFIG_CMD_CONSOLE is not set # CONFIG_CMD_BOOTD is not set diff --git a/configs/amd_versal2_mini_ospi_defconfig b/configs/amd_versal2_mini_ospi_defconfig index 2242960392f5..9498f4ba46c4 100644 --- a/configs/amd_versal2_mini_ospi_defconfig +++ b/configs/amd_versal2_mini_ospi_defconfig @@ -30,7 +30,7 @@ CONFIG_BOARD_EARLY_INIT_R=y # CONFIG_CMDLINE_EDITING is not set # CONFIG_AUTO_COMPLETE is not set # CONFIG_SYS_LONGHELP is not set -CONFIG_SYS_PROMPT="versal2> " +CONFIG_SYS_PROMPT="VersalGen2> " # CONFIG_CMD_CONSOLE is not set # CONFIG_CMD_BOOTD is not set # CONFIG_CMD_BOOTI is not set diff --git a/configs/amd_versal2_mini_qspi_defconfig b/configs/amd_versal2_mini_qspi_defconfig index 3360c1546a20..6aa2223df2fe 100644 --- a/configs/amd_versal2_mini_qspi_defconfig +++ b/configs/amd_versal2_mini_qspi_defconfig @@ -30,7 +30,7 @@ CONFIG_BOARD_EARLY_INIT_R=y # CONFIG_CMDLINE_EDITING is not set # CONFIG_AUTO_COMPLETE is not set # CONFIG_SYS_LONGHELP is not set -CONFIG_SYS_PROMPT="versal2> " +CONFIG_SYS_PROMPT="VersalGen2> " # CONFIG_CMD_CONSOLE is not set # CONFIG_CMD_BOOTD is not set # CONFIG_CMD_BOOTI is not set diff --git a/configs/amd_versal2_virt_defconfig b/configs/amd_versal2_virt_defconfig index c4bf77186cd5..1ab916451b54 100644 --- a/configs/amd_versal2_virt_defconfig +++ b/configs/amd_versal2_virt_defconfig @@ -26,7 +26,7 @@ CONFIG_USE_PREBOOT=y CONFIG_SYS_PBSIZE=2073 CONFIG_BOARD_EARLY_INIT_R=y CONFIG_CLOCKS=y -CONFIG_SYS_PROMPT="versal2> " +CONFIG_SYS_PROMPT="VersalGen2> " CONFIG_CMD_BOOTMENU=y CONFIG_CMD_GREPENV=y CONFIG_CMD_NVEDIT_EFI=y -- 2.23.0

2 1

[PATCH] cmd: mmc: Allow using partition name in mmc erase command
by Tomas Paukrt 02 Sep '24

02 Sep '24

The mmc erase command currently requires blk# and cnt parameters which can be obtained using the part command if the entire partition needs to be deleted. Simplify the use of the mmc erase command by allowing the partition name to be specified directly. Signed-off-by: Tomas Paukrt <tomaspaukrt(a)email.cz> --- cmd/mmc.c | 21 ++++++++++++++------- doc/usage/cmd/mmc.rst | 4 +++- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/cmd/mmc.c b/cmd/mmc.c index 7244a90..ba2f506 100644 --- a/cmd/mmc.c +++ b/cmd/mmc.c @@ -472,18 +472,25 @@ static int do_mmc_erase(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { struct mmc *mmc; + struct disk_partition info; u32 blk, cnt, n; - if (argc != 3) - return CMD_RET_USAGE; - - blk = hextoul(argv[1], NULL); - cnt = hextoul(argv[2], NULL); - mmc = init_mmc_device(curr_device, false); if (!mmc) return CMD_RET_FAILURE; + if (argc == 2) { + if (part_get_info_by_name(mmc_get_blk_desc(mmc), argv[1], &info) < 0) + return CMD_RET_FAILURE; + blk = info.start; + cnt = info.size & ~(mmc->erase_grp_size - 1); + } else if (argc == 3) { + blk = hextoul(argv[1], NULL); + cnt = hextoul(argv[2], NULL); + } else { + return CMD_RET_USAGE; + } + printf("\nMMC erase: dev # %d, block # %d, count %d ... ", curr_device, blk, cnt); @@ -1270,7 +1277,7 @@ U_BOOT_CMD( #if CONFIG_IS_ENABLED(CMD_MMC_SWRITE) "mmc swrite addr blk#\n" #endif - "mmc erase blk# cnt\n" + "mmc erase blk# cnt | partname\n" "mmc rescan [mode]\n" "mmc part - lists available partition on current mmc device\n" "mmc dev [dev] [part] [mode] - show or set current mmc device [partition] and set mode\n" diff --git a/doc/usage/cmd/mmc.rst b/doc/usage/cmd/mmc.rst index 5a64400..b919b75 100644 --- a/doc/usage/cmd/mmc.rst +++ b/doc/usage/cmd/mmc.rst @@ -14,7 +14,7 @@ Synopsis mmc info mmc read addr blk# cnt mmc write addr blk# cnt - mmc erase blk# cnt + mmc erase blk# cnt | partname mmc rescan [mode] mmc part mmc dev [dev] [part] [mode] @@ -50,6 +50,8 @@ The 'mmc erase' command erases *cnt* blocks on the MMC device starting at block start block offset cnt block count + partname + partition name The 'mmc rescan' command scans the available MMC device. -- 2.7.4

3 2

How to retrieve cpu info from u-boot fucntion?
by Sourabh Hegde Ramu 02 Sep '24

02 Sep '24

Hello, Currently, I am using the MAC address from eth_get_ethaddr() function to calculate a hash value. But, I would like to replace this with a more unique device info such as cpuid or other values. But I could not find any function that can retrieve cpu info. Can anyone please point me in the correct direction? Do we have any functions for this? Are these things part of the documentation? Thanks in advance. Kind regards, Sourabh

2 5

[PATCH v4 03/24] bootstd: Add UT_TESTF_CONSOLE_REC to bootflow tests
by Simon Glass 02 Sep '24

02 Sep '24

Quite a few tests use console recording without indicating this, using the UT_TESTF_CONSOLE_REC flag. Fix this to avoid strange failures. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- (no changes since v1) test/boot/bootflow.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/boot/bootflow.c b/test/boot/bootflow.c index 6ad63afe90a..da55d5cfe69 100644 --- a/test/boot/bootflow.c +++ b/test/boot/bootflow.c @@ -362,7 +362,7 @@ static int bootflow_iter(struct unit_test_state *uts) return 0; } -BOOTSTD_TEST(bootflow_iter, UTF_DM | UTF_SCAN_FDT); +BOOTSTD_TEST(bootflow_iter, UTF_DM | UTF_SCAN_FDT | UTF_CONSOLE); #if defined(CONFIG_SANDBOX) && defined(CONFIG_BOOTMETH_GLOBAL) /* Check using the system bootdev */ -- 2.34.1

1 0

What is the proper way to sign fit images using binman/mkimage for verified boot
by Alexander Kochetkov 02 Sep '24

02 Sep '24

Hello! I used to sign images for verified boot for u-boot v2020.04 for allwinner A64-based board. It was simple. I’ve just added signature nodes for atf, u-boot, dtb, configurations to the generated by mksunxi_fit_atf.sh its file and mkimage signed the fit image. Now I trying to do the same for u-boot v2024.07. I work with Radxa Model 3a. It’s fit image is generated using binman. It’s bimnan configuration is located in the file arch/arm/dts/rockchip-u-boot.dtsi. I have 3 ideas about how to get the job done: - improve binman, to support signing fit images during fit image generation. Sort of implementing image-signature etype - fix mkimage to allow signing generated by binman images. Now I getting error, then I try to do that - may be I do the job in a wrong way? Could you please direct me in a correct way? First I think, that I have to add signature entries to binman configuration. So, I added following: &binman { simple-bin { … fit: fit { … images { … @atf-SEQ { … signature { algo = "sha256,rsa2048»; key-name-hint = "uboot-spl»; sign-images = "atf-SEQ»; }; }; }; }; }; }; This signature entry was copied to resulted fit image without processing. No signature was generated. SEQ was not replaced to 1: atf-1 { ... hash { value = <0xb5946ac6 0x3df8fb35 0x69407a75 0xcf2f6aa3 0x96551ba0 0x11e1a84b 0xec654dc9 0x982ba063>; algo = "sha256»; }; signature { algo = "sha256,rsa2048»; key-name-hint = "uboot-spl»; sign-images = "atf-SEQ»; }; }; So, obviously binman is not support this way of signing images. If this way looks reasonable, I can try to implement it and send patches to u-boot. I played with binman etypes, tryied to add custom 'image-signature' etype. Looks like I can complete such work. Second solution looks for me as follows. We need run mkimage to sign generated by binman fit image. Some sort of running mkimage like this: ./tools/mkimage -k /media/yocto/build-yocto/…. -F ./u-boot.itb Now I getting error then I run mkimage: Can't add verification data for node 'atf-1' (<unknown error>) If that solution is reasonable, I can fix <unknown error> and send patches. Third thought, may be there is another proper way to sign fit image for verified boot? Could you please provide an idea how to do that. Regards, Alexander.

2 1