April 2024 - U-Boot

[PATCH] arm: mach-k3: am62ax: Fix typo in ROM data macro name
by Andrew Davis 30 Apr '24

30 Apr '24

s/ENTENDED/EXTENDED Signed-off-by: Andrew Davis <afd(a)ti.com> --- arch/arm/mach-k3/am62a7_init.c | 2 +- arch/arm/mach-k3/include/mach/am62a_hardware.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-k3/am62a7_init.c b/arch/arm/mach-k3/am62a7_init.c index 2a0221a3718..658828cf75f 100644 --- a/arch/arm/mach-k3/am62a7_init.c +++ b/arch/arm/mach-k3/am62a7_init.c @@ -31,7 +31,7 @@ static void store_boot_info_from_rom(void) bootindex = *(u32 *)(CONFIG_SYS_K3_BOOT_PARAM_TABLE_INDEX); if (IS_ENABLED(CONFIG_CPU_V7R)) { - memcpy(&bootdata, (uintptr_t *)ROM_ENTENDED_BOOT_DATA_INFO, + memcpy(&bootdata, (uintptr_t *)ROM_EXTENDED_BOOT_DATA_INFO, sizeof(struct rom_extended_boot_data)); } } diff --git a/arch/arm/mach-k3/include/mach/am62a_hardware.h b/arch/arm/mach-k3/include/mach/am62a_hardware.h index 11080801c4c..cd61abe0185 100644 --- a/arch/arm/mach-k3/include/mach/am62a_hardware.h +++ b/arch/arm/mach-k3/include/mach/am62a_hardware.h @@ -66,7 +66,7 @@ #define MCU_CTRL_DEVICE_CLKOUT_32K_CTRL (MCU_CTRL_MMR0_BASE + 0x8058) #define MCU_CTRL_DEVICE_CLKOUT_LFOSC_SELECT_VAL (0x3) -#define ROM_ENTENDED_BOOT_DATA_INFO 0x43c3f1e0 +#define ROM_EXTENDED_BOOT_DATA_INFO 0x43c3f1e0 #define K3_BOOT_PARAM_TABLE_INDEX_OCRAM 0x7000F290 -- 2.39.2

2 1

[PATCH] .gitignore: add LTO generated file
by Robert Marko 30 Apr '24

30 Apr '24

Currently, keep-syms-lto.c is being generated if LTO is enabled but unlike keep-syms-lto.o it is not being ignored, so lets add keep-syms-lto.* to .gitignore. Signed-off-by: Robert Marko <robert.marko(a)sartura.hr> --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index be137040a2..324078769b 100644 --- a/.gitignore +++ b/.gitignore @@ -67,6 +67,7 @@ fit-dtb.blob* /Test* /capsule.*.efi-capsule /capsule*.map +/keep-syms-lto.* # # Generated include files -- 2.44.0

2 1

[PATCH 1/1] cmd: CONFIG_CMD_BLOBLIST must depend on CONFIG_BLOBLIST
by Heinrich Schuchardt 30 Apr '24

30 Apr '24

