December 2022 - U-Boot

[PATCH] configs: set CONFIG_LMB_MAX_REGIONS=64 for all mt798[16] boards
by Daniel Golle 12 Dec '22

12 Dec '22

With recently added wireless offloading features in Linux [1] the number of reserved memory regions with MediaTek SoCs supporting offloading wireless-to-Ethernet traffic grew beyond the default (8) which breaks booting Linux: ERROR: Failed to allocate 0xa6ac bytes below 0xc0000000. device tree - allocation error FDT creation failed! resetting ... Raise CONFIG_LMB_MAX_REGIONS to 64 like it is already done for other SoCs which require a larger number of reserved memory regions, eg. exynos78x0 based a3y17lte, a5y17lte and a7y17lte or dragonboard845c. [1]: https://lore.kernel.org/netdev/e3489a697b404bd47447190cd2e5adf090ae61c2.166… https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git/commit/… Signed-off-by: Daniel Golle <daniel(a)makrotopia.org> --- configs/mt7981_emmc_rfb_defconfig | 1 + configs/mt7981_rfb_defconfig | 1 + configs/mt7981_sd_rfb_defconfig | 1 + configs/mt7986_rfb_defconfig | 1 + configs/mt7986a_bpir3_emmc_defconfig | 1 + configs/mt7986a_bpir3_sd_defconfig | 1 + 6 files changed, 6 insertions(+) diff --git a/configs/mt7981_emmc_rfb_defconfig b/configs/mt7981_emmc_rfb_defconfig index 4832a22643..b3b37b6e5e 100644 --- a/configs/mt7981_emmc_rfb_defconfig +++ b/configs/mt7981_emmc_rfb_defconfig @@ -62,3 +62,4 @@ CONFIG_MTK_SERIAL=y CONFIG_FAT_WRITE=y CONFIG_HEXDUMP=y # CONFIG_EFI_LOADER is not set +CONFIG_LMB_MAX_REGIONS=64 diff --git a/configs/mt7981_rfb_defconfig b/configs/mt7981_rfb_defconfig index c397527887..b7ffb4dfa7 100644 --- a/configs/mt7981_rfb_defconfig +++ b/configs/mt7981_rfb_defconfig @@ -64,3 +64,4 @@ CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_MTK_SPIM=y CONFIG_HEXDUMP=y +CONFIG_LMB_MAX_REGIONS=64 diff --git a/configs/mt7981_sd_rfb_defconfig b/configs/mt7981_sd_rfb_defconfig index 17592dc22b..85be9bbc50 100644 --- a/configs/mt7981_sd_rfb_defconfig +++ b/configs/mt7981_sd_rfb_defconfig @@ -62,3 +62,4 @@ CONFIG_MTK_SERIAL=y CONFIG_FAT_WRITE=y CONFIG_HEXDUMP=y # CONFIG_EFI_LOADER is not set +CONFIG_LMB_MAX_REGIONS=64 diff --git a/configs/mt7986_rfb_defconfig b/configs/mt7986_rfb_defconfig index 1363f9dc6d..ac91c93efb 100644 --- a/configs/mt7986_rfb_defconfig +++ b/configs/mt7986_rfb_defconfig @@ -64,3 +64,4 @@ CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_MTK_SPIM=y CONFIG_HEXDUMP=y +CONFIG_LMB_MAX_REGIONS=64 diff --git a/configs/mt7986a_bpir3_emmc_defconfig b/configs/mt7986a_bpir3_emmc_defconfig index 354159df9b..2d4876f299 100644 --- a/configs/mt7986a_bpir3_emmc_defconfig +++ b/configs/mt7986a_bpir3_emmc_defconfig @@ -62,3 +62,4 @@ CONFIG_MTK_SERIAL=y CONFIG_FAT_WRITE=y CONFIG_HEXDUMP=y # CONFIG_EFI_LOADER is not set +CONFIG_LMB_MAX_REGIONS=64 diff --git a/configs/mt7986a_bpir3_sd_defconfig b/configs/mt7986a_bpir3_sd_defconfig index db7ef98d80..08edfe7ac4 100644 --- a/configs/mt7986a_bpir3_sd_defconfig +++ b/configs/mt7986a_bpir3_sd_defconfig @@ -62,3 +62,4 @@ CONFIG_MTK_SERIAL=y CONFIG_FAT_WRITE=y CONFIG_HEXDUMP=y # CONFIG_EFI_LOADER is not set +CONFIG_LMB_MAX_REGIONS=64 -- 2.38.1

2 1

[PATCH] arm: mach-omap2: Move common image process functions out of board files
by Andrew Davis 12 Dec '22

