May 2022 - U-Boot

[PATCH] Convert CONFIG_MTD_CONCAT to Kconfig
by Chris Packham 11 May '22

11 May '22

This converts the following to Kconfig: CONFIG_MTD_CONCAT Signed-off-by: Chris Packham <judge.packham(a)gmail.com> --- This touches octeontx_common.h but only to remove a line that is already commented out. Other than that etamin was the only board that had this enabled. configs/etamin_defconfig | 1 + drivers/mtd/Kconfig | 8 ++++++++ include/configs/etamin.h | 1 - include/configs/octeontx_common.h | 1 - scripts/config_whitelist.txt | 1 - 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/configs/etamin_defconfig b/configs/etamin_defconfig index ba7a0665dedb..34b9fff5ded2 100644 --- a/configs/etamin_defconfig +++ b/configs/etamin_defconfig @@ -87,6 +87,7 @@ CONFIG_SPL_SYS_I2C_LEGACY=y # CONFIG_SPL_DM_MMC is not set CONFIG_MMC_OMAP_HS=y CONFIG_MTD=y +CONFIG_MTD_CONCAT=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_OMAP_ECCSCHEME_BCH16_CODE_HW=y CONFIG_SYS_NAND_BLOCK_SIZE=0x80000 diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig index 588ebe9119b9..4088267dd111 100644 --- a/drivers/mtd/Kconfig +++ b/drivers/mtd/Kconfig @@ -22,6 +22,14 @@ config MTD_NOR_FLASH help Enable support for parallel NOR flash. +config MTD_CONCAT + bool "Enable MTD device concatenation" + depends on MTD + help + Enable support for concatenating multiple physical MTD devices + into a single logical device. The larger logical device can then + be partitioned. + config SYS_MTDPARTS_RUNTIME bool "Allow MTDPARTS to be configured at runtime" depends on MTD diff --git a/include/configs/etamin.h b/include/configs/etamin.h index dc83ab71908b..9cf93924df93 100644 --- a/include/configs/etamin.h +++ b/include/configs/etamin.h @@ -151,7 +151,6 @@ #define ETAMIN_NAND_GPMC_CONFIG4 0x16051807 #define ETAMIN_NAND_GPMC_CONFIG5 0x00151e1e #define ETAMIN_NAND_GPMC_CONFIG6 0x16000f80 -#define CONFIG_MTD_CONCAT /* Default env settings */ #define CONFIG_EXTRA_ENV_SETTINGS \ diff --git a/include/configs/octeontx_common.h b/include/configs/octeontx_common.h index bcf8b41cfb63..81dbff2d672f 100644 --- a/include/configs/octeontx_common.h +++ b/include/configs/octeontx_common.h @@ -64,7 +64,6 @@ /** EMMC specific defines */ #if defined(CONFIG_NAND_OCTEONTX) -/*#define CONFIG_MTD_CONCAT */ #define CONFIG_SYS_MAX_NAND_DEVICE 8 #endif diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 5b882b2670ca..cecdda678191 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -389,7 +389,6 @@ CONFIG_MMC_SUNXI_SLOT CONFIG_MONITOR_IS_IN_RAM CONFIG_MPC85XX_FEC CONFIG_MPC85XX_FEC_NAME -CONFIG_MTD_CONCAT CONFIG_MTD_NAND_VERIFY_WRITE CONFIG_MTD_PARTITION CONFIG_MVGBE_PORTS -- 2.36.0

3 3

[PATCH V2 0/4] MXS nand fixes in SPL
by Michael Trimarchi 11 May '22

11 May '22

Those patches come after some testing of failing in factory on some unit. We found out that the bootrom imx loader was not able to handling badblock. This can be a limit of the implementation right now in imx8mn. Anyway not all the imx platform has the support of this loader. I found some problems on the implementation so I have fixed it up according the experience of Sitara. I tested only using a Fit Image as a flash container. This version add in the series the fix of cmd_nandbcb and the fix of spl_nand load. I can imagine that a lot of boards and users are affected. I have started to backport this changes in some older uboot and adapt it Michael Trimarchi (4): nand: raw: mxs_nand: Fix specific hook registration mtd: nand: mxs_nand_spl: Fix bad block skipping arm: mach-imx: cmd_nandbcb fix bad block handling spl: spl_nand: Fix bad block handling in fitImage arch/arm/mach-imx/cmd_nandbcb.c | 21 +++---- common/spl/spl_nand.c | 5 +- drivers/mtd/nand/raw/mxs_nand.c | 32 +++++----- drivers/mtd/nand/raw/mxs_nand_spl.c | 90 ++++++++++++++++------------- 4 files changed, 73 insertions(+), 75 deletions(-) -- 2.25.1

