April 2022 - U-Boot

[PATCH 0/2] usb: dwc3: Fix build without driver model
by Alban Bedel 20 Apr '22

20 Apr '22

Hi everyone, Platform with DWC3 that need USB support in the SPL might not be able to use the driver model there while the main u-boot is using driver model. This series allow building with such a configuration, it first fix 2 warnings when the core is built without driver model and then fix the SPL linking when one of the glue driver is enabled for the main u-boot. Alban Bedel (2): usb: dwc3: core: Fix warnings when building without driver model usb: dwc3: Don't build DM drivers in SPL unless DM USB is available drivers/usb/dwc3/Makefile | 9 ++++++--- drivers/usb/dwc3/core.c | 5 +++-- 2 files changed, 9 insertions(+), 5 deletions(-) -- 2.32.0

3 5

[PATCH 1/2] armv8: fsl-layerscape: Respect Kconfig for erratum A009007
by Sean Anderson 20 Apr '22

20 Apr '22

There is a Kconfig for this erratum, but it is ignored for armv8. Respect it. Signed-off-by: Sean Anderson <sean.anderson(a)seco.com> --- arch/arm/cpu/armv8/fsl-layerscape/soc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/soc.c b/arch/arm/cpu/armv8/fsl-layerscape/soc.c index d3a5cfaac1..926f8f21b6 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/soc.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/soc.c @@ -206,6 +206,9 @@ static void erratum_a008997(void) static void erratum_a009007(void) { + if (!IS_ENABLED(CONFIG_SYS_FSL_ERRATUM_A009007)) + return; + #if defined(CONFIG_ARCH_LS1043A) || defined(CONFIG_ARCH_LS1046A) || \ defined(CONFIG_ARCH_LS1012A) void __iomem *usb_phy = (void __iomem *)SCFG_USB_PHY1; -- 2.25.1

2 3

[PATCH] riscv: ae350: Fix xip config boot failure
by Andes 20 Apr '22

20 Apr '22

From: Rick Chen <rick(a)andestech.com> It will fail to boot with ae350_rv[32|64]_spl_xip_defconfig. It need to add OONFIG_XIP to get the specific HW address for DTB. Also drop OF_SEPARATE in board_fdt_blob_setup() because it will never reach here anyway.It only allow OF_BOARD to call board_fdt_blob_setup() in fdtdec_setup(). Fixes: 2e8d2f88439d ("riscv: Remove OF_PRIOR_STAGE from RISC-V boards") Signed-off-by: Rick Chen <rick(a)andestech.com> --- board/AndesTech/ax25-ae350/ax25-ae350.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/board/AndesTech/ax25-ae350/ax25-ae350.c b/board/AndesTech/ax25-ae350/ax25-ae350.c index d6a4291..9ca7fdf 100644 --- a/board/AndesTech/ax25-ae350/ax25-ae350.c +++ b/board/AndesTech/ax25-ae350/ax25-ae350.c @@ -54,13 +54,20 @@ ulong board_flash_get_legacy(ulong base, int banknum, flash_info_t *info) return 0; } +#define ANDES_HW_DTB_ADDRESS 0xF2000000 void *board_fdt_blob_setup(int *err) { *err = 0; + #if defined(CONFIG_OF_BOARD) - return (void *)(ulong)gd->arch.firmware_fdt_addr; -#elif defined(CONFIG_OF_SEPARATE) +#if (defined(CONFIG_XIP) && CONFIG_IS_ENABLED(RISCV_MMODE)) + if (fdt_magic(CONFIG_SYS_FDT_BASE) == FDT_MAGIC) return (void *)CONFIG_SYS_FDT_BASE; + return (void *)ANDES_HW_DTB_ADDRESS; +#else + + return (void *)(ulong)gd->arch.firmware_fdt_addr; +#endif #else *err = -EINVAL; return NULL; -- 2.7.4

1 0

binman and faked blobs failures
by Tom Rini 19 Apr '22

19 Apr '22

