September 2021 - U-Boot

[PATCH] Makefile: Add a warning about ad-hoc CONFIG options
by Simon Glass 21 Oct '21

21 Oct '21

The Kconfig feature was added in 2014. Some 7 years later there are still quite a few CONFIG options that have not been migrated. It is time to close this out. Add a deadline and a warning for boards to migrate to Kconfig. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- Makefile | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Makefile b/Makefile index 3014788e14e..7e73e6df1ef 100644 --- a/Makefile +++ b/Makefile @@ -1132,6 +1132,16 @@ endif @# know about unless they are in Kconfig. All the existing CONFIG @# options are whitelisted, so new ones should not be added. $(call cmd,cfgcheck,u-boot.cfg) + @if [ -s include/autoconf.mk ]; then \ + echo >&2 "===================== WARNING ======================"; \ + echo >&2 "This board uses ad-hoc CONFIG options, i.e. those"; \ + echo >&2 "not defined by a Kconfig option."; \ + echo >&2 "Support for these will be dropped starting with the"; \ + echo >&2 "v2022.10 release. Please add new Kconfig options"; \ + echo >&2 "as needed, or use devicetree."; \ + echo >&2 "Failure to update may result in board removal."; \ + echo >&2 "===================================================="; \ + fi PHONY += dtbs dtbs: dts/dt.dtb -- 2.33.0.464.g1972c5931b-goog

2 4

[PATCH 00/11] sandbox: Minor fixes and improvements
by Simon Glass 21 Oct '21

21 Oct '21

This series collects a few patches that correct and improve sandbox and sandbox_spl: - Fix a bug in --rm-memory works - Support an MMC backing file for MMC emulator, to allow filesystems to be used without needing the 'host' filesystem - Allow skipping console output when checking verbose commands - Suppress unwanted filesystem warnings when probing partitions - Tidy up a few comments Simon Glass (11): dtoc: Further improve documentation about warnings sandbox: Correct handling of --rm_memory sandbox: Add license headers to the dts files btrfs: Suppress the message about missing filesystem sqfs: Suppress the message about missing filesystem test: Tidy a comment in the bloblist test dm: core: Fix a few incorrect comments on first/next functions sandbox: Add a way to find the size of a file sandbox: Add a way to map a file into memory sandbox: mmc: Support a backing file test: Add a way to skip console checking until a string matches arch/sandbox/cpu/os.c | 52 +++++++++-- arch/sandbox/dts/overlay0.dts | 5 ++ arch/sandbox/dts/overlay1.dts | 5 ++ arch/sandbox/dts/sandbox.dts | 5 ++ arch/sandbox/dts/sandbox.dtsi | 1 + arch/sandbox/dts/sandbox64.dts | 4 + arch/sandbox/dts/test.dts | 9 ++ doc/develop/driver-model/of-plat.rst | 92 +++++++++++++++++++- doc/device-tree-bindings/mmc/sandbox,mmc.txt | 18 ++++ drivers/mmc/sandbox_mmc.c | 46 ++++++++-- fs/btrfs/disk-io.c | 8 +- fs/squashfs/sqfs.c | 2 +- include/dm/device.h | 4 +- include/dm/uclass.h | 2 +- include/os.h | 21 +++++ include/test/ut.h | 24 +++++ test/bloblist.c | 2 +- test/ut.c | 26 ++++++ 18 files changed, 299 insertions(+), 27 deletions(-) create mode 100644 doc/device-tree-bindings/mmc/sandbox,mmc.txt -- 2.33.0.rc1.237.g0d66db33f3-goog

7 36

[PATCH] arm: dts: sun50i-h6-orangepi-3: disable aldo2 regulator
by Maxim Karasev 21 Oct '21

21 Oct '21