12 Dec '22

The functions board_fit_image_post_process() and board_tee_image_process() are not actually board specific (despite their names). Any board using the OMAP2 family can use these functions. Move them to boot-common.c. Signed-off-by: Andrew Davis <afd(a)ti.com> --- arch/arm/mach-omap2/boot-common.c | 16 ++++++++++++++++ board/ti/am335x/board.c | 9 --------- board/ti/am43xx/board.c | 17 ----------------- board/ti/am57xx/board.c | 17 ----------------- board/ti/dra7xx/evm.c | 17 ----------------- 5 files changed, 16 insertions(+), 60 deletions(-) diff --git a/arch/arm/mach-omap2/boot-common.c b/arch/arm/mach-omap2/boot-common.c index c463c96c74..f955d49471 100644 --- a/arch/arm/mach-omap2/boot-common.c +++ b/arch/arm/mach-omap2/boot-common.c @@ -15,6 +15,7 @@ #include <spl.h> #include <asm/global_data.h> #include <asm/omap_common.h> +#include <asm/omap_sec_common.h> #include <asm/arch/omap.h> #include <asm/arch/mmc_host_def.h> #include <asm/arch/sys_proto.h> @@ -22,6 +23,7 @@ #include <scsi.h> #include <i2c.h> #include <remoteproc.h> +#include <image.h> DECLARE_GLOBAL_DATA_PTR; @@ -331,3 +333,17 @@ void arch_preboot_os(void) ahci_reset((void __iomem *)DWC_AHSATA_BASE); } #endif + +#ifdef CONFIG_TI_SECURE_DEVICE +void board_fit_image_post_process(const void *fit, int node, void **p_image, + size_t *p_size) +{ + secure_boot_verify_image(p_image, p_size); +} + +static void tee_image_process(ulong tee_image, size_t tee_size) +{ + secure_tee_install((u32)tee_image); +} +U_BOOT_FIT_LOADABLE_HANDLER(IH_TYPE_TEE, tee_image_process); +#endif diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c index b97fedddd5..2a09b6480b 100644 --- a/board/ti/am335x/board.c +++ b/board/ti/am335x/board.c @@ -33,7 +33,6 @@ #include <asm/emif.h> #include <asm/gpio.h> #include <asm/omap_common.h> -#include <asm/omap_sec_common.h> #include <asm/omap_mmc.h> #include <i2c.h> #include <miiphy.h> @@ -983,14 +982,6 @@ int board_fit_config_name_match(const char *name) } #endif -#ifdef CONFIG_TI_SECURE_DEVICE -void board_fit_image_post_process(const void *fit, int node, void **p_image, - size_t *p_size) -{ - secure_boot_verify_image(p_image, p_size); -} -#endif - #if !CONFIG_IS_ENABLED(OF_CONTROL) static const struct omap_hsmmc_plat am335x_mmc0_plat = { .base_addr = (struct hsmmc *)OMAP_HSMMC1_BASE, diff --git a/board/ti/am43xx/board.c b/board/ti/am43xx/board.c index 529129ecc7..9fa894d700 100644 --- a/board/ti/am43xx/board.c +++ b/board/ti/am43xx/board.c @@ -9,7 +9,6 @@ #include <common.h> #include <eeprom.h> -#include <image.h> #include <asm/global_data.h> #include <dm/uclass.h> #include <env.h> @@ -20,7 +19,6 @@ #include <linux/errno.h> #include <spl.h> #include <usb.h> -#include <asm/omap_sec_common.h> #include <asm/arch/clock.h> #include <asm/arch/sys_proto.h> #include <asm/arch/mux.h> @@ -867,18 +865,3 @@ int embedded_dtb_select(void) return 0; } #endif - -#ifdef CONFIG_TI_SECURE_DEVICE -void board_fit_image_post_process(const void *fit, int node, void **p_image, - size_t *p_size) -{ - secure_boot_verify_image(p_image, p_size); -} - -void board_tee_image_process(ulong tee_image, size_t tee_size) -{ - secure_tee_install((u32)tee_image); -} - -U_BOOT_FIT_LOADABLE_HANDLER(IH_TYPE_TEE, board_tee_image_process); -#endif diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c index cfc825e52a..511c44104e 100644 --- a/board/ti/am57xx/board.c +++ b/board/ti/am57xx/board.c @@ -11,7 +11,6 @@ #include <env.h> #include <fastboot.h> #include <fdt_support.h> -#include <image.h> #include <init.h> #include <malloc.h> #include <net.h> @@ -22,7 +21,6 @@ #include <errno.h> #include <asm/global_data.h> #include <asm/omap_common.h> -#include <asm/omap_sec_common.h> #include <asm/emif.h> #include <asm/gpio.h> #include <asm/arch/gpio.h> @@ -1197,18 +1195,3 @@ static int board_bootmode_has_emmc(void) return 0; } #endif - -#ifdef CONFIG_TI_SECURE_DEVICE -void board_fit_image_post_process(const void *fit, int node, void **p_image, - size_t *p_size) -{ - secure_boot_verify_image(p_image, p_size); -} - -void board_tee_image_process(ulong tee_image, size_t tee_size) -{ - secure_tee_install((u32)tee_image); -} - -U_BOOT_FIT_LOADABLE_HANDLER(IH_TYPE_TEE, board_tee_image_process); -#endif diff --git a/board/ti/dra7xx/evm.c b/board/ti/dra7xx/evm.c index a854d615c1..0b1fc99b94 100644 --- a/board/ti/dra7xx/evm.c +++ b/board/ti/dra7xx/evm.c @@ -13,7 +13,6 @@ #include <env.h> #include <fdt_support.h> #include <fastboot.h> -#include <image.h> #include <init.h> #include <spl.h> #include <net.h> @@ -26,7 +25,6 @@ #include <usb.h> #include <linux/usb/gadget.h> #include <asm/omap_common.h> -#include <asm/omap_sec_common.h> #include <asm/arch/gpio.h> #include <asm/arch/dra7xx_iodelay.h> #include <asm/emif.h> @@ -1063,18 +1061,3 @@ int fastboot_set_reboot_flag(enum fastboot_reboot_reason reason) return 0; } #endif - -#ifdef CONFIG_TI_SECURE_DEVICE -void board_fit_image_post_process(const void *fit, int node, void **p_image, - size_t *p_size) -{ - secure_boot_verify_image(p_image, p_size); -} - -void board_tee_image_process(ulong tee_image, size_t tee_size) -{ - secure_tee_install((u32)tee_image); -} - -U_BOOT_FIT_LOADABLE_HANDLER(IH_TYPE_TEE, board_tee_image_process); -#endif -- 2.37.3