Hey, So here's a problem I have. Today if I'm in a branch that has a commit that's not in it's upstream branch (so lets say I'm testing a bunch of patches I grabbed from patchwork in a local branch that knows master is the upstream) and I do: export SOURCE_DATE_EPOCH=1649712313 ./tools/buildman/buildman -o /tmp/chromebook_samus -devl --step 0 -b testing -SBC chromebook_samus Building 2 commits for 2 boards (2 threads, 8 jobs per thread) 01: linux/mtd/mtd.h: Add <dm/ofnode.h> x86: w+ chromebook_samus +(chromebook_samus) Image 'main-section' is missing external blobs and is non-functional: intel-descriptor intel-me intel-refcode intel-vga intel-mrc +(chromebook_samus) Image 'main-section' has faked external blobs and is non-functional: descriptor.bin me.bin refcode.bin vga.bin mrc.bin +(chromebook_samus) +(chromebook_samus) Some images are invalid 02: HACK x86: + chromebook_samus +(chromebook_samus) binman: Node '/binman/rom/intel-descriptor': Cannot find Intel Flash Descriptor (FD) signature +(chromebook_samus) make[1]: *** [Makefile:1101: all] Error 1 +(chromebook_samus) make: *** [Makefile:177: sub-make] Error 2 01: linux/mtd/mtd.h: Add <dm/ofnode.h> x86: w+ chromebook_samus_tpl +(chromebook_samus_tpl) Image 'main-section' is missing external blobs and is non-functional: intel-descriptor intel-me intel-refcode intel-vga intel-mrc +(chromebook_samus_tpl) Image 'main-section' has faked external blobs and is non-functional: descriptor.bin me.bin refcode.bin vga.bin mrc.bin +(chromebook_samus_tpl) +(chromebook_samus_tpl) Some images are invalid 02: HACK x86: + chromebook_samus_tpl +(chromebook_samus_tpl) binman: Node '/binman/rom/intel-descriptor': Cannot find Intel Flash Descriptor (FD) signature +(chromebook_samus_tpl) make[1]: *** [Makefile:1101: all] Error 1 +(chromebook_samus_tpl) make: *** [Makefile:177: sub-make] Error 2 0 2 2 /4 chromebook_samus_tpl Completed: 4 total built, duration 0:00:31, rate 0.13 Note that nothing changed for the board but on the second build now the faked blob is unhappy and causes a failure message that I don't see the first time, and probably shouldn't see this time either? This is a problem for me in that it's on most x86 boards and so makes it easier to miss other real build failures in my testing. -- Tom

3 2

Falcon Mode Support For Uncompressed Kernel Images
by Nathan Barrett-Morrison 19 Apr '22

19 Apr '22

Hi Tom, While trying to bring up Falcon Mode boot on an ARM64 board, I discovered that there is no path which allows you to use an uncompressed kernel image (booti). I've added this path and attached the relevant patch. Sincerely, Nathan >From f1c34333f79996bd2927a60f4858c01699431cba Mon Sep 17 00:00:00 2001 From: Nathan Barrett-Morrison <nathan.morrison(a)timesys.com> Date: Wed, 2 Feb 2022 15:05:18 -0500 Subject: [PATCH v2] Add in the ability to load and boot an uncompressed kernel image during the Falcon Mode boot sequence. This is required for architectures which do not support compressed kernel images (i.e. ARM64). This is only used while not booting via FIT image. Signed-off-by: Nathan Barrett-Morrison <nathan.morrison(a)timesys.com> Cc: Tom Rini <trini(a)konsulko.com> --- Changes for v2: - Remove original SPL_OS_BOOT_UNCOMPRESSED option and check via CMD_BOOTI and CMD_BOOTZ instead arch/arm/lib/Makefile | 5 ++++- common/spl/spl.c | 21 +++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile index c603fe61bc..08b7475e37 100644 --- a/arch/arm/lib/Makefile +++ b/arch/arm/lib/Makefile @@ -36,7 +36,10 @@ obj-$(CONFIG_CMD_BOOTZ) += bootm.o zimage.o obj-$(CONFIG_SYS_L2_PL310) += cache-pl310.o else obj-$(CONFIG_$(SPL_TPL_)FRAMEWORK) += spl.o -obj-$(CONFIG_SPL_FRAMEWORK) += zimage.o +ifdef CONFIG_SPL_FRAMEWORK +obj-$(CONFIG_CMD_BOOTI) += image.o +obj-$(CONFIG_CMD_BOOTZ) += zimage.o +endif obj-$(CONFIG_OF_LIBFDT) += bootm-fdt.o endif ifdef CONFIG_ARM64 diff --git a/common/spl/spl.c b/common/spl/spl.c index c9750ee163..7b86443f1b 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -107,6 +107,11 @@ int __weak bootz_setup(ulong image, ulong *start, ulong *end) { return 1; } + +int __weak booti_setup(ulong image, ulong *relocated_addr, ulong *size, bool force_reloc) +{ + return 1; +} #endif /* Weak default function for arch/board-specific fixups to the spl_image_info */ @@ -366,6 +371,21 @@ int spl_parse_image_header(struct spl_image_info *spl_image, #endif #if CONFIG_IS_ENABLED(OS_BOOT) +#if defined(CMD_BOOTI) + ulong start, size; + + if (!booti_setup((ulong)header, &start, &size, 0)) { + spl_image->name = "Linux"; + spl_image->os = IH_OS_LINUX; + spl_image->load_addr = start; + spl_image->entry_point = start; + spl_image->size = size; + debug(SPL_TPL_PROMPT + "payload Image, load addr: 0x%lx size: %d\n", + spl_image->load_addr, spl_image->size); + return 0; + } +#elif defined(CMD_BOOTZ) ulong start, end; if (!bootz_setup((ulong)header, &start, &end)) { @@ -379,6 +399,7 @@ int spl_parse_image_header(struct spl_image_info *spl_image, spl_image->load_addr, spl_image->size); return 0; } +#endif #endif if (!spl_parse_board_header(spl_image, bootdev, (const void *)header, sizeof(*header))) -- 2.30.2

2 1

drivers: mtd: spi: Allow Quad I/O enablement for ISSI SPI flash devices alongside spi-nor-tiny.c subsystem
by Nathan Barrett-Morrison 19 Apr '22

19 Apr '22

Hi All, I noticed this was missing from the spi-nor-tiny.c subsystem while trying to use an ISSI SPI flash device with the U-Boot SPL. This patch will allow Quad (4x) I/O mode to be enabled with ISSI flash devices while inside the U-Boot SPL / using spi-nor-tiny.c. Sincerely, Nathan >From 1a7fd52f21d3d3ad4b2ff736a9ea3c1affb9c007 Mon Sep 17 00:00:00 2001 From: Nathan Barrett-Morrison <nathan.morrison(a)timesys.com> Date: Wed, 26 Jan 2022 13:44:39 -0500 Subject: [PATCH] drivers: mtd: spi: Allow Quad I/O enablement for ISSI SPI flash devices alongside spi-nor-tiny.c subsystem Signed-off-by: Nathan Barrett-Morrison <nathan.morrison(a)timesys.com> Cc: Jagan Teki <jagan(a)amarulasolutions.com> Cc: Vignesh R <vigneshr(a)ti.com> CC: Tom Rini <trini(a)konsulko.com> --- drivers/mtd/spi/spi-nor-tiny.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/mtd/spi/spi-nor-tiny.c b/drivers/mtd/spi/spi-nor-tiny.c index 130917aaa8..4957448d11 100644 --- a/drivers/mtd/spi/spi-nor-tiny.c +++ b/drivers/mtd/spi/spi-nor-tiny.c @@ -664,6 +664,7 @@ static int spi_nor_setup(struct spi_nor *nor, const struct flash_info *info, switch (JEDEC_MFR(info)) { #ifdef CONFIG_SPI_FLASH_MACRONIX case SNOR_MFR_MACRONIX: + case SNOR_MFR_ISSI: err = macronix_quad_enable(nor); break; #endif -- 2.34.1

1 0

Falcon Mode Support For Uncompressed Kernel Images
by Nathan Barrett-Morrison 19 Apr '22

19 Apr '22

Hi All, While trying to bring up Falcon Mode boot on an ARM64 board, I discovered that there is no path which allows you to use an uncompressed kernel image (booti). I've added this path and attached the relevant patch. I've made this a separate if/else CONFIG option instead of allowing both bootz+booti paths to coexist, as it seems unlikely to me that there would be such a board which needs both. Most architectures use either bootz or booti, but not both. Sincerely, Nathan Barrett-Morrison

2 8

drivers: mtd: spi: Use correct 4 byte mode enablement for ISSI SPI flash devices alongside spi-nor-tiny.c subsystem
by Nathan Barrett-Morrison 19 Apr '22

19 Apr '22

Hi All, I noticed this was missing from the spi-nor-tiny.c subsystem while trying to use an ISSI SPI flash device with the U-Boot SPL. This patch will allow 4 byte addressing mode to be enabled with ISSI flash devices while inside the U-Boot SPL / using spi-nor-tiny.c. Sincerely, Nathan >From 218e00fcaea8c5795e792af09f5d21fc19e3d831 Mon Sep 17 00:00:00 2001 From: Nathan Barrett-Morrison <nathan.morrison(a)timesys.com> Date: Wed, 26 Jan 2022 13:43:53 -0500 Subject: [PATCH] drivers: mtd: spi: Use correct 4 byte mode enablement for ISSI SPI flash devices alongside spi-nor-tiny.c subsystem Signed-off-by: Nathan Barrett-Morrison <nathan.morrison(a)timesys.com> Cc: Jagan Teki <jagan(a)amarulasolutions.com> Cc: Vignesh R <vigneshr(a)ti.com> CC: Tom Rini <trini(a)konsulko.com> --- drivers/mtd/spi/spi-nor-tiny.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/mtd/spi/spi-nor-tiny.c b/drivers/mtd/spi/spi-nor-tiny.c index 68152ce3b4..130917aaa8 100644 --- a/drivers/mtd/spi/spi-nor-tiny.c +++ b/drivers/mtd/spi/spi-nor-tiny.c @@ -219,6 +219,7 @@ static inline int set_4byte(struct spi_nor *nor, const struct flash_info *info, case SNOR_MFR_MICRON: /* Some Micron need WREN command; all will accept it */ need_wren = true; + case SNOR_MFR_ISSI: case SNOR_MFR_MACRONIX: case SNOR_MFR_WINBOND: if (need_wren) -- 2.34.1

1 0

[PATCH] board: ls1046afrwy: Remove Manish Tomar's email
by Sean Anderson 19 Apr '22

19 Apr '22

Manish Tomar's email bounces. Remove it, and reassign the config he was maintaining to the primary maintainer for the board. Signed-off-by: Sean Anderson <sean.anderson(a)seco.com> --- board/freescale/ls1046afrwy/MAINTAINERS | 4 ---- 1 file changed, 4 deletions(-) diff --git a/board/freescale/ls1046afrwy/MAINTAINERS b/board/freescale/ls1046afrwy/MAINTAINERS index cb8aa8c378..8f360e1820 100644 --- a/board/freescale/ls1046afrwy/MAINTAINERS +++ b/board/freescale/ls1046afrwy/MAINTAINERS @@ -5,8 +5,4 @@ F: board/freescale/ls1046afrwy/ F: board/freescale/ls1046afrwy/ls1046afrwy.c F: include/configs/ls1046afrwy.h F: configs/ls1046afrwy_tfa_defconfig - -LS1046AFRWY_SECURE_BOOT BOARD -M: Manish Tomar <manish.tomar(a)nxp.com> -S: Maintained F: configs/ls1046afrwy_tfa_SECURE_BOOT_defconfig -- 2.35.1.1320.gc452695387.dirty

1 0

U-Boot and switching away from arch/arm/mach-imx/mkimage_fit_atf.sh
by Tom Rini 19 Apr '22

19 Apr '22

Hey all, Currently, the following defconfigs are the only ones left using the above mentioned script, rather than binman, to generate the final binaries: configs/cgtqmx8_defconfig configs/imx8mm-icore-mx8mm-ctouch2_defconfig configs/imx8mm-icore-mx8mm-edimm2.2_defconfig What's needed to migrate these platforms over? There are examples such as 7d926c9544c2 ("imx8mm_venice: switch to use binman to pack images") for how to perform such a migration. Thanks! -- Tom

1 0