diff options
| author | Tom Rini <[email protected]> | 2021-07-16 09:15:05 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2021-07-16 09:15:05 -0400 |
| commit | 7533f80bec2e76f98df32e031ba5fe37927cd89f (patch) | |
| tree | b83b37c93196238fce4ab1410f65bd44d014026b /include | |
| parent | d3fc3da9a4fb98104d004b025149ec6dadccc2cd (diff) | |
| parent | db1ab52e15135eb1efab512bc30d4e1b4789b434 (diff) | |
Merge tag 'u-boot-stm32-20210715' of https://source.denx.de/u-boot/custodians/u-boot-stm
- DTS: alignment with Linux kernel v5.13 for stm32mp15 boards
- STM32MP1: update the stm32key command
- STM32MP1: activate the rng command
- STM32MP1: fix the stm32prog command (help, parttition size)
- STM32MP1: add fdtoverlay_addr_r variable
- STM32MP1: correctly managed SYSCON/SYSCFG clock
- STM32MP1: remove mmc alias and directly use device instance in boot_instance variable
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/stm32mp1.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/configs/stm32mp1.h b/include/configs/stm32mp1.h index 440efa1a55a..2e7f49e7bb9 100644 --- a/include/configs/stm32mp1.h +++ b/include/configs/stm32mp1.h @@ -155,7 +155,7 @@ /* * memory layout for 32M uncompressed/compressed kernel, - * 1M fdt, 1M script, 1M pxe and 1M for splashimage + * 1M fdt, 1M script, 1M pxe and 1M for overlay * and the ramdisk at the end. */ #define CONFIG_EXTRA_ENV_SETTINGS \ @@ -163,7 +163,7 @@ "fdt_addr_r=0xc4000000\0" \ "scriptaddr=0xc4100000\0" \ "pxefile_addr_r=0xc4200000\0" \ - "splashimage=0xc4300000\0" \ + "fdtoverlay_addr_r=0xc4300000\0" \ "ramdisk_addr_r=0xc4400000\0" \ "altbootcmd=run bootcmd\0" \ "env_check=if env info -p -d -q; then env save; fi\0" \ |