Mainline TF-A has a broken behavior - it enables all used AXP regulator outputs, without much reason. It breaks PHY on Orange Pi 3 and other boards, because they a specific power-on sequence is required. aldo2 which is enabled by TF-A is just a half of PHY's power and the other half that is untouched by TF-A must be enabled simultaneously (even a small difference may cause a break-down). If not TF-A, kernel driver would do everything correctly. However, some boards rely on this behavior, so it's impossible to get rid of it. TF-A recently started checking regulator status, and now it enables a regulator only if it's status is "okay". Disabling regulator in U-Boot's dts workarounds the problem. --- arch/arm/dts/sun50i-h6-orangepi-3.dts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/dts/sun50i-h6-orangepi-3.dts b/arch/arm/dts/sun50i-h6-orangepi-3.dts index 7e83f6146f..9f91e4ec88 100644 --- a/arch/arm/dts/sun50i-h6-orangepi-3.dts +++ b/arch/arm/dts/sun50i-h6-orangepi-3.dts @@ -207,6 +207,10 @@ regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; regulator-name = "vcc33-audio-tv-ephy-mac"; + /* This regulator must be enabled by the kernel, + * not by u-boot or TF-A, otherwise power-on + * sequence will be wrong and PHY won't work */ + status = "disabled"; }; /* ALDO3 is shorted to CLDO1 */ -- 2.33.0

3 4

[PATCH 0/2] sandbox: provide /chosen/boot-hartid property
by Heinrich Schuchardt 21 Oct '21

21 Oct '21

For booting via UEFI on RISC-V the devicetree must provide the /chosen/boot-hartid property. Fix /cpus node of the sandbox test devicetree to provide a matching cpu. Heinrich Schuchardt (2): sandbox: correct cpu nodes sandbox: provide /chosen/boot-hartid property arch/sandbox/dts/test.dts | 14 +++++++++++--- arch/sandbox/lib/Makefile | 2 +- arch/sandbox/lib/fdt_fixup.c | 25 +++++++++++++++++++++++++ drivers/cpu/cpu_sandbox.c | 2 +- test/dm/cpu.c | 2 +- test/dm/timer.c | 6 +++--- 6 files changed, 42 insertions(+), 9 deletions(-) create mode 100644 arch/sandbox/lib/fdt_fixup.c -- 2.30.2

2 7

[PATCH] dm: Fix util.h's broken include guard
by Pierre-Clément Tosi 21 Oct '21

21 Oct '21

Fix up the header's include guard to contain the definition of dm_priv_to_rw(), which was erroneously added outside of it, by moving its #endif to the end of the file (i.e. where it belongs). This removes the risk of compilation errors resulting from the redefinition of that function where the header might have been (indirectly) included more than once. Fixes: cfb9c9b77c2 ("dm: core: Use separate priv/plat data region") Signed-off-by: Pierre-Clément Tosi <ptosi(a)google.com> Cc: Simon Glass <sjg(a)chromium.org> --- include/dm/util.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/dm/util.h b/include/dm/util.h index c634e470e7..17baf55c25 100644 --- a/include/dm/util.h +++ b/include/dm/util.h @@ -48,8 +48,6 @@ void dm_dump_driver_compat(void); /* Dump out a list of drivers with static platform data */ void dm_dump_static_driver_info(void); -#endif - #if CONFIG_IS_ENABLED(OF_PLATDATA_INST) && CONFIG_IS_ENABLED(READ_ONLY) void *dm_priv_to_rw(void *priv); #else @@ -58,3 +56,5 @@ static inline void *dm_priv_to_rw(void *priv) return priv; } #endif + +#endif -- 2.33.0.685.g46640cef36-goog

2 1

[PATCH v2] mx7ulp: add getting a board serial number
by Oleksandr Suvorov 21 Oct '21

21 Oct '21

