March 2023 - U-Boot

[PATCH] ARM: dts: imx: Add WDT bindings on DH i.MX6 DHSOM
by Marek Vasut 30 Mar '23

30 Mar '23

Add WDT reboot bindings on DH i.MX6 DHSOM to permit the platform to reboot via WDT in U-Boot. These are custom U-Boot bindings, hence they are placed in -u-boot.dtsi . Signed-off-by: Marek Vasut <marex(a)denx.de> --- Cc: Andreas Geisreiter <ageisreiter(a)dh-electronics.de> Cc: Christoph Niedermaier <cniedermaier(a)dh-electronics.com> Cc: Fabio Estevam <festevam(a)denx.de> Cc: Peng Fan <peng.fan(a)nxp.com> Cc: Stefano Babic <sbabic(a)denx.de> Cc: u-boot(a)dh-electronics.com --- arch/arm/dts/imx6qdl-dhcom-u-boot.dtsi | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/arch/arm/dts/imx6qdl-dhcom-u-boot.dtsi b/arch/arm/dts/imx6qdl-dhcom-u-boot.dtsi index 190567ab7ba..06ad98bccf6 100644 --- a/arch/arm/dts/imx6qdl-dhcom-u-boot.dtsi +++ b/arch/arm/dts/imx6qdl-dhcom-u-boot.dtsi @@ -8,6 +8,12 @@ aliases { eeprom0 = &eeprom0; }; + + wdt-reboot { + compatible = "wdt-reboot"; + wdt = <&wdog1>; + u-boot,dm-spl; + }; }; &fec { @@ -25,3 +31,7 @@ gpio = <&gpio3 31 GPIO_ACTIVE_HIGH>; enable-active-high; }; + +&wdog1 { + u-boot,dm-spl; +}; -- 2.39.2

3 2

[PATCH 0/1] compulab: imx8mm-cl-iot-gate: Fix some function declarations in ddr.h
by Ying-Chun Liu (PaulLiu) 30 Mar '23

30 Mar '23

We have a few places here that the function declarations do not match their prototypes, correct them. This bug was found by Tom. https://lists.denx.de/pipermail/u-boot/2023-March/511786.html And we fixes this bug by modifying ddr.h instead. Ying-Chun Liu (PaulLiu) (1): compulab: imx8mm-cl-iot-gate: Fix some function declarations in ddr.h board/compulab/imx8mm-cl-iot-gate/ddr/ddr.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.39.2

4 4

[PATCH v2] clk: imx8mp: add pwm clocks support
by Tommaso Merciai 30 Mar '23

30 Mar '23

