diff options
| author | Tom Rini <trini@konsulko.com> | 2021-12-13 10:20:25 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-12-13 10:20:25 -0500 |
| commit | cfbd2bc695b87434e52e1b1073756b823f18f09d (patch) | |
| tree | 0071548476a2a4e05d22f6c70a3b3b7463f6d857 /include/configs/stm32mp15_common.h | |
| parent | 026c010c4af47d6f087eee3e54736b7014b43d75 (diff) | |
| parent | 5c592b636a4006a50228d54eda3fe291eaa1abb8 (diff) | |
Merge tag 'u-boot-stm32-20211213' of https://source.denx.de/u-boot/custodians/u-boot-stm
- enable KSZ90x1 PHY driver on DHCOR
- DHSOM boards:
- increase USB power-good delay
- add update_sf script to install U-Boot into SF
- increase PHY auto-negotiation timeout to 20 seconds
- fix SoM and board coding strap GPIO handling
# gpg verification failed.
Diffstat (limited to 'include/configs/stm32mp15_common.h')
| -rw-r--r-- | include/configs/stm32mp15_common.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/configs/stm32mp15_common.h b/include/configs/stm32mp15_common.h index 4e2cabff2e..dab679f71e 100644 --- a/include/configs/stm32mp15_common.h +++ b/include/configs/stm32mp15_common.h @@ -142,6 +142,10 @@ "env_check=if env info -p -d -q; then env save; fi\0" \ "boot_net_usb_start=true\0" +#ifndef STM32MP_BOARD_EXTRA_ENV +#define STM32MP_BOARD_EXTRA_ENV +#endif + #include <config_distro_bootcmd.h> /* @@ -169,7 +173,8 @@ STM32MP_BOOTCMD \ STM32MP_PARTS_DEFAULT \ BOOTENV \ - STM32MP_EXTRA + STM32MP_EXTRA \ + STM32MP_BOARD_EXTRA_ENV #endif /* ifndef CONFIG_SPL_BUILD */ #endif /* ifdef CONFIG_DISTRO_DEFAULTS*/ |