From: Ricardo Salveti <ricardo(a)foundries.io> Get Unique ID of SoC iMX7ULP, using the logic described in Fusemap (IMX7ULPRMB2_Rev0_Fusemap) attached in the i.MX 7ULP APRM [1]. [1] https://www.nxp.com/docs/en/reference-manual/IMX7ULPRMB2.pdf Signed-off-by: Ricardo Salveti <ricardo(a)foundries.io> Co-developed-by: Oleksandr Suvorov <oleksandr.suvorov(a)foundries.io> Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov(a)foundries.io> --- Changes in v2: - rebase the commit on top of the following series: https://patchwork.ozlabs.org/project/uboot/list/?series=260161 arch/arm/mach-imx/mx7ulp/soc.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/arch/arm/mach-imx/mx7ulp/soc.c b/arch/arm/mach-imx/mx7ulp/soc.c index 320f24dd29..baf18cf8b7 100644 --- a/arch/arm/mach-imx/mx7ulp/soc.c +++ b/arch/arm/mach-imx/mx7ulp/soc.c @@ -13,6 +13,7 @@ #include <asm/arch/sys_proto.h> #include <asm/mach-imx/boot_mode.h> #include <asm/mach-imx/hab.h> +#include <asm/setup.h> #include <linux/bitops.h> #define PMC0_BASE_ADDR 0x410a1000 @@ -363,3 +364,25 @@ enum boot_device get_boot_device(void) return boot_dev; } + +#ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG +/* + * OCOTP_CFG (SJC CHALLENGE, Unique ID) + * i.MX 7ULP Applications Processor Reference Manual, Rev. 0, 09/2020 + * + * OCOTP_CFG0 offset 0x4B0: 15:0 -> 15:0 bits of Unique ID + * OCOTP_CFG1 offset 0x4C0: 15:0 -> 31:16 bits of Unique ID + * OCOTP_CFG2 offset 0x4D0: 15:0 -> 47:32 bits of Unique ID + * OCOTP_CFG3 offset 0x4E0: 15:0 -> 63:48 bits of Unique ID + */ +void get_board_serial(struct tag_serialnr *serialnr) +{ + struct ocotp_regs *ocotp = (struct ocotp_regs *)OCOTP_BASE_ADDR; + struct fuse_bank *bank = &ocotp->bank[1]; + struct fuse_bank1_regs *fuse = + (struct fuse_bank1_regs *)bank->fuse_regs; + + serialnr->low = (fuse->cfg0 & 0xFFFF) + ((fuse->cfg1 & 0xFFFF) << 16); + serialnr->high = (fuse->cfg2 & 0xFFFF) + ((fuse->cfg3 & 0xFFFF) << 16); +} +#endif /* CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG */ -- 2.31.1

3 2

[PATCH 1/7] arm: mach-imx: Update MAC fuse for i.MX8MP
by Ye Li 21 Oct '21

21 Oct '21