5 19

[PATCH 1/1] Add mmc_set_env_dev to TI AM33xx, using the scratch reg of UART port
by Da Shi Cao 11 May '22

11 May '22

Signed-off-by: Dashi Cao <dscao999(a)gmail.com> --- board/ti/am335x/board.c | 40 ++++++++++++++++++++++++++++++++++++++++ common/spl/spl.c | 6 ++++++ drivers/mmc/mmc.c | 4 ++++ include/mmc.h | 1 + 4 files changed, 51 insertions(+) diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c index 7c0545892c..577e4f2b1f 100644 --- a/board/ti/am335x/board.c +++ b/board/ti/am335x/board.c @@ -1010,3 +1010,43 @@ U_BOOT_DRVINFO(am335x_mmc1) = { .plat = &am335x_mmc1_plat, }; #endif + +#if defined(CONFIG_SPL_MMC) && defined(CONFIG_AM33XX) +struct uart_reg { + u16 resv0[4]; + u16 uart_efr; + u16 resv1[3]; + u16 uart_mcr; + u16 resv2[5]; + u16 uart_spr; +}; + +int mmc_get_env_dev(void) +{ + u16 bdev = 0; + u16 efr, mcr; + volatile struct uart_reg *uart = (void *)UART0_BASE; + + efr = uart->uart_efr; + mcr = uart->uart_mcr; + if ((efr & 0x10) == 0 || (mcr & 0x40) == 0) + bdev = uart->uart_spr; + else + printf("Cannot get mmc dev number from uart0 scratch reg\n"); + + return (bdev & 0x0ff); +} + +void mmc_set_env_dev(u16 bdev) +{ + u16 efr, mcr; + volatile struct uart_reg *uart = (void *)UART0_BASE; + + efr = uart->uart_efr; + mcr = uart->uart_mcr; + if ((efr & 0x10) == 0 || (mcr & 0x40) == 0) + uart->uart_spr = (bdev & 0x0ff); + else + printf("Cannot set mmc dev number to uart0 scratch reg\n"); +} +#endif diff --git a/common/spl/spl.c b/common/spl/spl.c index c8c463f80b..a14ae76698 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -37,6 +37,7 @@ #include <fdt_support.h> #include <bootcount.h> #include <wdt.h> +#include <mmc.h> DECLARE_GLOBAL_DATA_PTR; @@ -723,6 +724,7 @@ void board_init_r(gd_t *dummy1, ulong dummy2) }; struct spl_image_info spl_image; int ret; + short bootdev; debug(">>" SPL_TPL_PROMPT "board_init_r()\n"); @@ -798,6 +800,10 @@ void board_init_r(gd_t *dummy1, ulong dummy2) puts(SPL_TPL_PROMPT "failed to boot from all boot devices\n"); hang(); } + bootdev = spl_image.boot_device - BOOT_DEVICE_MMC1; + if (bootdev < 0) + bootdev = -bootdev; + mmc_set_env_dev(bootdev); spl_perform_fixups(&spl_image); if (CONFIG_IS_ENABLED(HANDOFF)) { diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index 8a7d073900..8c941b575a 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -3133,3 +3133,7 @@ __weak int mmc_get_env_dev(void) return 0; #endif } + +__weak void mmc_set_env_dev(u16 bootdev) +{ +} diff --git a/include/mmc.h b/include/mmc.h index 9b4dc68311..3c09652382 100644 --- a/include/mmc.h +++ b/include/mmc.h @@ -943,6 +943,7 @@ int mmc_get_env_addr(struct mmc *mmc, int copy, u32 *env_addr); extern uint mmc_get_env_part(struct mmc *mmc); # endif int mmc_get_env_dev(void); +void mmc_set_env_dev(u16 bootdev); /* Minimum partition switch timeout in units of 10-milliseconds */ #define MMC_MIN_PART_SWITCH_TIME 30 /* 300 ms */ -- 2.20.1

2 1

runtime configuration of env_addr
by Hiren Mehta 11 May '22

11 May '22

Hi All, I was wondering if there is a way to override the gd->env_addr that is initialized in env_flash_init() for flash based environment. As I see, env_addr depends on the env_ptr which is set to compile time value of CONFIG_ENV_ADDR. I was thinking of doing it in board_early_init_f(). But, as I understand, the env_init() will override it. Thanks, -h

2 1

[PATCH 1/2] watchdog: octeontx_wdt: Add MIPS Octeon support
by Stefan Roese 11 May '22

11 May '22

