diff options
author | Tom Rini <trini@konsulko.com> | 2025-01-31 08:32:11 -0600 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2025-01-31 08:32:11 -0600 |
commit | a582e485338633fb2bd3b124a06da1254b71947c (patch) | |
tree | 8e762f999cd7d4eecf2c3192ef0670c1bfd2fd8e /board/st/stm32mp1/stm32mp1.c | |
parent | 487b254702858a69f96d0c314ab1eab66ac084e2 (diff) | |
parent | 84bbb8f59a89b24daebc9eff532df6160f049faf (diff) |
Merge tag 'u-boot-stm32-20250131' of https://source.denx.de/u-boot/custodians/u-boot-stm
STM32 MPU:
- Remove dt-bindings headers available in dts/upstream
- Fixes for stm32prog
- Enable CONFIG_SYS_64BIT_LBA for STM32MP15/13/25 defconfigs
- Add upport of ck_usbo_48m in pre-reloc stage for STM32MP13
- Clean env_get_location() for STM32MP1
- Fix board_get_usable_ram_top() to fix infinite loop in cache
management for STM32MP2.
- Fix ck_flexgen_08 frequency for STM32MP2
STM32 MCU:
- Tune CYCLIC_MAX_CPU_TIME_US to avoid cyclic warning for STM32F469-Disco
- Tune CYCLIC_MAX_CPU_TIME_US to avoid cyclic warning for STM32F769-Disco
Diffstat (limited to 'board/st/stm32mp1/stm32mp1.c')
-rw-r--r-- | board/st/stm32mp1/stm32mp1.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/board/st/stm32mp1/stm32mp1.c b/board/st/stm32mp1/stm32mp1.c index d5e5e776d2a..15fb9e4b062 100644 --- a/board/st/stm32mp1/stm32mp1.c +++ b/board/st/stm32mp1/stm32mp1.c @@ -751,8 +751,6 @@ enum env_location env_get_location(enum env_operation op, int prio) case BOOT_FLASH_EMMC: if (CONFIG_IS_ENABLED(ENV_IS_IN_MMC)) return ENVL_MMC; - else if (CONFIG_IS_ENABLED(ENV_IS_IN_EXT4)) - return ENVL_EXT4; else return ENVL_NOWHERE; |