From: Tom Rini <trini@konsulko.com>
Date: Wed, 29 Jul 2020 20:30:45 +0000 (-0400)
Subject: Merge https://gitlab.denx.de/u-boot/custodians/u-boot-stm
X-Git-Url: http://git.dujemihanovic.xyz/login.html?a=commitdiff_plain;h=7cb2060b4e63a89c50739dc8a9fcd5d73f86f0be;p=u-boot.git

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
---

7cb2060b4e63a89c50739dc8a9fcd5d73f86f0be
diff --cc configs/stm32mp15_trusted_defconfig
index 0b1bfa560c,ed1dad9285..98680cb2dc
--- a/configs/stm32mp15_trusted_defconfig
+++ b/configs/stm32mp15_trusted_defconfig
@@@ -41,8 -41,9 +42,8 @@@ CONFIG_CMD_REGULATOR=
  CONFIG_CMD_EXT4_WRITE=y
  CONFIG_CMD_MTDPARTS=y
  CONFIG_CMD_UBI=y
 -CONFIG_DEFAULT_DEVICE_TREE="stm32mp157c-ev1"
  CONFIG_ENV_IS_NOWHERE=y
- CONFIG_ENV_IS_IN_EXT4=y
+ CONFIG_ENV_IS_IN_MMC=y
  CONFIG_ENV_IS_IN_SPI_FLASH=y
  CONFIG_ENV_IS_IN_UBI=y
  CONFIG_SYS_REDUNDAND_ENVIRONMENT=y