This patch adds support for the Marvell Octeon watchdog driver, which currently only support the ARM64 Octeon TX & TX2 platforms. Since the IP is pretty similar, it makes sense to extend this driver to also support the MIPS Octeon SoC. A follow-up patch will enable this watchdog support on the EBB7304 eval board. Signed-off-by: Stefan Roese <sr(a)denx.de> Cc: Aaron Williams <awilliams(a)marvell.com> Cc: Chandrakala Chavva <cchavva(a)marvell.com> --- drivers/watchdog/Kconfig | 9 ++--- drivers/watchdog/octeontx_wdt.c | 67 ++++++++++++++++++++++++--------- 2 files changed, 53 insertions(+), 23 deletions(-) diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index c3eb8a8aec1b..2c6116fb7f9c 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -213,14 +213,13 @@ config WDT_NPCM It performs full SoC reset. config WDT_OCTEONTX - bool "OcteonTX core watchdog support" - depends on WDT && (ARCH_OCTEONTX || ARCH_OCTEONTX2) + bool "Octeon core watchdog support" + depends on WDT && (ARCH_OCTEON || ARCH_OCTEONTX || ARCH_OCTEONTX2) default y imply WATCHDOG help - This enables OcteonTX watchdog driver, which can be - found on OcteonTX/TX2 chipsets and inline with driver model. - Only supports watchdog reset. + This enables the Octeon watchdog driver, which can be found on + various Octeon parts such as Octeon II/III and OcteonTX/TX2. config WDT_OMAP3 bool "TI OMAP watchdog timer support" diff --git a/drivers/watchdog/octeontx_wdt.c b/drivers/watchdog/octeontx_wdt.c index 01b244db8075..c79d9539c13f 100644 --- a/drivers/watchdog/octeontx_wdt.c +++ b/drivers/watchdog/octeontx_wdt.c @@ -15,16 +15,22 @@ DECLARE_GLOBAL_DATA_PTR; -#define CORE0_WDOG_OFFSET 0x40000 -#define CORE0_POKE_OFFSET 0x50000 #define CORE0_POKE_OFFSET_MASK 0xfffffULL #define WDOG_MODE GENMASK_ULL(1, 0) #define WDOG_LEN GENMASK_ULL(19, 4) #define WDOG_CNT GENMASK_ULL(43, 20) +struct octeontx_wdt_data { + u32 wdog_offset; + u32 poke_offset; + int timer_shift; + bool has_clk; +}; + struct octeontx_wdt { void __iomem *reg; + const struct octeontx_wdt_data *data; struct clk clk; }; @@ -34,12 +40,16 @@ static int octeontx_wdt_start(struct udevice *dev, u64 timeout_ms, ulong flags) u64 clk_rate, val; u64 tout_wdog; - clk_rate = clk_get_rate(&priv->clk); - if (IS_ERR_VALUE(clk_rate)) - return -EINVAL; + if (priv->data->has_clk) { + clk_rate = clk_get_rate(&priv->clk); + if (IS_ERR_VALUE(clk_rate)) + return -EINVAL; + } else { + clk_rate = gd->bus_clk; + } - /* Watchdog counts in 1024 cycle steps */ - tout_wdog = (clk_rate * timeout_ms / 1000) >> 10; + /* Watchdog counts in configured cycle steps */ + tout_wdog = (clk_rate * timeout_ms / 1000) >> priv->data->timer_shift; /* * We can only specify the upper 16 bits of a 24 bit value. @@ -54,7 +64,7 @@ static int octeontx_wdt_start(struct udevice *dev, u64 timeout_ms, ulong flags) val = FIELD_PREP(WDOG_MODE, 0x3) | FIELD_PREP(WDOG_LEN, tout_wdog) | FIELD_PREP(WDOG_CNT, tout_wdog << 8); - writeq(val, priv->reg + CORE0_WDOG_OFFSET); + writeq(val, priv->reg + priv->data->wdog_offset); return 0; } @@ -63,7 +73,7 @@ static int octeontx_wdt_stop(struct udevice *dev) { struct octeontx_wdt *priv = dev_get_priv(dev); - writeq(0, priv->reg + CORE0_WDOG_OFFSET); + writeq(0, priv->reg + priv->data->wdog_offset); return 0; } @@ -82,7 +92,7 @@ static int octeontx_wdt_reset(struct udevice *dev) { struct octeontx_wdt *priv = dev_get_priv(dev); - writeq(~0ULL, priv->reg + CORE0_POKE_OFFSET); + writeq(~0ULL, priv->reg + priv->data->poke_offset); return 0; } @@ -103,6 +113,10 @@ static int octeontx_wdt_probe(struct udevice *dev) if (!priv->reg) return -EINVAL; + priv->data = (void *)dev_get_driver_data(dev); + if (!priv->data) + return -EINVAL; + /* * Save base register address in reg masking lower 20 bits * as 0xa0000 appears when extracted from the DT @@ -110,13 +124,15 @@ static int octeontx_wdt_probe(struct udevice *dev) priv->reg = (void __iomem *)(((u64)priv->reg & ~CORE0_POKE_OFFSET_MASK)); - ret = clk_get_by_index(dev, 0, &priv->clk); - if (ret < 0) - return ret; + if (priv->data->has_clk) { + ret = clk_get_by_index(dev, 0, &priv->clk); + if (ret < 0) + return ret; - ret = clk_enable(&priv->clk); - if (ret) - return ret; + ret = clk_enable(&priv->clk); + if (ret) + return ret; + } return 0; } @@ -128,8 +144,23 @@ static const struct wdt_ops octeontx_wdt_ops = { .expire_now = octeontx_wdt_expire_now, }; +static const struct octeontx_wdt_data octeontx_data = { + .wdog_offset = 0x40000, + .poke_offset = 0x50000, + .timer_shift = 10, + .has_clk = true, +}; + +static const struct octeontx_wdt_data octeon_data = { + .wdog_offset = 0x20000, + .poke_offset = 0x30000, + .timer_shift = 10, + .has_clk = false, +}; + static const struct udevice_id octeontx_wdt_ids[] = { - { .compatible = "arm,sbsa-gwdt" }, + { .compatible = "arm,sbsa-gwdt", .data = (ulong)&octeontx_data }, + { .compatible = "cavium,octeon-7890-ciu3", .data = (ulong)&octeon_data }, {} }; @@ -138,7 +169,7 @@ U_BOOT_DRIVER(wdt_octeontx) = { .id = UCLASS_WDT, .of_match = octeontx_wdt_ids, .ops = &octeontx_wdt_ops, - .priv_auto = sizeof(struct octeontx_wdt), + .priv_auto = sizeof(struct octeontx_wdt), .probe = octeontx_wdt_probe, .remove = octeontx_wdt_remove, .flags = DM_FLAG_OS_PREPARE, -- 2.36.1

