diff options
| author | Tom Rini <[email protected]> | 2024-01-19 11:59:28 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-01-19 11:59:28 -0500 |
| commit | 83a8424722f364955f8e28ae164fbfc598b2e5f8 (patch) | |
| tree | 4927ace4d988aa2212886bc148a0fab38299a7be /include | |
| parent | f4d54865061495bdb483f9ddc81183d1940f596c (diff) | |
| parent | 8a4d098bb0859b3a26c9e1100ed08d7bd1f8ed30 (diff) | |
Merge tag 'u-boot-stm32-20240119' of https://source.denx.de/u-boot/custodians/u-boot-stm
Add CMDLINE dependecy for CMD_STM32KEY
STM32MP1:
---------
Set stdio to serial on DH STM32MP15xx DHSOM
Fix reset for usart1 in scmi configuration
STM32MP2:
---------
Add BSEC and OTP support for STM32MP25
Fix CONFIG_STM32MP25X flag usage
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/stm32mp15_dh_dhsom.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/include/configs/stm32mp15_dh_dhsom.h b/include/configs/stm32mp15_dh_dhsom.h index 8ff882264f4..de39b19219d 100644 --- a/include/configs/stm32mp15_dh_dhsom.h +++ b/include/configs/stm32mp15_dh_dhsom.h @@ -12,14 +12,13 @@ #define PHY_ANEG_TIMEOUT 20000 #ifdef CONFIG_SPL_BUILD -#define CFG_EXTRA_ENV_SETTINGS \ +#define CFG_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" \ +#define STM32MP_BOARD_EXTRA_ENV \ "dh_update_sd_to_emmc=" /* Install U-Boot from SD to eMMC */ \ "setexpr loadaddr1 ${loadaddr} + 0x1000000 && " \ "load mmc 0:4 ${loadaddr1} boot/u-boot-spl.stm32 && " \ @@ -49,7 +48,11 @@ "sf update ${loadaddr1} 0x40000 ${filesize1} && " \ "sf update ${loadaddr} 0x80000 ${filesize} && " \ "env set filesize1 && env set loadaddr1\0" \ - "update_sf=run dh_update_sd_to_sf\0" + "stdin=serial\0" \ + "stdout=serial\0" \ + "stderr=serial\0" \ + "update_sf=run dh_update_sd_to_sf\0" \ + "usb_pgood_delay=1000\0" #include <configs/stm32mp15_common.h> |