summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2020-07-29 23:30:45 +0300
committerTom Rini <trini@konsulko.com>2020-07-29 23:30:45 +0300
commit7cb2060b4e63a89c50739dc8a9fcd5d73f86f0be (patch)
tree984ba6e187e131d890354557925698ee614fdb7e /include
parent8da75b1ddf966bd8457a2b5bf59dec0bfc9a1cd6 (diff)
parent0b263a905a02bd3ae7516149490a98462d966f55 (diff)
downloadu-boot-7cb2060b4e63a89c50739dc8a9fcd5d73f86f0be.tar.xz
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-stm
- fix SPL boot issue due to early dbgmcu_init() call - fix SPL boot issue due to dcache memory region configuration - add support of CONFIG_ENV_IS_IN_MMC - add specific SD/eMMC partition for U-Boot enviromnent - enable env in SPL - use "env info -q" to remove log during boot - remove env location override for dh_stm32mp1 - update management of misc_read - check result of find_mmc_device in stm32prog - use regulator_set_enable_if_allowed for disabling vdd supply in usbphyc - enable CMD_ADTIMG flag to handle Android images - device tree alignment with Linux Kernel v5.8-rc1 - remove hnp-srp-disable for usbotg on dk1 - add reset support to uart nodes on stm32mp15x - use correct weak function name spl_board_prepare_for_linux - use cd-gpios for ST and DHSOM boards - add seeed studio odyssey-stm32mp157c board support - move ethernet PHY into SoM DT - add DHSOM based DRC02 board support
Diffstat (limited to 'include')
-rw-r--r--include/configs/stm32mp1.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/configs/stm32mp1.h b/include/configs/stm32mp1.h
index de9f8cb9bf..b937233797 100644
--- a/include/configs/stm32mp1.h
+++ b/include/configs/stm32mp1.h
@@ -156,7 +156,7 @@
"splashimage=0xc4300000\0" \
"ramdisk_addr_r=0xc4400000\0" \
"altbootcmd=run bootcmd\0" \
- "env_check=if env info -p -d; then env save; fi\0" \
+ "env_check=if env info -p -d -q; then env save; fi\0" \
STM32MP_BOOTCMD \
BOOTENV \
"boot_net_usb_start=true\0"