1 1

[PATCH 0/2] Add support for dynamic overriding of default SF bus
by Vaishnav Achath 11 May '22

11 May '22

Currently the SPI flash to load from is defined through the compile time config CONFIG_SF_DEFAULT_BUS and CONFIG_SF_DEFAULT_CS, this prevents the loading of binaries from different SPI flash using the same build. This series adds support for choosing the flash device based on the selected boot device thus allowing platforms to override the SF_BUS and SF_CS to load from the desired flash. Changes tested on J721E for OSPI and QSPI boot. Vaishnav Achath (2): common: spl: spl_spi: add support for dynamic detection of sf bus arm: k3: j721e: enable dynamic sf bus detect support for j721e arch/arm/mach-k3/j721e_init.c | 17 +++++++++++++++++ arch/arm/mach-k3/sysfw-loader.c | 6 ++++-- common/spl/Kconfig | 4 ++++ common/spl/spl_spi.c | 19 +++++++++++++++++-- configs/j721e_evm_a72_defconfig | 1 + configs/j721e_evm_r5_defconfig | 1 + include/spl.h | 18 ++++++++++++++++++ 7 files changed, 62 insertions(+), 4 deletions(-) -- 2.17.1

2 4

[PULL] u-boot-stm32/master v2022.07 = u-boot-stm32-20220510
by Patrice CHOTARD 11 May '22

11 May '22

