Merge tag 'ti-v2020.07-next' of https://gitlab.denx.de/u-boot/custodians/u-boot-ti...

K3 J721E:
* OSPI boot support
* Support for loading remote cores in R5 SPL
* PMIC ESM Support
* Minor fixes for R5F and C7x remoteproc drivers

K3 AM654:
* Update AVS class 0 voltages.
* Add I2C nodes

DRA7xx/AM57xx:
* Fixed Android boot on AM57xx

AM33/AM43/Davinci:
* switch to driver model for the net and mdio driver for baltos
* Add DM/DTS support for omap video driver
* Enable fastboot on am335x-evm

diff --cc arch/arm/dts/k3-am654-base-board-u-boot.dtsi
Simple merge

diff --cc arch/arm/dts/k3-j721e-r5-common-proc-board.dts
Simple merge

diff --cc arch/arm/mach-k3/am6_init.c
index d0b10e58ad3e176d7f35dcebcb3f5d20ef99b197,0f739818f6493fe19462cdd6f8a9c91ed790aa15..3768bccafa633a92e2aab1a86145e94aaef5c293
--- 1/arch/arm/mach-k3/am6_init.c
--- 2/arch/arm/mach-k3/am6_init.c
+++ b/arch/arm/mach-k3/am6_init.c
@@@ -161,15 -133,10 +161,13 @@@ void board_init_f(ulong dummy
                pinctrl_select_state(dev, "default");
  
        /*
-        * Load, start up, and configure system controller firmware. Provide
-        * the U-Boot console init function to the SYSFW post-PM configuration
-        * callback hook, effectively switching on (or over) the console
-        * output.
+        * Load, start up, and configure system controller firmware while
+        * also populating the SYSFW post-PM configuration callback hook.
         */
 -      k3_sysfw_loader(preloader_console_init);
 +      k3_sysfw_loader(k3_mmc_stop_clock, k3_mmc_restart_clock);
 +
 +      /* Prepare console output */
 +      preloader_console_init();
  
        /* Disable ROM configured firewalls right after loading sysfw */
  #ifdef CONFIG_TI_SECURE_DEVICE

diff --cc arch/arm/mach-k3/j721e_init.c
index 0994522f6c30ceed1e2bf345d32409081be8f1a8,511cfd2fab0f4732210111a4e2b528d987f08ad0..f34090f9cc9999a9453d3f088af36b8d90e46f44
--- 1/arch/arm/mach-k3/j721e_init.c
--- 2/arch/arm/mach-k3/j721e_init.c
+++ b/arch/arm/mach-k3/j721e_init.c
@@@ -18,7 -18,7 +18,8 @@@
  #include <dm.h>
  #include <dm/uclass-internal.h>
  #include <dm/pinctrl.h>
 +#include <mmc.h>
+ #include <remoteproc.h>
  
  #ifdef CONFIG_SPL_BUILD
  #ifdef CONFIG_K3_LOAD_SYSFW

diff --cc arch/arm/mach-k3/sysfw-loader.c
index db02607b171ee52076edd98d8cecc6bd121a5aa0,02294914934fd93d436f2570a2af6f674a57504f..4f5c84824563171523c473b5793bc4c4d45ddd3d
--- 1/arch/arm/mach-k3/sysfw-loader.c
--- 2/arch/arm/mach-k3/sysfw-loader.c
+++ b/arch/arm/mach-k3/sysfw-loader.c
@@@ -197,8 -199,27 +199,28 @@@ exit
  }
  #endif
  
 -void k3_sysfw_loader(void (*config_pm_done_callback)(void))
