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 /board/st/stm32mp1/stm32mp1.c | |
parent | 6354913def1f61711c2278bd2616c748f21f69da (diff) | |
parent | c8b2eef52b6c8c48aba63c64078ff67fa5dea9e3 (diff) | |
download | u-boot-166a77b34b30f64f7b12a3016b0bba49d568c52e.zip u-boot-166a77b34b30f64f7b12a3016b0bba49d568c52e.tar.gz u-boot-166a77b34b30f64f7b12a3016b0bba49d568c52e.tar.bz2 |
Merge tag 'u-boot-stm32-20211110' of https://source.denx.de/u-boot/custodians/u-boot-stmWIP/10Nov2021
- 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 'board/st/stm32mp1/stm32mp1.c')
-rw-r--r-- | board/st/stm32mp1/stm32mp1.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/board/st/stm32mp1/stm32mp1.c b/board/st/stm32mp1/stm32mp1.c index 2c2faad..8459267 100644 --- a/board/st/stm32mp1/stm32mp1.c +++ b/board/st/stm32mp1/stm32mp1.c @@ -658,7 +658,11 @@ int board_init(void) if (IS_ENABLED(CONFIG_DM_REGULATOR)) regulators_enable_boot_on(_DEBUG); - if (!IS_ENABLED(CONFIG_TFABOOT)) + /* + * sysconf initialisation done only when U-Boot is running in secure + * done in TF-A for TFABOOT. + */ + if (IS_ENABLED(CONFIG_ARMV7_NONSEC)) sysconf_init(); if (CONFIG_IS_ENABLED(LED)) |