Hi Tom Please pull the STM32 related patches for u-boot/master, v2022.07: u-boot-stm32-20220510 CI status: https://source.denx.de/u-boot/custodians/u-boot-stm/-/pipelines/11978 Thanks Patrice The following changes since commit f08ed34371c54244421eac8ffb4c77559c5ea013: Prepare v2022.07-rc2 (2022-05-09 12:49:31 -0400) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-stm.git tags/u-boot-stm32-20220510 for you to fetch changes up to e198d4fe7c34cbb97d7d3cbf31d3a78a5ecc43f7: doc: Add documentation for STM32 MCUs (2022-05-10 13:56:12 +0200) ---------------------------------------------------------------- Add new STM32 MCU boards and Documentation STM32 programmer improvements video: support several LTDC HW versions and fix data enable polarity board: fix stboard error message, consider USB cable connected when boot device is USB configs: stm32mp1: set console variable for extlinux.conf configs: stm32mp1: add support for baudrate higher than 115200 for ST-Link ARM: stm32mp: Fix Silicon version handling and ft_system_setup() phy: stm32-usbphyc: Add DT phy tuning support arm: dts: stm32mp15: alignment with v5.18 ram: Conditionally enable ASR mach-stm32mp: psci: retain MCUDIVR, PLL3CR, PLL4CR, MSSCKSELR across suspend configs: Use TFTP_TSIZE on DHSOM and STMicroelectronics boards ARM: stm32: Use default CONFIG_TFTP_BLOCKSIZE on DHSOM pinctrl: stm32: rework GPIO holes management ---------------------------------------------------------------- Marek Vasut (6): ram: stm32mp1: Conditionally enable ASR stm32mp: psci: Retain MCUDIVR, PLL3CR, PLL4CR, MSSCKSELR across suspend ARM: stm32: Use default CONFIG_TFTP_BLOCKSIZE on DHSOM ARM: stm32: Use CONFIG_TFTP_TSIZE on DHSOM ARM: dts: stm32: Move DHCOR BUCK3 VDD 2V9 adjustment to 1V8 DTSI clk: stm32mp1: Add missing newline Patrice Chotard (17): pinctrl: pinctrl_stm32: Update pinmux_mode definition pinctrl: pinctrl_stm32: Use GPIOF_UNKNOWN to indicate not mapped pins gpio: stm32_gpio: Rework GPIO hole management phy: stm32-usbphyc: stm32-usbphyc: Add DT phy tuning support board: st: stm32mp1: Consider USB cable connected when boot device is USB configs: stm32f746-disco: Concatenate spl and u-boot binaries configs: stm32f746-disco: Rename stm32f746-disco_defconfig to stm32f746-disco_spl_defconfig configs: stm32f746-disco: Add stm32f746-disco_defconfig configs: stm32f769-disco: Rename stm32f769-disco_defconfig to stm32f769-disco_spl_defconfig configs: stm32f769-disco: Add stm32f769-disco_defconfig configs: stm32f769-disco: Migrate SPL flags to defconfig configs: stm32f746-disco: Migrate SPL flags to defconfig board: stm32f746-disco: Fix dram_init() in none SPL config configs: stm32f746-disco: use CONFIG_DEFAULT_DEVICE_TREE as fdtfile configs: stm32746g-eval: Add stm32746g-eval_defconfig configs: stm32746g-eval: Add stm32746g-eval_spl_defconfig doc: Add documentation for STM32 MCUs Patrick Delaunay (15): stm32mp: stm32prog: fix comment stm32mp: stm32prog: add CONFIG_CMD_STM32PROG_OTP stm32mp: stm32prog: add TEE support in stm32prog command stm32mp: stm32prog: add support of STM32IMAGE version 2 stm32mp: stm32prog: add support of UUID for FIP partition stm32mp: stm32prog: handle interruption during the first enumeration stm32mp: stm32prog: handle U-Boot script in flashlayout alternate stm32mp: stm32prog: handle flashlayout without STM32 image header board: st: common: fix the error messages in stboard command configs: stm32mp1: set the console variable for extlinux.conf configs: stm32mp1: Add support for baudrates higher than 115200 for st-link ARM: stm32mp: skip ft_system_setup when the soc node is absent ARM: stm32mp: correctly handle Silicon revision arm: dts: stm32mp15: alignment with v5.18 ARM: stm32: Use CONFIG_TFTP_TSIZE on STMicroelectronics boards Yannick FERTRE (1): video: stm32: stm32_ltdc: fix data enable polarity Yannick Fertre (1): video: stm32: stm32_ltdc: support several hardware versions arch/arm/dts/stm32mp15-pinctrl.dtsi | 92 +++++++++++++++++++++++++++++++++++++++++++ arch/arm/dts/stm32mp15-u-boot.dtsi | 12 ------ arch/arm/dts/stm32mp151.dtsi | 37 +++++++++++++---- arch/arm/dts/stm32mp153.dtsi | 7 ++++ arch/arm/dts/stm32mp157a-icore-stm32mp1-ctouch2.dts | 2 + arch/arm/dts/stm32mp157a-icore-stm32mp1-edimm2.2.dts | 2 + arch/arm/dts/stm32mp157a-microgea-stm32mp1-microdev2.0-of7.dts | 4 ++ arch/arm/dts/stm32mp157a-microgea-stm32mp1-microdev2.0.dts | 4 ++ arch/arm/dts/stm32mp157c-ed1.dts | 2 + arch/arm/dts/stm32mp157c-odyssey.dts | 2 + arch/arm/dts/stm32mp15xx-dhcom-drc02.dtsi | 4 ++ arch/arm/dts/stm32mp15xx-dhcom-pdk2.dtsi | 4 ++ arch/arm/dts/stm32mp15xx-dhcom-picoitx.dtsi | 4 ++ arch/arm/dts/stm32mp15xx-dhcom-som.dtsi | 3 +- arch/arm/dts/stm32mp15xx-dhcor-avenger96.dtsi | 6 +++ arch/arm/dts/stm32mp15xx-dhcor-io1v8.dtsi | 5 +++ arch/arm/dts/stm32mp15xx-dhcor-som.dtsi | 4 +- arch/arm/dts/stm32mp15xx-dkx.dtsi | 4 ++ arch/arm/mach-stm32/Kconfig | 20 ---------- arch/arm/mach-stm32mp/cmd_stm32prog/Kconfig | 7 ++++ arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c | 13 ++---- arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c | 418 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------- arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.h | 47 +++++++++++++++++----- arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog_usb.c | 9 +++-- arch/arm/mach-stm32mp/cpu.c | 6 +-- arch/arm/mach-stm32mp/fdt.c | 3 ++ arch/arm/mach-stm32mp/include/mach/sys_proto.h | 9 +++-- arch/arm/mach-stm32mp/psci.c | 16 ++++++++ board/st/common/cmd_stboard.c | 4 +- board/st/stm32f429-discovery/MAINTAINERS | 1 + board/st/stm32f429-evaluation/MAINTAINERS | 1 + board/st/stm32f469-discovery/MAINTAINERS | 1 + board/st/stm32f746-disco/MAINTAINERS | 5 +++ board/st/stm32f746-disco/stm32f746-disco.c | 2 +- board/st/stm32h743-disco/MAINTAINERS | 1 + board/st/stm32h743-eval/MAINTAINERS | 1 + board/st/stm32h750-art-pi/MAINTAINERS | 1 + board/st/stm32mp1/stm32mp1.c | 7 ++++ configs/stm32746g-eval_defconfig | 64 ++++++++++++++++++++++++++++++ configs/stm32746g-eval_spl_defconfig | 86 ++++++++++++++++++++++++++++++++++++++++ configs/stm32f746-disco_defconfig | 9 +---- configs/stm32f746-disco_spl_defconfig | 86 ++++++++++++++++++++++++++++++++++++++++ configs/stm32f769-disco_defconfig | 9 +---- configs/stm32f769-disco_spl_defconfig | 87 ++++++++++++++++++++++++++++++++++++++++ configs/stm32mp15_basic_defconfig | 1 + configs/stm32mp15_defconfig | 1 + configs/stm32mp15_dhcom_basic_defconfig | 2 +- configs/stm32mp15_dhcor_basic_defconfig | 2 +- configs/stm32mp15_trusted_defconfig | 1 + doc/board/st/index.rst | 1 + doc/board/st/stm32_MCU.rst | 186 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/clk/clk_stm32mp1.c | 2 +- drivers/gpio/stm32_gpio.c | 103 +++++++++++++++++------------------------------- drivers/gpio/stm32_gpio_priv.h | 2 - drivers/phy/phy-stm32-usbphyc.c | 167 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/pinctrl/pinctrl_stm32.c | 20 ++++------ drivers/ram/stm32mp1/stm32mp1_ddr.c | 14 +++++-- drivers/video/stm32/stm32_ltdc.c | 247 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------- include/configs/stm32f746-disco.h | 3 +- include/configs/stm32mp15_st_common.h | 8 ++++ 60 files changed, 1569 insertions(+), 302 deletions(-) create mode 100644 configs/stm32746g-eval_defconfig create mode 100644 configs/stm32746g-eval_spl_defconfig create mode 100644 configs/stm32f746-disco_spl_defconfig create mode 100644 configs/stm32f769-disco_spl_defconfig create mode 100644 doc/board/st/stm32_MCU.rst