2 2

[PATCH v1] ARM: dts: npcm7xx: add npcm750 gpio node compatible name
by Jim Liu 12 Dec '22

12 Dec '22

Add npcm750 gpio node compatible name Signed-off-by: Jim Liu <JJLIU0(a)nuvoton.com> --- arch/arm/dts/nuvoton-npcm7xx-u-boot.dtsi | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm/dts/nuvoton-npcm7xx-u-boot.dtsi b/arch/arm/dts/nuvoton-npcm7xx-u-boot.dtsi index c547e433e7..d54064091e 100644 --- a/arch/arm/dts/nuvoton-npcm7xx-u-boot.dtsi +++ b/arch/arm/dts/nuvoton-npcm7xx-u-boot.dtsi @@ -220,7 +220,7 @@ clocks = <&clk NPCM7XX_CLK_APB1>; }; gpio_0: gpio0@10000 { - compatible = "nuvoton,npcm-gpio"; + compatible = "nuvoton,npcm-gpio", "nuvoton,npcm750-gpio"; reg = <0x10000 0xB0>; #gpio-cells = <2>; gpio-controller; @@ -228,7 +228,7 @@ }; gpio_1: gpio1@11000 { - compatible = "nuvoton,npcm-gpio"; + compatible = "nuvoton,npcm-gpio", "nuvoton,npcm750-gpio"; reg = <0x11000 0xB0>; #gpio-cells = <2>; gpio-controller; @@ -236,14 +236,14 @@ }; gpio_2: gpio2@12000 { - compatible = "nuvoton,npcm-gpio"; + compatible = "nuvoton,npcm-gpio", "nuvoton,npcm750-gpio"; reg = <0x12000 0xB0>; #gpio-cells = <2>; gpio-controller; gpio-bank-name = "gpio2"; }; gpio_3: gpio3@13000 { - compatible = "nuvoton,npcm-gpio"; + compatible = "nuvoton,npcm-gpio", "nuvoton,npcm750-gpio"; reg = <0x13000 0xB0>; #gpio-cells = <2>; gpio-controller; @@ -251,7 +251,7 @@ }; gpio_4: gpio4@14000 { - compatible = "nuvoton,npcm-gpio"; + compatible = "nuvoton,npcm-gpio", "nuvoton,npcm750-gpio"; reg = <0x14000 0xB0>; #gpio-cells = <2>; gpio-controller; @@ -259,7 +259,7 @@ }; gpio_5: gpio5@15000 { - compatible = "nuvoton,npcm-gpio"; + compatible = "nuvoton,npcm-gpio", "nuvoton,npcm750-gpio"; reg = <0x15000 0xB0>; #gpio-cells = <2>; gpio-controller; @@ -267,14 +267,14 @@ }; gpio_6: gpio6@16000 { - compatible = "nuvoton,npcm-gpio"; + compatible = "nuvoton,npcm-gpio", "nuvoton,npcm750-gpio"; reg = <0x16000 0xB0>; #gpio-cells = <2>; gpio-controller; gpio-bank-name = "gpio6"; }; gpio_7: gpio7@17000 { - compatible = "nuvoton,npcm-gpio"; + compatible = "nuvoton,npcm-gpio", "nuvoton,npcm750-gpio"; reg = <0x17000 0xB0>; #gpio-cells = <2>; gpio-controller; -- 2.17.1

2 1

[PATCH v1 0/2]add npcm845 function config and dts node
by Jim Liu 12 Dec '22

12 Dec '22

Add Nuvoton BMC npcm844 function config and dts node Jim Liu (2): ARM: config: enable function for nuvoton npcm845 bmc ARM: dts: npcm8xx: add npcm845 function node arch/arm/dts/nuvoton-common-npcm8xx.dtsi | 92 + arch/arm/dts/nuvoton-npcm845-evb.dts | 129 ++ arch/arm/dts/nuvoton-npcm845-pincfg.dtsi | 2007 ++++++++++++++++++++++ arch/arm/dts/nuvoton-npcm8xx-u-boot.dtsi | 832 ++++++++- configs/arbel_evb_defconfig | 17 +- 5 files changed, 3067 insertions(+), 10 deletions(-) create mode 100644 arch/arm/dts/nuvoton-npcm845-pincfg.dtsi -- 2.17.1

2 4

[PATCH] distro/pxeboot: Handle prompt variable
by Manuel Traut 12 Dec '22

12 Dec '22

Regarding the documentation found here: https://github.com/u-boot/u-boot/blob/master/common/menu.c#L347 If both timeout and prompt is set to 0 the default entry shall be booted immediately. However the current behaviour is that the prompt is shown (tested with distroboot) until the user selects an entry (no timeout). This change implements a behaviour as documented. It was tested with distroboot. Signed-off-by: Manuel Traut <manuel.traut(a)mt.com> --- boot/pxe_utils.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/boot/pxe_utils.c b/boot/pxe_utils.c index 8133006875..075a0f2830 100644 --- a/boot/pxe_utils.c +++ b/boot/pxe_utils.c @@ -1359,7 +1359,10 @@ static int parse_pxefile_top(struct pxe_context *ctx, char *p, unsigned long bas break; case T_PROMPT: - eol_or_eof(&p); + err = parse_integer(&p, &cfg->prompt); + // Do not fail if prompt configuration is undefined + if (err < 0) + eol_or_eof(&p); break; case T_EOL: -- 2.35.1

4 3

[PATCH] net: Fix memory corruption in eth_halt() if the stop handler frees the priv member
by Bernhard Rosenkränzer 12 Dec '22

12 Dec '22

Calling eth_halt() could result in memory corruption if the stop() handler frees or modifies the priv member. A stored value of dev_get_uclass_priv() is assumed to remain valid after the stop() handler has been called, which is not always the case (e.g. rndis over usb gadget). Re-check the priv pointer after calling the stop() handler. Signed-off-by: Bernhard Rosenkränzer <bero(a)baylibre.com> --- net/eth-uclass.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/net/eth-uclass.c b/net/eth-uclass.c index f41da4b37b..410f3310c7 100644 --- a/net/eth-uclass.c +++ b/net/eth-uclass.c @@ -343,6 +343,11 @@ void eth_halt(void) return; eth_get_ops(current)->stop(current); + + priv = dev_get_uclass_priv(current); + if (!priv || !priv->running) + return; + priv->state = ETH_STATE_PASSIVE; priv->running = false; } -- 2.38.1