Add clocks support for the PWM controllers. This is ported from Linux v6.3.0-rc1 Signed-off-by: Tommaso Merciai <tomm.merciai(a)gmail.com> --- Changes since v1: - Use static const char instead of static const char * const on sels drivers/clk/imx/clk-imx8mp.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/drivers/clk/imx/clk-imx8mp.c b/drivers/clk/imx/clk-imx8mp.c index ffbc1d1ba9..9dc26bd156 100644 --- a/drivers/clk/imx/clk-imx8mp.c +++ b/drivers/clk/imx/clk-imx8mp.c @@ -122,6 +122,22 @@ static const char *imx8mp_gic_sels[] = {"clock-osc-24m", "sys_pll2_200m", "sys_p "sys_pll2_100m", "sys_pll1_800m", "sys_pll2_500m", "clk_ext4", "audio_pll2_out" }; +static const char *imx8mp_pwm1_sels[] = {"clock-osc-24m", "sys_pll2_100m", "sys_pll1_160m", + "sys_pll1_40m", "sys_pll3_out", "clk_ext1", + "sys_pll1_80m", "video_pll1_out", }; + +static const char *imx8mp_pwm2_sels[] = {"clock-osc-24m", "sys_pll2_100m", "sys_pll1_160m", + "sys_pll1_40m", "sys_pll3_out", "clk_ext1", + "sys_pll1_80m", "video_pll1_out", }; + +static const char *imx8mp_pwm3_sels[] = {"clock-osc-24m", "sys_pll2_100m", "sys_pll1_160m", + "sys_pll1_40m", "sys_pll3_out", "clk_ext2", + "sys_pll1_80m", "video_pll1_out", }; + +static const char *imx8mp_pwm4_sels[] = {"clock-osc-24m", "sys_pll2_100m", "sys_pll1_160m", + "sys_pll1_40m", "sys_pll3_out", "clk_ext2", + "sys_pll1_80m", "video_pll1_out", }; + static const char *imx8mp_ecspi1_sels[] = {"clock-osc-24m", "sys_pll2_200m", "sys_pll1_40m", "sys_pll1_160m", "sys_pll1_800m", "sys_pll3_out", "sys_pll2_250m", "audio_pll2_out", }; @@ -270,6 +286,10 @@ static int imx8mp_clk_probe(struct udevice *dev) clk_dm(IMX8MP_CLK_GIC, imx8m_clk_composite_critical("gic", imx8mp_gic_sels, base + 0xb200)); clk_dm(IMX8MP_CLK_ECSPI1, imx8m_clk_composite("ecspi1", imx8mp_ecspi1_sels, base + 0xb280)); clk_dm(IMX8MP_CLK_ECSPI2, imx8m_clk_composite("ecspi2", imx8mp_ecspi2_sels, base + 0xb300)); + clk_dm(IMX8MP_CLK_PWM1, imx8m_clk_composite_critical("pwm1", imx8mp_pwm1_sels, base + 0xb380)); + clk_dm(IMX8MP_CLK_PWM2, imx8m_clk_composite_critical("pwm2", imx8mp_pwm2_sels, base + 0xb400)); + clk_dm(IMX8MP_CLK_PWM3, imx8m_clk_composite_critical("pwm3", imx8mp_pwm3_sels, base + 0xb480)); + clk_dm(IMX8MP_CLK_PWM4, imx8m_clk_composite_critical("pwm4", imx8mp_pwm4_sels, base + 0xb500)); clk_dm(IMX8MP_CLK_ECSPI3, imx8m_clk_composite("ecspi3", imx8mp_ecspi3_sels, base + 0xc180)); clk_dm(IMX8MP_CLK_WDOG, imx8m_clk_composite("wdog", imx8mp_wdog_sels, base + 0xb900)); @@ -292,6 +312,10 @@ static int imx8mp_clk_probe(struct udevice *dev) clk_dm(IMX8MP_CLK_I2C2_ROOT, imx_clk_gate4("i2c2_root_clk", "i2c2", base + 0x4180, 0)); clk_dm(IMX8MP_CLK_I2C3_ROOT, imx_clk_gate4("i2c3_root_clk", "i2c3", base + 0x4190, 0)); clk_dm(IMX8MP_CLK_I2C4_ROOT, imx_clk_gate4("i2c4_root_clk", "i2c4", base + 0x41a0, 0)); + clk_dm(IMX8MP_CLK_PWM1_ROOT, imx_clk_gate4("pwm1_root_clk", "pwm1", base + 0x4280, 0)); + clk_dm(IMX8MP_CLK_PWM2_ROOT, imx_clk_gate4("pwm2_root_clk", "pwm2", base + 0x4290, 0)); + clk_dm(IMX8MP_CLK_PWM3_ROOT, imx_clk_gate4("pwm3_root_clk", "pwm3", base + 0x42a0, 0)); + clk_dm(IMX8MP_CLK_PWM4_ROOT, imx_clk_gate4("pwm4_root_clk", "pwm4", base + 0x42b0, 0)); clk_dm(IMX8MP_CLK_QSPI_ROOT, imx_clk_gate4("qspi_root_clk", "qspi", base + 0x42f0, 0)); clk_dm(IMX8MP_CLK_I2C5_ROOT, imx_clk_gate2("i2c5_root_clk", "i2c5", base + 0x4330, 0)); clk_dm(IMX8MP_CLK_I2C6_ROOT, imx_clk_gate2("i2c6_root_clk", "i2c6", base + 0x4340, 0)); -- 2.34.1

2 1

[PATCH] ARM: imx: imx8mp: fix enable_i2c_clk
by Rasmus Villemoes 30 Mar '23

30 Mar '23

In order for i2c_num==4 and 5 to stay invalid for non-imx8mp SOCs, the i2c_ccgr[] array must be sized by the number of initializers present, not with a hard-coded 6 which would implicitly initialize the last two elements with zeroes. Also, the bounds check is off-by-one. Fixes: c92c3a4453b8 "ARM: imx: imx8mp: Enable support for i2c5 and i2c6 on i.MX8MP" Signed-off-by: Rasmus Villemoes <rasmus.villemoes(a)prevas.dk> --- arch/arm/mach-imx/imx8m/clock_imx8mm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-imx/imx8m/clock_imx8mm.c b/arch/arm/mach-imx/imx8m/clock_imx8mm.c index 1f69047988..b0361944b4 100644 --- a/arch/arm/mach-imx/imx8m/clock_imx8mm.c +++ b/arch/arm/mach-imx/imx8m/clock_imx8mm.c @@ -36,14 +36,14 @@ void enable_ocotp_clk(unsigned char enable) int enable_i2c_clk(unsigned char enable, unsigned i2c_num) { - u8 i2c_ccgr[6] = { + u8 i2c_ccgr[] = { CCGR_I2C1, CCGR_I2C2, CCGR_I2C3, CCGR_I2C4, #if (IS_ENABLED(CONFIG_IMX8MP)) CCGR_I2C5_8MP, CCGR_I2C6_8MP #endif }; - if (i2c_num > ARRAY_SIZE(i2c_ccgr)) + if (i2c_num >= ARRAY_SIZE(i2c_ccgr)) return -EINVAL; clock_enable(i2c_ccgr[i2c_num], !!enable); -- 2.37.2

2 1

[PATCH v1] configs: verdin-imx8mp: Fix wrong early malloc() heap size
by Francesco Dolcini 30 Mar '23

30 Mar '23

From: Emanuele Ghidoli <emanuele.ghidoli(a)toradex.com> Set, previously unset, CONFIG_SPL_SYS_MALLOC_F_LEN to 0x4000 whose default value is 0x10000. Early malloc() uses CRAM_S at 0x184000 (CFG_MALLOC_F_ADDR), this ram area end at 0x188000. Fixes: 2bc2f817cea7 ("board: toradex: add verdin imx8m plus support") Signed-off-by: Emanuele Ghidoli <emanuele.ghidoli(a)toradex.com> Signed-off-by: Francesco Dolcini <francesco.dolcini(a)toradex.com> --- configs/verdin-imx8mp_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/verdin-imx8mp_defconfig b/configs/verdin-imx8mp_defconfig index 153c7c15197d..90588bfbd29f 100644 --- a/configs/verdin-imx8mp_defconfig +++ b/configs/verdin-imx8mp_defconfig @@ -51,6 +51,7 @@ CONFIG_SPL_BOOTROM_SUPPORT=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y # CONFIG_SPL_SHARES_INIT_SP_ADDR is not set CONFIG_SPL_STACK=0x960000 +CONFIG_SPL_SYS_MALLOC_F_LEN=0x4000 CONFIG_SYS_SPL_MALLOC=y CONFIG_HAS_CUSTOM_SPL_MALLOC_START=y CONFIG_CUSTOM_SYS_SPL_MALLOC_ADDR=0x42200000 -- 2.25.1

3 2

Please pull u-boot-marvell/next
by Stefan Roese 30 Mar '23

30 Mar '23

Hi Tom, please pull the following Marvell MVEBU related patches into next: ---------------------------------------------------------------- - mvebu: Fix boot mode detection (Pali) - mvebu: clearfog: defconfig and eMMC updates (Martin) ---------------------------------------------------------------- Here the Azure build, without any issues: https://dev.azure.com/sr0718/u-boot/_build/results?buildId=290&view=results Thanks, Stefan The following changes since commit d2ced50c4a03ae8e2953dfbb18ac163187db9aae: Merge branch '2023-03-29-assorted-platform-updates' into next (2023-03-29 21:52:28 -0400) are available in the Git repository at: git@source.denx.de:u-boot/custodians/u-boot-marvell.git next for you to fetch changes up to babc1806c2974bf92b331b1830c084677599321c: arm: mvebu: Define all options for AXP BOOT_FROM_* macros (2023-03-30 07:05:20 +0200) ---------------------------------------------------------------- Martin Rowe (3): arm: mvebu: clearfog: Fix MMC detection arm: mvebu: clearfog: Add defconfig for SPI booting arm: mvebu: clearfog: Detect MMC vs SDHC and fixup fdt Pali Rohár (7): arm: mvebu: Cleanup get_boot_device() code arm: mvebu: Remove A38x BOOT_FROM_UART_ALT 0x3f constant arm: mvebu: Remove A38x BOOT_FROM_SATA 0x22 constant arm: mvebu: Convert BOOT_FROM_* constants to function macros arm: mvebu: Define all options for A38x BOOT_FROM_* macros arm: mvebu: Define all BOOTROM_ERR_MODE_* macros arm: mvebu: Define all options for AXP BOOT_FROM_* macros arch/arm/dts/armada-388-clearfog-u-boot.dtsi | 1 + arch/arm/mach-mvebu/Kconfig | 1 + arch/arm/mach-mvebu/cpu.c | 39 ++++++------- arch/arm/mach-mvebu/include/mach/soc.h | 41 +++++++++----- board/solidrun/clearfog/clearfog.c | 33 +++++++++++ configs/clearfog_spi_defconfig | 83 ++++++++++++++++++++++++++++ 6 files changed, 164 insertions(+), 34 deletions(-) create mode 100644 configs/clearfog_spi_defconfig

2 1

[PATCH v4 1/4] bootstd: Enable BOOTSTD_DEFAULTS by default
by Simon Glass 30 Mar '23

30 Mar '23

This is needed to enable the boot command used to start standard boot. Enable it by default. This brings in quite a few features, mostly in common with DISTRO_DEFAULTS Disable this option for boards which don't have enough space. Disable CONFIG_ENV_VARS_UBOOT_CONFIG for some Xilinx boards which have a very small environment. Disable BOOTSTD_DEFAULTS for smartweb since it is too close to its limit. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- Changes in v4: - Rebase to -next boot/Kconfig | 1 + configs/bk4r1_defconfig | 1 + configs/sama5d27_giantboard_defconfig | 1 + configs/sama5d27_som1_ek_mmc1_defconfig | 1 + configs/sama5d27_som1_ek_mmc_defconfig | 1 + configs/sama5d27_som1_ek_qspiflash_defconfig | 1 + configs/sama5d27_wlsom1_ek_mmc_defconfig | 1 + configs/sama5d2_icp_mmc_defconfig | 1 + configs/sama5d2_xplained_emmc_defconfig | 1 + configs/sama5d2_xplained_mmc_defconfig | 1 + configs/sama5d2_xplained_qspiflash_defconfig | 1 + configs/sheevaplug_defconfig | 1 + configs/smartweb_defconfig | 1 + configs/taurus_defconfig | 1 + configs/tools-only_defconfig | 2 +- configs/xilinx_versal_mini_emmc0_defconfig | 1 + configs/xilinx_versal_mini_emmc1_defconfig | 1 + configs/xilinx_zynqmp_mini_emmc0_defconfig | 2 +- configs/xilinx_zynqmp_mini_emmc1_defconfig | 2 +- 19 files changed, 19 insertions(+), 3 deletions(-) diff --git a/boot/Kconfig b/boot/Kconfig index d95a2a702665..61ebc2750154 100644 --- a/boot/Kconfig +++ b/boot/Kconfig @@ -435,6 +435,7 @@ if BOOTSTD config BOOTSTD_DEFAULTS bool "Select some common defaults for standard boot" depends on BOOTSTD + default y imply USE_BOOTCOMMAND select BOOT_DEFAULTS help diff --git a/configs/bk4r1_defconfig b/configs/bk4r1_defconfig index 66adeac725ce..298518e7ea59 100644 --- a/configs/bk4r1_defconfig +++ b/configs/bk4r1_defconfig @@ -21,6 +21,7 @@ CONFIG_SYS_MEMTEST_END=0x87c00000 CONFIG_HAS_BOARD_SIZE_LIMIT=y CONFIG_BOARD_SIZE_LIMIT=520192 CONFIG_FIT=y +# CONFIG_BOOTSTD_DEFAULTS is not set CONFIG_BOOTDELAY=3 CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Enter passphrase to stop autoboot, booting in %d seconds\n" diff --git a/configs/sama5d27_giantboard_defconfig b/configs/sama5d27_giantboard_defconfig index 39d1dcdbb796..39680fcf69d7 100644 --- a/configs/sama5d27_giantboard_defconfig +++ b/configs/sama5d27_giantboard_defconfig @@ -29,6 +29,7 @@ CONFIG_DEBUG_UART=y CONFIG_ENV_VARS_UBOOT_CONFIG=y CONFIG_SYS_MONITOR_LEN=524288 CONFIG_FIT=y +# CONFIG_BOOTSTD_DEFAULTS is not set CONFIG_SD_BOOT=y CONFIG_BOOTDELAY=3 CONFIG_AUTOBOOT_KEYED=y diff --git a/configs/sama5d27_som1_ek_mmc1_defconfig b/configs/sama5d27_som1_ek_mmc1_defconfig index cdb000fe1ebe..dd76c79b82e3 100644 --- a/configs/sama5d27_som1_ek_mmc1_defconfig +++ b/configs/sama5d27_som1_ek_mmc1_defconfig @@ -28,6 +28,7 @@ CONFIG_DEBUG_UART=y CONFIG_ENV_VARS_UBOOT_CONFIG=y CONFIG_SYS_MONITOR_LEN=524288 CONFIG_FIT=y +# CONFIG_BOOTSTD_DEFAULTS is not set CONFIG_SD_BOOT=y CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y diff --git a/configs/sama5d27_som1_ek_mmc_defconfig b/configs/sama5d27_som1_ek_mmc_defconfig index 1471cebaf4d0..d5c3c01cf707 100644 --- a/configs/sama5d27_som1_ek_mmc_defconfig +++ b/configs/sama5d27_som1_ek_mmc_defconfig @@ -29,6 +29,7 @@ CONFIG_DEBUG_UART=y CONFIG_ENV_VARS_UBOOT_CONFIG=y CONFIG_SYS_MONITOR_LEN=524288 CONFIG_FIT=y +# CONFIG_BOOTSTD_DEFAULTS is not set CONFIG_SD_BOOT=y CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y diff --git a/configs/sama5d27_som1_ek_qspiflash_defconfig b/configs/sama5d27_som1_ek_qspiflash_defconfig index 1c8adfbb7a31..f765379985f8 100644 --- a/configs/sama5d27_som1_ek_qspiflash_defconfig +++ b/configs/sama5d27_som1_ek_qspiflash_defconfig @@ -29,6 +29,7 @@ CONFIG_DEBUG_UART=y CONFIG_ENV_VARS_UBOOT_CONFIG=y CONFIG_SYS_MONITOR_LEN=524288 CONFIG_FIT=y +# CONFIG_BOOTSTD_DEFAULTS is not set CONFIG_QSPI_BOOT=y CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y diff --git a/configs/sama5d27_wlsom1_ek_mmc_defconfig b/configs/sama5d27_wlsom1_ek_mmc_defconfig index eeb8d209f2b4..ec11575224ee 100644 --- a/configs/sama5d27_wlsom1_ek_mmc_defconfig +++ b/configs/sama5d27_wlsom1_ek_mmc_defconfig @@ -27,6 +27,7 @@ CONFIG_DEBUG_UART=y CONFIG_ENV_VARS_UBOOT_CONFIG=y CONFIG_SYS_MONITOR_LEN=524288 CONFIG_FIT=y +# CONFIG_BOOTSTD_DEFAULTS is not set CONFIG_SD_BOOT=y CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y diff --git a/configs/sama5d2_icp_mmc_defconfig b/configs/sama5d2_icp_mmc_defconfig index e1b602d8e5ec..2abe775480c1 100644 --- a/configs/sama5d2_icp_mmc_defconfig +++ b/configs/sama5d2_icp_mmc_defconfig @@ -27,6 +27,7 @@ CONFIG_DEBUG_UART=y CONFIG_ENV_VARS_UBOOT_CONFIG=y CONFIG_SYS_MONITOR_LEN=524288 CONFIG_FIT=y +# CONFIG_BOOTSTD_DEFAULTS is not set CONFIG_SD_BOOT=y CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y diff --git a/configs/sama5d2_xplained_emmc_defconfig b/configs/sama5d2_xplained_emmc_defconfig index 33f1b691c7ab..8fdd9e053db6 100644 --- a/configs/sama5d2_xplained_emmc_defconfig +++ b/configs/sama5d2_xplained_emmc_defconfig @@ -28,6 +28,7 @@ CONFIG_DEBUG_UART=y CONFIG_ENV_VARS_UBOOT_CONFIG=y CONFIG_SYS_MONITOR_LEN=524288 CONFIG_FIT=y +# CONFIG_BOOTSTD_DEFAULTS is not set CONFIG_SD_BOOT=y CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y diff --git a/configs/sama5d2_xplained_mmc_defconfig b/configs/sama5d2_xplained_mmc_defconfig index 7b6a3d207576..fa8468429277 100644 --- a/configs/sama5d2_xplained_mmc_defconfig +++ b/configs/sama5d2_xplained_mmc_defconfig @@ -29,6 +29,7 @@ CONFIG_DEBUG_UART=y CONFIG_ENV_VARS_UBOOT_CONFIG=y CONFIG_SYS_MONITOR_LEN=524288 CONFIG_FIT=y +# CONFIG_BOOTSTD_DEFAULTS is not set CONFIG_SD_BOOT=y CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y diff --git a/configs/sama5d2_xplained_qspiflash_defconfig b/configs/sama5d2_xplained_qspiflash_defconfig index b1892239f836..b97389cd0ae5 100644 --- a/configs/sama5d2_xplained_qspiflash_defconfig +++ b/configs/sama5d2_xplained_qspiflash_defconfig @@ -29,6 +29,7 @@ CONFIG_DEBUG_UART=y CONFIG_ENV_VARS_UBOOT_CONFIG=y CONFIG_SYS_MONITOR_LEN=524288 CONFIG_FIT=y +# CONFIG_BOOTSTD_DEFAULTS is not set CONFIG_QSPI_BOOT=y CONFIG_SD_BOOT=y CONFIG_BOOTDELAY=3 diff --git a/configs/sheevaplug_defconfig b/configs/sheevaplug_defconfig index 2e4901b840cb..8ecb35203333 100644 --- a/configs/sheevaplug_defconfig +++ b/configs/sheevaplug_defconfig @@ -18,6 +18,7 @@ CONFIG_IDENT_STRING="\nMarvell-Sheevaplug" CONFIG_SYS_LOAD_ADDR=0x800000 CONFIG_HAS_BOARD_SIZE_LIMIT=y CONFIG_BOARD_SIZE_LIMIT=524288 +# CONFIG_BOOTSTD_DEFAULTS is not set CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="${x_bootcmd_kernel}; setenv bootargs ${x_bootargs} ${x_bootargs_root}; bootm 0x6400000;" diff --git a/configs/smartweb_defconfig b/configs/smartweb_defconfig index 4cbdab0b37d8..eae8bba87da7 100644 --- a/configs/smartweb_defconfig +++ b/configs/smartweb_defconfig @@ -25,6 +25,7 @@ CONFIG_SPL=y CONFIG_ENV_OFFSET_REDUND=0x180000 CONFIG_SYS_LOAD_ADDR=0x22000000 CONFIG_FIT=y +# CONFIG_BOOTSTD_DEFAULTS is not set CONFIG_NAND_BOOT=y CONFIG_BOOTDELAY=3 CONFIG_AUTOBOOT_KEYED=y diff --git a/configs/taurus_defconfig b/configs/taurus_defconfig index 2a85c0d19026..c77ea219f6ae 100644 --- a/configs/taurus_defconfig +++ b/configs/taurus_defconfig @@ -33,6 +33,7 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI=y CONFIG_SYS_LOAD_ADDR=0x22000000 CONFIG_DEBUG_UART=y +# CONFIG_BOOTSTD_DEFAULTS is not set CONFIG_NAND_BOOT=y CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y diff --git a/configs/tools-only_defconfig b/configs/tools-only_defconfig index 23e1f0e9dba0..910986a1b55c 100644 --- a/configs/tools-only_defconfig +++ b/configs/tools-only_defconfig @@ -10,8 +10,8 @@ CONFIG_TIMESTAMP=y CONFIG_FIT_SIGNATURE=y # CONFIG_BOOTSTD_FULL is not set # CONFIG_BOOTMETH_VBE is not set -CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="run distro_bootcmd" +# CONFIG_AVB_VERIFY is not set # CONFIG_CMD_BOOTD is not set # CONFIG_CMD_BOOTM is not set # CONFIG_CMD_ELF is not set diff --git a/configs/xilinx_versal_mini_emmc0_defconfig b/configs/xilinx_versal_mini_emmc0_defconfig index 31b3c02f7389..8aadc7f6805b 100644 --- a/configs/xilinx_versal_mini_emmc0_defconfig +++ b/configs/xilinx_versal_mini_emmc0_defconfig @@ -16,6 +16,7 @@ CONFIG_SYS_PROMPT="Versal> " CONFIG_SYS_LOAD_ADDR=0x8000000 # CONFIG_EXPERT is not set CONFIG_REMAKE_ELF=y +# CONFIG_BOOTSTD_DEFAULTS is not set # CONFIG_AUTOBOOT is not set CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="run distro_bootcmd" diff --git a/configs/xilinx_versal_mini_emmc1_defconfig b/configs/xilinx_versal_mini_emmc1_defconfig index 5480cf1d9cc4..5ccc20048212 100644 --- a/configs/xilinx_versal_mini_emmc1_defconfig +++ b/configs/xilinx_versal_mini_emmc1_defconfig @@ -16,6 +16,7 @@ CONFIG_SYS_PROMPT="Versal> " CONFIG_SYS_LOAD_ADDR=0x8000000 # CONFIG_EXPERT is not set CONFIG_REMAKE_ELF=y +# CONFIG_BOOTSTD_DEFAULTS is not set # CONFIG_AUTOBOOT is not set CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="run distro_bootcmd" diff --git a/configs/xilinx_zynqmp_mini_emmc0_defconfig b/configs/xilinx_zynqmp_mini_emmc0_defconfig index 54b22aefa1d9..47eab450c90a 100644 --- a/configs/xilinx_zynqmp_mini_emmc0_defconfig +++ b/configs/xilinx_zynqmp_mini_emmc0_defconfig @@ -13,11 +13,11 @@ CONFIG_DEFAULT_DEVICE_TREE="zynqmp-mini-emmc0" CONFIG_SPL_STACK=0xfffffffc CONFIG_SPL_SYS_MALLOC_F_LEN=0x600 CONFIG_SPL=y -# CONFIG_CMD_ZYNQMP is not set CONFIG_SYS_LOAD_ADDR=0x8000000 CONFIG_REMAKE_ELF=y # CONFIG_MP is not set CONFIG_FIT=y +# CONFIG_BOOTSTD_DEFAULTS is not set CONFIG_SUPPORT_RAW_INITRD=y # CONFIG_AUTOBOOT is not set # CONFIG_DISPLAY_CPUINFO is not set diff --git a/configs/xilinx_zynqmp_mini_emmc1_defconfig b/configs/xilinx_zynqmp_mini_emmc1_defconfig index eb78e0a39f3c..03b34777c9f4 100644 --- a/configs/xilinx_zynqmp_mini_emmc1_defconfig +++ b/configs/xilinx_zynqmp_mini_emmc1_defconfig @@ -13,11 +13,11 @@ CONFIG_DEFAULT_DEVICE_TREE="zynqmp-mini-emmc1" CONFIG_SPL_STACK=0xfffffffc CONFIG_SPL_SYS_MALLOC_F_LEN=0x600 CONFIG_SPL=y -# CONFIG_CMD_ZYNQMP is not set CONFIG_SYS_LOAD_ADDR=0x8000000 CONFIG_REMAKE_ELF=y # CONFIG_MP is not set CONFIG_FIT=y +# CONFIG_BOOTSTD_DEFAULTS is not set CONFIG_SUPPORT_RAW_INITRD=y # CONFIG_AUTOBOOT is not set # CONFIG_DISPLAY_CPUINFO is not set -- 2.40.0.348.gf938b09366-goog

4 10

[PATCH v1 00/17] colibri-imx8x: support refresh
by Andrejs Cainikovs 30 Mar '23

30 Mar '23

This series refreshes Colibri iMX8X support as follows: - enable fuse command - revert switch to binman - set boot delay - enable bootcount limit - move bootaux memory base and size configuration to defconfig - update env memory layout - use load instead of fatload in M4 boot environment helpers - provide proper prompt - drop obsolete environment variables - implement SoC variant handling - move SoC variant detection into its own function - update update_uboot confirmation message - remove obsolete SDHC related config defines - remove obsolete net usb start - enable OF_SYSTEM_SETUP for M4 memory reservation - introduce setup setting setupargs - add 2nd ethernet address Andrejs Cainikovs (7): board: colibri-imx8x: add 2nd ethernet address colibri-imx8x: construct fdtfile dynamically colibri-imx8x: drop obsolete environment variables colibri-imx8x: switch from fatload to load colibri-imx8x: set bootaux memory base and size Revert "imx: imx8x: colibri: switch to binman" colibri-imx8x: enable fuse command Igor Opaniuk (1): colibri-imx8x: provide proper CONFIG_SYS_PROMPT Marcel Ziswiler (6): colibri-imx8x: remove obsolete net usb start colibri-imx8x: remove obsolete sdhc related config defines colibri-imx8x: update update_uboot confirmation message colibri-imx8x: update env memory layout colibri-imx8x: enable environment bootcount limit colibri-imx8x: set bootdelay Max Krummenacher (1): colibri-imx8x: extract is_imx8dx() from ram detection Philippe Schenker (2): colibri-imx8x: Remove baudrate from console argument defconfig: colibri-imx8x: enable CONFIG_OF_SYSTEM_SETUP arch/arm/dts/fsl-imx8qxp-colibri-u-boot.dtsi | 2 - arch/arm/mach-imx/imx8/Kconfig | 1 - board/toradex/colibri-imx8x/Kconfig | 3 + board/toradex/colibri-imx8x/colibri-imx8x.c | 36 ++++++--- configs/colibri-imx8x_defconfig | 13 +++- include/configs/colibri-imx8x.h | 78 ++++---------------- 6 files changed, 56 insertions(+), 77 deletions(-) -- 2.34.1

2 34

[PATCH V7 00/15] IOT2050-related enhancements
by Jan Kiszka 30 Mar '23

30 Mar '23

Flushing our upstream queue for the IOT2050 device, this mostly brings board-specific changes such as: - updated build process and firmware layout for PG1 vs. PG2 devices - more watchdog preparations - preparations for verified boot on IOT2050 Advanced devices - support for M.2 variant Changes in v7: - rebased over master - included M.2 support patches, now that the DT is merged into the kernel Changes in v6: - fixed CFG_ENV_FLAGS_LIST_STATIC setup - migrated to board env file - cleaned up #ifdef in "Optionally embed OTP programming data into image" - rebased over latest master Changes in v5: - factored out two patches Changes in v4: - rebased over latest master - make use of new CONFIG_EFI_SCROLL_ON_CLEAR_SCREEN Changes in v3: - further reworked patch 1 to load default env directly, leaving driver ordering alone Changes in v2: - rebased over latest master - reworked patch 1 to be less invasive to the code - added "iot2050: use the named gpio to control the user-button" Jan CC: chao zeng <chao.zeng(a)siemens.com> CC: Su Baocheng <baocheng.su(a)siemens.com> Jan Kiszka (11): iot2050: Update firmware layout iot2050: Migrate settings into board env file iot2050: Add watchdog start to bootcmd iot2050: Add CFG_ENV_FLAGS_LIST_STATIC arm: dts: iot2050: Allow verifying U-Boot proper by SPL tools: Add script for converting public key into device tree include iot2050: Add script for signing artifacts arm: dts: iot2050: Optionally embed OTP programming data into image doc: iot2050: Add a note about the watchdog firmware iot2050: Refresh defconfigs and activate CONFIG_EFI_SCROLL_ON_CLEAR_SCREEN iot2050: Add support for configuring M.2 connector Su Baocheng (2): board: siemens: iot2050: Split the build for PG1 and PG2 arm: dts: iot2050: Use the auto generator nodes for fdt chao zeng (2): board: siemens: iot2050: use the named gpio to control the user-button arm: dts: iot2050: Add support for M.2 variant arch/arm/dts/Makefile | 5 +- arch/arm/dts/k3-am65-iot2050-boot-image.dtsi | 149 +++++----- ...050-advanced-m2-bkey-ekey-pcie-overlay.dts | 27 ++ ...-iot2050-advanced-m2-bkey-usb3-overlay.dts | 47 +++ .../arm/dts/k3-am6548-iot2050-advanced-m2.dts | 121 ++++++++ board/siemens/iot2050/Kconfig | 35 ++- board/siemens/iot2050/board.c | 270 +++++++++++++++++- board/siemens/iot2050/iot2050.env | 17 ++ ...ot2050_defconfig => iot2050_pg1_defconfig} | 8 +- ...ot2050_defconfig => iot2050_pg2_defconfig} | 12 +- doc/board/siemens/iot2050.rst | 101 ++++++- include/configs/iot2050.h | 19 +- tools/binman/missing-blob-help | 16 +- tools/iot2050-sign-fw.sh | 51 ++++ tools/key2dtsi.py | 64 +++++ 15 files changed, 818 insertions(+), 124 deletions(-) create mode 100644 arch/arm/dts/k3-am6548-iot2050-advanced-m2-bkey-ekey-pcie-overlay.dts create mode 100644 arch/arm/dts/k3-am6548-iot2050-advanced-m2-bkey-usb3-overlay.dts create mode 100644 arch/arm/dts/k3-am6548-iot2050-advanced-m2.dts create mode 100644 board/siemens/iot2050/iot2050.env copy configs/{iot2050_defconfig => iot2050_pg1_defconfig} (93%) rename configs/{iot2050_defconfig => iot2050_pg2_defconfig} (90%) create mode 100755 tools/iot2050-sign-fw.sh create mode 100755 tools/key2dtsi.py -- 2.35.3

4 34

[PATCH 1/2] mx53loco: Remove unused mx53loco_video.c file
by Fabio Estevam 30 Mar '23

30 Mar '23

From: Fabio Estevam <festevam(a)denx.de> Since commit 1fa43cad8625 ("video: Drop references to CONFIG_VIDEO et al") the mx53loco_video.c is no longer used. Remove the unused file. Signed-off-by: Fabio Estevam <festevam(a)denx.de> --- board/freescale/mx53loco/mx53loco_video.c | 114 ---------------------- 1 file changed, 114 deletions(-) delete mode 100644 board/freescale/mx53loco/mx53loco_video.c diff --git a/board/freescale/mx53loco/mx53loco_video.c b/board/freescale/mx53loco/mx53loco_video.c deleted file mode 100644 index ff3fc8ce3e..0000000000 --- a/board/freescale/mx53loco/mx53loco_video.c +++ /dev/null @@ -1,114 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (C) 2012 Freescale Semiconductor, Inc. - * Fabio Estevam <fabio.estevam(a)freescale.com> - */ - -#include <common.h> -#include <env.h> -#include <linux/list.h> -#include <asm/gpio.h> -#include <asm/arch/iomux-mx53.h> -#include <linux/fb.h> -#include <ipu_pixfmt.h> - -#define MX53LOCO_LCD_POWER IMX_GPIO_NR(3, 24) - -static struct fb_videomode const claa_wvga = { - .name = "CLAA07LC0ACW", - .refresh = 57, - .xres = 800, - .yres = 480, - .pixclock = 37037, - .left_margin = 40, - .right_margin = 60, - .upper_margin = 10, - .lower_margin = 10, - .hsync_len = 20, - .vsync_len = 10, - .sync = 0, - .vmode = FB_VMODE_NONINTERLACED -}; - -static struct fb_videomode const seiko_wvga = { - .name = "Seiko-43WVF1G", - .refresh = 60, - .xres = 800, - .yres = 480, - .pixclock = 29851, /* picosecond (33.5 MHz) */ - .left_margin = 89, - .right_margin = 164, - .upper_margin = 23, - .lower_margin = 10, - .hsync_len = 10, - .vsync_len = 10, - .sync = 0, -}; - -void setup_iomux_lcd(void) -{ - static const iomux_v3_cfg_t lcd_pads[] = { - MX53_PAD_DI0_DISP_CLK__IPU_DI0_DISP_CLK, - MX53_PAD_DI0_PIN15__IPU_DI0_PIN15, - MX53_PAD_DI0_PIN2__IPU_DI0_PIN2, - MX53_PAD_DI0_PIN3__IPU_DI0_PIN3, - MX53_PAD_DISP0_DAT0__IPU_DISP0_DAT_0, - MX53_PAD_DISP0_DAT1__IPU_DISP0_DAT_1, - MX53_PAD_DISP0_DAT2__IPU_DISP0_DAT_2, - MX53_PAD_DISP0_DAT3__IPU_DISP0_DAT_3, - MX53_PAD_DISP0_DAT4__IPU_DISP0_DAT_4, - MX53_PAD_DISP0_DAT5__IPU_DISP0_DAT_5, - MX53_PAD_DISP0_DAT6__IPU_DISP0_DAT_6, - MX53_PAD_DISP0_DAT7__IPU_DISP0_DAT_7, - MX53_PAD_DISP0_DAT8__IPU_DISP0_DAT_8, - MX53_PAD_DISP0_DAT9__IPU_DISP0_DAT_9, - MX53_PAD_DISP0_DAT10__IPU_DISP0_DAT_10, - MX53_PAD_DISP0_DAT11__IPU_DISP0_DAT_11, - MX53_PAD_DISP0_DAT12__IPU_DISP0_DAT_12, - MX53_PAD_DISP0_DAT13__IPU_DISP0_DAT_13, - MX53_PAD_DISP0_DAT14__IPU_DISP0_DAT_14, - MX53_PAD_DISP0_DAT15__IPU_DISP0_DAT_15, - MX53_PAD_DISP0_DAT16__IPU_DISP0_DAT_16, - MX53_PAD_DISP0_DAT17__IPU_DISP0_DAT_17, - MX53_PAD_DISP0_DAT18__IPU_DISP0_DAT_18, - MX53_PAD_DISP0_DAT19__IPU_DISP0_DAT_19, - MX53_PAD_DISP0_DAT20__IPU_DISP0_DAT_20, - MX53_PAD_DISP0_DAT21__IPU_DISP0_DAT_21, - MX53_PAD_DISP0_DAT22__IPU_DISP0_DAT_22, - MX53_PAD_DISP0_DAT23__IPU_DISP0_DAT_23, - }; - - imx_iomux_v3_setup_multiple_pads(lcd_pads, ARRAY_SIZE(lcd_pads)); - - /* Turn on GPIO backlight */ - imx_iomux_v3_setup_pad(MX53_PAD_EIM_D24__GPIO3_24); - gpio_direction_output(MX53LOCO_LCD_POWER, 1); - - /* Turn on display contrast */ - imx_iomux_v3_setup_pad(MX53_PAD_GPIO_1__GPIO1_1); - gpio_direction_output(IMX_GPIO_NR(1, 1), 1); -} - -int board_video_skip(void) -{ - int ret; - char const *e = env_get("panel"); - - if (e) { - if (strcmp(e, "seiko") == 0) { - ret = ipuv3_fb_init(&seiko_wvga, 0, IPU_PIX_FMT_RGB24); - if (ret) - printf("Seiko cannot be configured: %d\n", ret); - return ret; - } - } - - /* - * 'panel' env variable not found or has different value than 'seiko' - * Defaulting to claa lcd. - */ - ret = ipuv3_fb_init(&claa_wvga, 0, IPU_PIX_FMT_RGB565); - if (ret) - printf("CLAA cannot be configured: %d\n", ret); - return ret; -} -- 2.34.1

2 3