With CONFIG_CMD_BLOBLIST=y, CONFIG_BLOBLIST=n linker errors occur: usr/bin/ld: cmd/bloblist.o: in function `do_bloblist_list': cmd/bloblist.c:27:(.text.do_bloblist_list+0x6): undefined reference to `bloblist_show_list' /usr/bin/ld: cmd/bloblist.o: in function `do_bloblist_info': cmd/bloblist.c:19:(.text.do_bloblist_info+0x6): undefined reference to `bloblist_show_stats' Fixes: 4aed22762303 ("bloblist: Add a command") Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- cmd/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmd/Kconfig b/cmd/Kconfig index 42757e0cdf1..2386391daf1 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -741,7 +741,8 @@ config CMD_BINOP config CMD_BLOBLIST bool "bloblist" - default y if BLOBLIST + depends on BLOBLIST + default y help Show information about the bloblist, a collection of binary blobs held in memory that persist between SPL and U-Boot. In the case of -- 2.43.0

2 1

[PATCH] arm: mach-k3: am642: Fix reset for workaround errata ID i2331
by Andrew Davis 30 Apr '24

30 Apr '24

To workaround an issue in AM642 we reset the SoC in early boot. For that we first probed the sysreset driver by calling uclass_get_device(). The ti-sci sysreset driver is now probed during the ti-sci firmware probe. Update this call to probe the firmware driver which will then probe the sysreset driver allowing do_reset() to again function as expected. Reported-by: Jonathan Humphreys <j-humphreys(a)ti.com> Fixes: fc5d40283483 ("firmware: ti_sci: Bind sysreset driver when enabled") Signed-off-by: Andrew Davis <afd(a)ti.com> --- arch/arm/mach-k3/am642_init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-k3/am642_init.c b/arch/arm/mach-k3/am642_init.c index ddf47ef0a9b..80c3cb3479f 100644 --- a/arch/arm/mach-k3/am642_init.c +++ b/arch/arm/mach-k3/am642_init.c @@ -226,7 +226,7 @@ void board_init_f(ulong dummy) * The warm reset realigns internal clocks and prevents the lockup from * happening. */ - ret = uclass_first_device_err(UCLASS_SYSRESET, &dev); + ret = uclass_get_device_by_driver(UCLASS_FIRMWARE, DM_DRIVER_GET(ti_sci), &dev); if (ret) printf("\n%s:uclass device error [%d]\n",__func__,ret); -- 2.39.2

4 3

[PATCH 1/1] mailmap: add entry for AKASHI Takahiro
by Heinrich Schuchardt 30 Apr '24

30 Apr '24

Akashi-san's Linaro email address in not valid anymore. Cc: AKASHI Takahiro <akashi.tkhro(a)gmail.com> Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- .mailmap | 1 + 1 file changed, 1 insertion(+) diff --git a/.mailmap b/.mailmap index 932bd4d9a97..8049856d41c 100644 --- a/.mailmap +++ b/.mailmap @@ -15,6 +15,7 @@ # Proper Name <proper(a)email.xx> <commit(a)email.xx> # Proper Name <proper(a)email.xx> Commit Name <commit(a)email.xx> +AKASHI Takahiro <akashi.tkhro(a)gmail.com> <takahiro.akashi(a)linaro.org> Alexander Graf <agraf(a)csgraf.de> <agraf(a)suse.de> Allen Martin <amartin(a)nvidia.com> Amanda Baze <amanda.baze(a)amd.com> <nicole.baze(a)xilinx.com> -- 2.43.0

3 2

[PATCH v1] board: toradex: verdin-am62: Remove not needed env variables
by Francesco Dolcini 30 Apr '24

30 Apr '24

From: Francesco Dolcini <francesco.dolcini(a)toradex.com> Remove not needed variables from environment. - boot_scripts is not needed, the default value is just fine and already includes boot.scr - setup variable used to be executed from some bootscript, however it's not required and there is no point on having this small helper here Signed-off-by: Francesco Dolcini <francesco.dolcini(a)toradex.com> --- include/configs/verdin-am62.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/include/configs/verdin-am62.h b/include/configs/verdin-am62.h index 9d2e37f2d96d..ac44809fdfa5 100644 --- a/include/configs/verdin-am62.h +++ b/include/configs/verdin-am62.h @@ -39,12 +39,9 @@ #define CFG_EXTRA_ENV_SETTINGS \ BOOTENV \ MEM_LAYOUT_ENV_SETTINGS \ - "boot_scripts=boot.scr\0" \ "boot_script_dhcp=boot.scr\0" \ "console=ttyS2\0" \ "fdt_board=dev\0" \ - "setup=setenv setupargs console=tty1 console=${console},${baudrate} " \ - "consoleblank=0 earlycon=ns16550a,mmio32,0x02800000\0" \ "update_tiboot3=askenv confirm Did you load tiboot3.bin (y/N)?; " \ "if test \"$confirm\" = \"y\"; then " \ "setexpr blkcnt ${filesize} + 0x1ff && setexpr blkcnt " \ -- 2.39.2

2 1

[PATCH] .gitignore: Add files produced by TI platform
by Andrea Calabrese 30 Apr '24

30 Apr '24

Add files produced by compilation of TI platforms: *.ti-secure(-rom) *.map *-board-config custMpk.pem *.bin_* *.fit *.itb tispl.bin_unsigned Signed-off-by: Andrea Calabrese <andrea.calabrese(a)amarulasolutions.com> --- .gitignore | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index be137040a2..870c3f1819 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ *.a *.asn1.[ch] *.bin +*.bin[_.]* *.cfgout *.cover *.dtb @@ -17,23 +18,27 @@ *.dtb.S *.elf *.exe +*.fit *.gcda *.gcno *.i *.img +*.itb *.lex.c *.lst +*.map *.mod.c *.mbx *.o *.o.* *.order *.patch +*.pem *.s *.su *.swp *.tab.[ch] - +*.ti-* # Build tree /build* -- 2.34.1

2 1

[PATCH v1] arm: dts: verdin-am62: use gpio-hog for sleep moci
by Stefan Eichenberger 30 Apr '24

30 Apr '24

From: Stefan Eichenberger <stefan.eichenberger(a)toradex.com> In Linux, we allow sleep moci to be turned off when the carrier board supports it and the system is in suspend. In U-Boot, however, we want the sleep moci to be always on. So we use a gpio hog and disable the regulator. This change is necessary because we switched to upstream device tree files with commit c07bba7a2c7e ("verdin-am62: move verdin am62 to OF_UPSTREAM"). A recent upstream patch removes the gpio hog from the Linux device tree, so we need to add it to the u-boot dtsi. The following patch will remove the gpio hog from the Linux device tree: https://lore.kernel.org/linux-devicetree/20240301084901.16656-1-eichest@gma… The U-Boot patch can be applied without it and will not break the build. Signed-off-by: Stefan Eichenberger <stefan.eichenberger(a)toradex.com> --- arch/arm/dts/k3-am625-verdin-wifi-dev-u-boot.dtsi | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/arch/arm/dts/k3-am625-verdin-wifi-dev-u-boot.dtsi b/arch/arm/dts/k3-am625-verdin-wifi-dev-u-boot.dtsi index 7fe7ae4154..9ecb305274 100644 --- a/arch/arm/dts/k3-am625-verdin-wifi-dev-u-boot.dtsi +++ b/arch/arm/dts/k3-am625-verdin-wifi-dev-u-boot.dtsi @@ -91,6 +91,14 @@ &main_gpio0 { bootph-all; + + ctrl-sleep-moci-hog { + bootph-all; + gpio-hog; + gpios = <31 GPIO_ACTIVE_HIGH>; + line-name = "CTRL_SLEEP_MOCI#"; + output-high; + }; }; /* On-module I2C - PMIC_I2C */ @@ -165,10 +173,6 @@ status = "disabled"; }; -&verdin_ctrl_sleep_moci { - bootph-all; -}; - /* Verdin UART_2 */ &wkup_uart0 { bootph-all; -- 2.40.1

2 1

[PATCH] board: ti: j721e: Add support for both esm probe
by Udit Kumar 30 Apr '24

30 Apr '24

At present only MCU domain ESM is probed, this means errors occurred in mcu domain will be propagate to MCU_SAFETY_ERRORn. MCU ESM accepts SOC_SAFETY_ERRORn signal as Error event and propagate to MCU_SAFETY_ERRORn.[0] Therefore adding support to probe both main domain and mcu domain ESM. [0]: https://www.ti.com/lit/zip/spruil1 spruil1c.pdf from zip Figure 12-1244. ESM Modules Overview Signed-off-by: Udit Kumar <u-kumar1(a)ti.com> --- board/ti/j721e/evm.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/board/ti/j721e/evm.c b/board/ti/j721e/evm.c index 9dc3ed6dff..539eaf4718 100644 --- a/board/ti/j721e/evm.c +++ b/board/ti/j721e/evm.c @@ -465,10 +465,13 @@ void spl_board_init(void) } if (IS_ENABLED(CONFIG_ESM_K3)) { - ret = uclass_get_device_by_driver(UCLASS_MISC, - DM_DRIVER_GET(k3_esm), &dev); + ret = uclass_get_device_by_name(UCLASS_MISC, "esm@700000", &dev); + if (ret) + printf("MISC init for esm@700000 failed: %d\n", ret); + + ret = uclass_get_device_by_name(UCLASS_MISC, "esm@40800000", &dev); if (ret) - printf("ESM init failed: %d\n", ret); + printf("MISC init for esm@40800000 failed: %d\n", ret); } if (IS_ENABLED(CONFIG_ESM_PMIC)) { -- 2.34.1

3 2

[PATCH v2] configs: am62px_evm_a53_defconfig: Enable MMC UHS config option
by Judith Mendez 30 Apr '24

30 Apr '24

Enable MMC UHS support for to allow to enter the UHS modes for MMC1. Signed-off-by: Judith Mendez <jm(a)ti.com> --- Changes since v1: - Fix typo in patch description --- configs/am62px_evm_a53_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/am62px_evm_a53_defconfig b/configs/am62px_evm_a53_defconfig index 2621abb8ce1..d1ae18bedf6 100644 --- a/configs/am62px_evm_a53_defconfig +++ b/configs/am62px_evm_a53_defconfig @@ -115,6 +115,8 @@ CONFIG_FS_LOADER=y CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_MMC_IO_VOLTAGE=y CONFIG_SPL_MMC_IO_VOLTAGE=y +CONFIG_MMC_UHS_SUPPORT=y +CONFIG_SPL_MMC_UHS_SUPPORT=y CONFIG_MMC_HS400_SUPPORT=y CONFIG_SPL_MMC_HS400_SUPPORT=y CONFIG_MMC_SDHCI=y base-commit: bc39e06778168a34bb4e0a34fbee4edbde4414d8 -- 2.43.2

3 2