diff options
| author | Tom Rini <trini@konsulko.com> | 2021-11-10 14:11:30 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-11-10 14:11:30 -0500 |
| commit | 166a77b34b30f64f7b12a3016b0bba49d568c52e (patch) | |
| tree | 2b63323cb069546fa6d6b5bac19764789fe688e3 /drivers/ram/stm32mp1/stm32mp1_ram.c | |
| parent | 6354913def1f61711c2278bd2616c748f21f69da (diff) | |
| parent | c8b2eef52b6c8c48aba63c64078ff67fa5dea9e3 (diff) | |
Merge tag 'u-boot-stm32-20211110' of https://source.denx.de/u-boot/custodians/u-boot-stm
- DHSOM update:
- Remove nWP GPIO hog
- Increase SF bus frequency to 50Mhz and enable SFDP
- Disable video output for DHSOM
- Disable EFI
- Enable DFU_MTD support
- Create include file for STM32 gpio driver private data
- Split board and SOC STM32MP15 configuration
- Device tree alignement with v5.15-rc6 for STM32MP15
- Add binman support for STM32MP15x
- Normalise newlines for stm32prog
- Update OTP shadow registers in SPL
Diffstat (limited to 'drivers/ram/stm32mp1/stm32mp1_ram.c')
| -rw-r--r-- | drivers/ram/stm32mp1/stm32mp1_ram.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/ram/stm32mp1/stm32mp1_ram.c b/drivers/ram/stm32mp1/stm32mp1_ram.c index 26f0b4f1eae..98fa1f4f118 100644 --- a/drivers/ram/stm32mp1/stm32mp1_ram.c +++ b/drivers/ram/stm32mp1/stm32mp1_ram.c @@ -202,17 +202,16 @@ static int stm32mp1_ddr_probe(struct udevice *dev) priv->info.base = STM32_DDR_BASE; -#if !defined(CONFIG_TFABOOT) && \ - (!defined(CONFIG_SPL) || defined(CONFIG_SPL_BUILD)) - priv->info.size = 0; - ret = stm32mp1_ddr_setup(dev); + if (IS_ENABLED(CONFIG_SPL_BUILD)) { + priv->info.size = 0; + ret = stm32mp1_ddr_setup(dev); + + return log_ret(ret); + } - return log_ret(ret); -#else ofnode node = stm32mp1_ddr_get_ofnode(dev); priv->info.size = ofnode_read_u32_default(node, "st,mem-size", 0); return 0; -#endif } static int stm32mp1_ddr_get_info(struct udevice *dev, struct ram_info *info) |