diff options
| author | Tom Rini <[email protected]> | 2022-01-24 08:19:31 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2022-01-24 08:19:31 -0500 |
| commit | ae35c59389b9b67e1e553bc9ed3e6fd93cfdb86f (patch) | |
| tree | bb01575f0a08650425d67d9af74deefb0fd8c3d8 /include | |
| parent | d323242b62920be08e3a2efb1a61bd9bdf9ed583 (diff) | |
| parent | 22c0815ecaa538de51a5204caceec850d5965126 (diff) | |
Merge tag 'u-boot-stm32-20220124' of https://source.denx.de/u-boot/custodians/u-boot-stm
- stm32mp15: sync DT with kernel v5.16
- stm32mp15: Enable OF_BOARD config flag
- DHCOM: sync DT with kernel 5.15.12
- stm32mp: Fix USB boot device
- stm32mp: Remove bootcount activation
- stm32mp: Fix board_get_alt_info_mmc()
- board: stm32mp1: solve compilation issue when ENV_IS_IN_MMC is deactivated
- stm32prog: add partition name in treat_partition_list error messages
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/stm32mp15_common.h | 1 | ||||
| -rw-r--r-- | include/configs/stm32mp15_dh_dhsom.h | 7 |
2 files changed, 7 insertions, 1 deletions
diff --git a/include/configs/stm32mp15_common.h b/include/configs/stm32mp15_common.h index 2bbc8def820..175d546a158 100644 --- a/include/configs/stm32mp15_common.h +++ b/include/configs/stm32mp15_common.h @@ -137,7 +137,6 @@ #endif #define STM32MP_EXTRA \ - "altbootcmd=run bootcmd\0" \ "env_check=if env info -p -d -q; then env save; fi\0" \ "boot_net_usb_start=true\0" diff --git a/include/configs/stm32mp15_dh_dhsom.h b/include/configs/stm32mp15_dh_dhsom.h index c79f0272cbe..bb95480eeb2 100644 --- a/include/configs/stm32mp15_dh_dhsom.h +++ b/include/configs/stm32mp15_dh_dhsom.h @@ -11,6 +11,13 @@ /* PHY needs a longer autoneg timeout */ #define PHY_ANEG_TIMEOUT 20000 +#ifdef CONFIG_SPL_BUILD +#define CONFIG_EXTRA_ENV_SETTINGS \ + "dfu_alt_info_ram=u-boot.itb ram " \ + __stringify(CONFIG_SPL_LOAD_FIT_ADDRESS) \ + " 0x800000\0" +#endif + #define STM32MP_BOARD_EXTRA_ENV \ "usb_pgood_delay=1000\0" \ "update_sf=" /* Erase SPI NOR and install U-Boot from SD */ \ |