2 1

[PATCH] ls1028a: hdp: Add config support for HDP firmware loading
by Yangbo Lu 10 May '22

10 May '22

From: Alison Wang <alison.wang(a)nxp.com> This patch adds config support for HDP firmware loading on LS1028A. Signed-off-by: Oliver Brown <oliver.brown(a)nxp.com> Signed-off-by: Alison Wang <alison.wang(a)nxp.com> Signed-off-by: Ye Li <ye.li(a)nxp.com> Signed-off-by: Yangbo Lu <yangbo.lu(a)nxp.com> --- board/freescale/ls1028a/ls1028a.c | 7 ++++++- configs/ls1028aqds_tfa_SECURE_BOOT_defconfig | 2 ++ configs/ls1028aqds_tfa_defconfig | 2 ++ configs/ls1028ardb_tfa_SECURE_BOOT_defconfig | 2 ++ configs/ls1028ardb_tfa_defconfig | 2 ++ 5 files changed, 14 insertions(+), 1 deletion(-) diff --git a/board/freescale/ls1028a/ls1028a.c b/board/freescale/ls1028a/ls1028a.c index 71a086ef67..1a7806fad7 100644 --- a/board/freescale/ls1028a/ls1028a.c +++ b/board/freescale/ls1028a/ls1028a.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright 2019, 2021 NXP + * Copyright 2019-2022 NXP */ #include <common.h> @@ -328,3 +328,8 @@ int checkboard(void) return 0; } #endif + +void *video_hw_init(void) +{ + return NULL; +} diff --git a/configs/ls1028aqds_tfa_SECURE_BOOT_defconfig b/configs/ls1028aqds_tfa_SECURE_BOOT_defconfig index 2e4db036a4..26613168f1 100644 --- a/configs/ls1028aqds_tfa_SECURE_BOOT_defconfig +++ b/configs/ls1028aqds_tfa_SECURE_BOOT_defconfig @@ -98,3 +98,5 @@ CONFIG_WDT_SP805=y CONFIG_RSA=y CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_VIDEO=y +CONFIG_VIDEO_LS_HDP_LOAD=y diff --git a/configs/ls1028aqds_tfa_defconfig b/configs/ls1028aqds_tfa_defconfig index 556f77e222..7e66e681fe 100644 --- a/configs/ls1028aqds_tfa_defconfig +++ b/configs/ls1028aqds_tfa_defconfig @@ -103,3 +103,5 @@ CONFIG_WDT=y CONFIG_WDT_SP805=y CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_VIDEO=y +CONFIG_VIDEO_LS_HDP_LOAD=y diff --git a/configs/ls1028ardb_tfa_SECURE_BOOT_defconfig b/configs/ls1028ardb_tfa_SECURE_BOOT_defconfig index 20cb844b01..024f9394b1 100644 --- a/configs/ls1028ardb_tfa_SECURE_BOOT_defconfig +++ b/configs/ls1028ardb_tfa_SECURE_BOOT_defconfig @@ -92,3 +92,5 @@ CONFIG_WDT_SP805=y CONFIG_RSA=y CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_VIDEO=y +CONFIG_VIDEO_LS_HDP_LOAD=y diff --git a/configs/ls1028ardb_tfa_defconfig b/configs/ls1028ardb_tfa_defconfig index fdfdf39c61..97e979ca97 100644 --- a/configs/ls1028ardb_tfa_defconfig +++ b/configs/ls1028ardb_tfa_defconfig @@ -101,3 +101,5 @@ CONFIG_WDT=y CONFIG_WDT_SP805=y CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_VIDEO=y +CONFIG_VIDEO_LS_HDP_LOAD=y -- 2.25.1