i.MX8MP has two ENET controllers, have to update the function to enable loading two MAC addresses. Signed-off-by: Ye Li <ye.li(a)nxp.com> --- arch/arm/mach-imx/mac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-imx/mac.c b/arch/arm/mach-imx/mac.c index 3b1496b..9bb63d2 100644 --- a/arch/arm/mach-imx/mac.c +++ b/arch/arm/mach-imx/mac.c @@ -31,7 +31,7 @@ void imx_get_mac_from_fuse(int dev_id, unsigned char *mac) offset = is_mx6() ? MAC_FUSE_MX6_OFFSET : MAC_FUSE_MX7_OFFSET; fuse = (struct imx_mac_fuse *)(ulong)(OCOTP_BASE_ADDR + offset); - has_second_mac = is_mx7() || is_mx6sx() || is_mx6ul() || is_mx6ull(); + has_second_mac = is_mx7() || is_mx6sx() || is_mx6ul() || is_mx6ull() || is_imx8mp(); if (has_second_mac && dev_id == 1) { u32 value = readl(&fuse->mac_addr2); -- 2.7.4

3 14

[PATCH] tools: imx8m_image: Support ddr3 firmware
by Ariel D'Alessandro 21 Oct '21

21 Oct '21

Some boards use ddr3, not ddr4, so we need to check ddr3 firmware. Signed-off-by: Ariel D'Alessandro <ariel.dalessandro(a)collabora.com> --- tools/imx8m_image.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tools/imx8m_image.sh b/tools/imx8m_image.sh index ba601044435..4ab3116ee00 100755 --- a/tools/imx8m_image.sh +++ b/tools/imx8m_image.sh @@ -41,6 +41,13 @@ if [ $post_process = 1 ]; then cat spl/u-boot-spl-pad.bin ddr4_1d_fw.bin ddr4_2d_fw.bin > spl/u-boot-spl-ddr.bin rm -f ddr4_1d_fw.bin ddr4_2d_fw.bin ddr4_imem_1d_pad.bin ddr4_dmem_1d_pad.bin ddr4_imem_2d_pad.bin spl/u-boot-spl-pad.bin fi + if [ -f ddr3_imem_1d.bin ]; then + objcopy -I binary -O binary --pad-to 0x8000 --gap-fill=0x0 ddr3_imem_1d.bin ddr3_imem_1d_pad.bin + cat ddr3_imem_1d_pad.bin ddr3_dmem_1d.bin > ddr3_1d_fw.bin + dd if=spl/u-boot-spl.bin of=spl/u-boot-spl-pad.bin bs=4 conv=sync + cat spl/u-boot-spl-pad.bin ddr3_1d_fw.bin > spl/u-boot-spl-ddr.bin + rm -f ddr3_1d_fw.bin ddr3_imem_1d_pad.bin spl/u-boot-spl-pad.bin + fi fi exit 0 -- 2.30.2

3 3

[PATCH] arm: dts: imx8mp: Delete default clocks for clock controller node
by Ye Li 21 Oct '21

21 Oct '21

Since SPL has initialized clocks for bus and core. We don't need to set the default clocks for clock controller node. Signed-off-by: Ye Li <ye.li(a)nxp.com> --- arch/arm/dts/imx8mp-u-boot.dtsi | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm/dts/imx8mp-u-boot.dtsi b/arch/arm/dts/imx8mp-u-boot.dtsi index d61346d..a6ede2e 100644 --- a/arch/arm/dts/imx8mp-u-boot.dtsi +++ b/arch/arm/dts/imx8mp-u-boot.dtsi @@ -18,6 +18,9 @@ &clk { u-boot,dm-spl; u-boot,dm-pre-reloc; + /delete-property/ assigned-clocks; + /delete-property/ assigned-clock-parents; + /delete-property/ assigned-clock-rates; }; &osc_32k { -- 2.7.4

6 5

[PATCH v2] board: ea: mx7ulp_com: allocate specific region of memory to OP-TEE
by Oleksandr Suvorov 21 Oct '21

21 Oct '21

From: Ricardo Salveti <ricardo(a)foundries.io> On the iMX7ULP uCOM board, OP-TEE uses the memory region defined by the maximum DRAM address minus CONFIG_OPTEE_TZDRAM_SIZE, so subtract CONFIG_OPTEE_TZDRAM_SIZE from the available DRAM size to avoid conflicts. Note the OPTEE boot process itself subtracts the DRAM region it lives in from the memory map passed to Linux. Signed-off-by: Ricardo Salveti <ricardo(a)foundries.io> Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov(a)foundries.io> Reviewed-by: Fabio Estevam <festevam(a)gmail.com> --- Changes in v2: - add missed Signed-off-by - add Reviewed-by board/ea/mx7ulp_com/mx7ulp_com.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/board/ea/mx7ulp_com/mx7ulp_com.c b/board/ea/mx7ulp_com/mx7ulp_com.c index 5b2d444366..7fce75ade9 100644 --- a/board/ea/mx7ulp_com/mx7ulp_com.c +++ b/board/ea/mx7ulp_com/mx7ulp_com.c @@ -20,6 +20,10 @@ int dram_init(void) { gd->ram_size = imx_ddr_size(); +#ifdef CONFIG_OPTEE_TZDRAM_SIZE + gd->ram_size -= CONFIG_OPTEE_TZDRAM_SIZE; +#endif + return 0; } -- 2.31.1

2 1