2 1

[PATCH v3 0/4] cmd: source: Support specifying config name
by Sean Anderson 12 Dec '22

12 Dec '22

This series adds support for using configs with the source command. See the third patch for details. Changes in v3: - Halve the quotes Changes in v2: - Add test for source command Sean Anderson (4): test: Add test for source command treewide: Use NULL for script image name cmd: source: Clean up a few lines cmd: source: Support specifying config name .../cmd_stm32prog/cmd_stm32prog.c | 2 +- boot/bootmeth_script.c | 2 +- cmd/source.c | 83 +++++++++++++------ doc/uImage.FIT/source_file_format.txt | 3 + drivers/usb/gadget/f_sdp.c | 2 +- include/image.h | 19 +++-- test/py/tests/source.its | 43 ++++++++++ test/py/tests/test_source.py | 37 +++++++++ 8 files changed, 156 insertions(+), 35 deletions(-) create mode 100644 test/py/tests/source.its create mode 100644 test/py/tests/test_source.py -- 2.35.1.1320.gc452695387.dirty

2 5

[PATCH] mtd: spi-nor-ids: add Macronix flash entry
by Jit Loon Lim 12 Dec '22

12 Dec '22

From: Tien Fong Chee <tien.fong.chee(a)intel.com> Add Macronix mx25u51245g flash entry, so this can be used on SoCFPGA devices. Signed-off-by: Tien Fong Chee <tien.fong.chee(a)intel.com> Signed-off-by: Jit Loon Lim <jit.loon.lim(a)intel.com> --- drivers/mtd/spi/spi-nor-ids.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mtd/spi/spi-nor-ids.c b/drivers/mtd/spi/spi-nor-ids.c index 4fe8b0d92c..f5cf3d0156 100644 --- a/drivers/mtd/spi/spi-nor-ids.c +++ b/drivers/mtd/spi/spi-nor-ids.c @@ -182,7 +182,7 @@ const struct flash_info spi_nor_ids[] = { { INFO("mx25l12805d", 0xc22018, 0, 64 * 1024, 256, SECT_4K) }, { INFO("mx25u12835f", 0xc22538, 0, 64 * 1024, 256, SECT_4K) }, { INFO("mx25u51245g", 0xc2253a, 0, 64 * 1024, 1024, SECT_4K | - SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_4B_OPCODES) }, + SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_4B_OPCODES) }, { INFO("mx25l12855e", 0xc22618, 0, 64 * 1024, 256, 0) }, { INFO("mx25l25635e", 0xc22019, 0, 64 * 1024, 512, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, { INFO("mx25u25635f", 0xc22539, 0, 64 * 1024, 512, SECT_4K | SPI_NOR_4B_OPCODES) }, -- 2.26.2

2 1

Please pull u-boot-marvell/master
by Stefan Roese 12 Dec '22

12 Dec '22

Hi Tom, please pull this late Marvell related fix: ---------------------------------------------------------------- - mvebu: Espressobin: Fix default env variables (Derek) ---------------------------------------------------------------- Here the Azure build, without any issues: https://dev.azure.com/sr0718/u-boot/_build/results?buildId=278&view=results Thanks, Stefan The following changes since commit 7a7b0856ca01f0dadc940f6f1bc6df44129ad9d0: Merge tag 'u-boot-nand-20221211' of https://source.denx.de/u-boot/custodians/u-boot-nand-flash (2022-12-11 09:40:25 -0500) are available in the Git repository at: git@source.denx.de:u-boot/custodians/u-boot-marvell.git for you to fetch changes up to 3a68fda33fe5b53be7e15099de856acb1f41097e: arm: mvebu: Espressobin: Fix default env variables (2022-12-12 07:36:04 +0100) ---------------------------------------------------------------- Derek LaHousse (1): arm: mvebu: Espressobin: Fix default env variables board/Marvell/mvebu_armada-37xx/board.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-)

2 1

[PULL] Pull request for u-boot master / v2023.01-rc4 = u-boot-stm32-20221212
by Patrice CHOTARD 12 Dec '22

12 Dec '22

Hi Tom Please pull these 2 patches for v2023.01-rc4 CI status: https://source.denx.de/u-boot/custodians/u-boot-stm/-/pipelines/14403 The following changes since commit 7a7b0856ca01f0dadc940f6f1bc6df44129ad9d0: Merge tag 'u-boot-nand-20221211' of https://source.denx.de/u-boot/custodians/u-boot-nand-flash (2022-12-11 09:40:25 -0500) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-stm.git tags/u-boot-stm32-20221212 for you to fetch changes up to 30257f4699e0e58818f6e6f86021a994f485ee58: dm: pmic: ignore disabled node in pmic_bind_children (2022-12-12 11:25:28 +0100) ---------------------------------------------------------------- phy: usbphyc: use regulator_set_enable_if_allowed for disabling vbus supply dm: pmic: ignore disabled node in pmic_bind_children ---------------------------------------------------------------- Patrick Delaunay (2): phy: usbphyc: use regulator_set_enable_if_allowed for disabling vbus supply dm: pmic: ignore disabled node in pmic_bind_children drivers/phy/phy-stm32-usbphyc.c | 2 +- drivers/power/pmic/pmic-uclass.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-)

2 1