3 3

[PATCH] misc: Correct Kconfig dependencies for a number of options
by Tom Rini 10 May '22

10 May '22

We have many cases of SPL (or TPL or VPL) drivers that don't depend on SPL_MISC (and so on) but rather just MISC. Signed-off-by: Tom Rini <trini(a)konsulko.com> --- drivers/misc/Kconfig | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index c829939622b0..ebe84b15a49a 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -115,7 +115,7 @@ config CROS_EC config SPL_CROS_EC bool "Enable Chrome OS EC in SPL" - depends on SPL + depends on SPL && SPL_MISC help Enable access to the Chrome OS EC in SPL. This is a separate microcontroller typically available on a SPI bus on Chromebooks. It @@ -125,7 +125,7 @@ config SPL_CROS_EC config TPL_CROS_EC bool "Enable Chrome OS EC in TPL" - depends on TPL + depends on TPL && TPL_MISC help Enable access to the Chrome OS EC in TPL. This is a separate microcontroller typically available on a SPI bus on Chromebooks. It @@ -135,7 +135,7 @@ config TPL_CROS_EC config VPL_CROS_EC bool "Enable Chrome OS EC in VPL" - depends on VPL + depends on VPL && VPL_MISC help Enable access to the Chrome OS EC in VPL. This is a separate microcontroller typically available on a SPI bus on Chromebooks. It @@ -163,7 +163,7 @@ config CROS_EC_LPC config SPL_CROS_EC_LPC bool "Enable Chrome OS EC LPC driver in SPL" - depends on CROS_EC + depends on CROS_EC && SPL_MISC help Enable I2C access to the Chrome OS EC. This is used on x86 Chromebooks such as link and falco. The keyboard is provided @@ -172,7 +172,7 @@ config SPL_CROS_EC_LPC config TPL_CROS_EC_LPC bool "Enable Chrome OS EC LPC driver in TPL" - depends on CROS_EC + depends on CROS_EC && TPL_MISC help Enable I2C access to the Chrome OS EC. This is used on x86 Chromebooks such as link and falco. The keyboard is provided @@ -181,7 +181,7 @@ config TPL_CROS_EC_LPC config VPL_CROS_EC_LPC bool "Enable Chrome OS EC LPC driver in VPL" - depends on CROS_EC + depends on CROS_EC && VPL_MISC help Enable I2C access to the Chrome OS EC. This is used on x86 Chromebooks such as link and falco. The keyboard is provided @@ -274,7 +274,7 @@ config MXC_OCOTP config SPL_MXC_OCOTP bool "Enable MXC OCOTP driver in SPL" - depends on SPL && (ARCH_IMX8M || ARCH_MX6 || ARCH_MX7 || ARCH_MX7ULP || ARCH_VF610) + depends on SPL_MISC && (ARCH_IMX8M || ARCH_MX6 || ARCH_MX7 || ARCH_MX7ULP || ARCH_VF610) default y help If you say Y here, you will get support for the One Time @@ -304,7 +304,7 @@ config P2SB config SPL_P2SB bool "Intel Primary to Sideband Bridge in SPL" - depends on SPL && (X86 || SANDBOX) + depends on SPL_MISC && (X86 || SANDBOX) help The Primary to Sideband Bridge is used to access various peripherals through memory-mapped I/O in a large chunk of PCI space. The space is @@ -314,7 +314,7 @@ config SPL_P2SB config TPL_P2SB bool "Intel Primary to Sideband Bridge in TPL" - depends on TPL && (X86 || SANDBOX) + depends on TPL_MISC && (X86 || SANDBOX) help The Primary to Sideband Bridge is used to access various peripherals through memory-mapped I/O in a large chunk of PCI space. The space is @@ -333,7 +333,7 @@ config PWRSEQ config SPL_PWRSEQ bool "Enable power-sequencing drivers for SPL" - depends on PWRSEQ + depends on SPL_MISC && PWRSEQ help Power-sequencing drivers provide support for controlling power for devices. They are typically referenced by a phandle from another @@ -441,7 +441,7 @@ config I2C_EEPROM config SPL_I2C_EEPROM bool "Enable driver for generic I2C-attached EEPROMs for SPL" - depends on MISC && SPL && SPL_DM + depends on SPL_MISC help This option is an SPL-variant of the I2C_EEPROM option. See the help of I2C_EEPROM for details. @@ -494,7 +494,7 @@ config FS_LOADER config SPL_FS_LOADER bool "Enable loader driver for file system" + depends on SPL help This is file system generic loader which can be used to load the file image from the storage into target such as memory. -- 2.25.1

