diff options
| author | Tom Rini | 2021-03-15 08:43:19 -0400 |
|---|---|---|
| committer | Tom Rini | 2021-03-15 08:43:19 -0400 |
| commit | e8a10a02bd9ce6988942c393373d89dee5704c59 (patch) | |
| tree | 34ea975ab67f9b7d337fc0fc931f0ae069e5d6aa /include | |
| parent | ad7e1c7c6e2bde2b369f10984d41d6b1833453fb (diff) | |
| parent | b076cbe8aa2b3c29a3acc89fbea9fb7676f15fa7 (diff) | |
Merge tag 'u-boot-stm32-20210312' of https://source.denx.de/u-boot/custodians/u-boot-stm
- Add WATCHDOG_RESET() in MTD framework and STM32 QSPI driver
- stm32mp1_trusted_defconfig rely on SCMI support
- Remove the nand MTD configuration for NOR boot in stm32mp1 board
- STM32programmer update
- Bsec: manage clock when present in device tree
- stm32mp15: move bootdelay configuration in defconfig
- Update for stm32 dsi and dw_mipi_dsi
- STM32 MCU's cleanup
- Fix compilation issue depending on SYS_DCACHE_OFF and SYS_ICACHE_OFF flags
- Update stm32mp1 doc
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/stm32mp1.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/configs/stm32mp1.h b/include/configs/stm32mp1.h index 36e400453ea..db2117a3d7c 100644 --- a/include/configs/stm32mp1.h +++ b/include/configs/stm32mp1.h @@ -160,7 +160,6 @@ * and the ramdisk at the end. */ #define CONFIG_EXTRA_ENV_SETTINGS \ - "bootdelay=1\0" \ "kernel_addr_r=0xc2000000\0" \ "fdt_addr_r=0xc4000000\0" \ "scriptaddr=0xc4100000\0" \ |