+ #if CONFIG_IS_ENABLED(SPI_LOAD)
+ static void *k3_sysfw_get_spi_addr(void)
+ {
+       struct udevice *dev;
+       fdt_addr_t addr;
+       int ret;
+ 
+       ret = uclass_find_device_by_seq(UCLASS_SPI, CONFIG_SF_DEFAULT_BUS,
+                                       true, &dev);
+       if (ret)
+               return NULL;
+ 
+       addr = dev_read_addr_index(dev, 1);
+       if (addr == FDT_ADDR_T_NONE)
+               return NULL;
+ 
+       return (void *)(addr + CONFIG_K3_SYSFW_IMAGE_SPI_OFFS);
+ }
+ #endif
+ 
 +void k3_sysfw_loader(void (*config_pm_pre_callback) (void),
 +                   void (*config_pm_done_callback)(void))
  {
        struct spl_image_info spl_image = { 0 };
        struct spl_boot_device bootdev = { 0 };

diff --cc configs/am65x_evm_a53_defconfig
index df7723b71ebdf76413401206741e689902a979cd,f175d20a66c0bf119b41fc5cec511aeba41782e4..542bbd992c53afdba2411bc91addf65641c170f7
--- 1/configs/am65x_evm_a53_defconfig
--- 2/configs/am65x_evm_a53_defconfig
+++ b/configs/am65x_evm_a53_defconfig
@@@ -13,9 -13,10 +13,11 @@@ CONFIG_SPL_SERIAL_SUPPORT=
  CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
  CONFIG_SPL_STACK_R_ADDR=0x82000000
  CONFIG_NR_DRAM_BANKS=2
 +CONFIG_ENV_OFFSET_REDUND=0x6A0000
  CONFIG_SPL_FS_FAT=y
  CONFIG_SPL_LIBDISK_SUPPORT=y
+ CONFIG_SPL_SPI_FLASH_SUPPORT=y
+ CONFIG_SPL_SPI_SUPPORT=y
  # CONFIG_PSCI_RESET is not set
  CONFIG_SPL_TEXT_BASE=0x80080000
  CONFIG_DISTRO_DEFAULTS=y

diff --cc configs/am65x_evm_r5_defconfig
Simple merge

diff --cc configs/j721e_evm_a72_defconfig
index b27f9ba27b1073d62e8c27eb00964334a247d647,116159d8169383c405f46efceb89209a70ad10e9..e9e82bb4309d39fd6057734ecbc4e7ecb25b3e6b
--- 1/configs/j721e_evm_a72_defconfig
--- 2/configs/j721e_evm_a72_defconfig
+++ b/configs/j721e_evm_a72_defconfig
@@@ -29,8 -28,7 +29,9 @@@ CONFIG_SPL_BOARD_INIT=
  CONFIG_SPL_SYS_MALLOC_SIMPLE=y
  CONFIG_SPL_STACK_R=y
  CONFIG_SPL_SEPARATE_BSS=y
 +CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y
 +CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x1400
+ CONFIG_SPL_DMA=y
  CONFIG_SPL_ENV_SUPPORT=y
  CONFIG_SPL_I2C_SUPPORT=y
  CONFIG_SPL_DM_MAILBOX=y

diff --cc configs/j721e_evm_r5_defconfig
index ea70c34c5aff6773bbddb77bb3a4870135c9f810,bdbcf4ce416e5d96ab3681bd18424ca741f062a3..917f82d4b545b88e437ec72089ed781f48ee25a9
--- 1/configs/j721e_evm_r5_defconfig
--- 2/configs/j721e_evm_r5_defconfig
+++ b/configs/j721e_evm_r5_defconfig
@@@ -27,9 -25,9 +26,11 @@@ CONFIG_USE_BOOTCOMMAND=
  CONFIG_SPL_STACK_R=y
  CONFIG_SPL_SEPARATE_BSS=y
  CONFIG_SPL_EARLY_BSS=y
 +CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y
 +CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x400
+ CONFIG_SPL_DMA=y
  CONFIG_SPL_ENV_SUPPORT=y
+ CONFIG_SPL_FS_EXT4=y
  CONFIG_SPL_I2C_SUPPORT=y
  CONFIG_SPL_DM_MAILBOX=y
  CONFIG_SPL_DM_RESET=y

diff --cc configs/j721e_hs_evm_a72_defconfig
Simple merge

diff --cc configs/j721e_hs_evm_r5_defconfig
Simple merge

diff --cc drivers/misc/k3_avs.c
Simple merge

diff --cc include/configs/am65x_evm.h
Simple merge