2 2

[PATCH v2] misc: Fix always compiling MISC even for SPL/TPL
by Sean Anderson 10 May '22

10 May '22

We should only build support for misc if the appropriate SPL/TPL symbol is defined. To ease the transition, make SPL/TPL_MISC default to MISC. This is necessary because many drivers don't specify their dependencies properly. These defaults can be removed once all drivers depend on the appropriate config. Fixes: aaba703fd0 ("spl: misc: Allow misc drivers in SPL and TPL") Signed-off-by: Sean Anderson <sean.anderson(a)seco.com> --- Changes in v2: - Make SPL/TPL_MISC default to MISC drivers/misc/Kconfig | 2 ++ drivers/misc/Makefile | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index 10fd601278..21b334d43d 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -16,6 +16,7 @@ config MISC config SPL_MISC bool "Enable Driver Model for Misc drivers in SPL" depends on SPL_DM + default MISC help Enable driver model for miscellaneous devices. This class is used only for those do not fit other more general classes. A @@ -25,6 +26,7 @@ config SPL_MISC config TPL_MISC bool "Enable Driver Model for Misc drivers in TPL" depends on TPL_DM + default MISC help Enable driver model for miscellaneous devices. This class is used only for those do not fit other more general classes. A diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile index 6150d01e88..7a6047f64f 100644 --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile @@ -3,7 +3,7 @@ # (C) Copyright 2000-2007 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. -obj-$(CONFIG_MISC) += misc-uclass.o +obj-$(CONFIG_$(SPL_TPL_)MISC) += misc-uclass.o obj-$(CONFIG_$(SPL_TPL_)CROS_EC) += cros_ec.o obj-$(CONFIG_$(SPL_TPL_)CROS_EC_SANDBOX) += cros_ec_sandbox.o -- 2.35.1.1320.gc452695387.dirty

2 1