From: Tom Rini <trini@konsulko.com>
Date: Thu, 29 Jul 2021 12:20:06 +0000 (-0400)
Subject: Merge tag 'ti-v2021.10-rc2' of https://source.denx.de/u-boot/custodians/u-boot-ti
X-Git-Url: http://git.dujemihanovic.xyz/img/sics.gif?a=commitdiff_plain;h=38436abd5e58044eccddbcd7ec3610a9104e86b6;p=u-boot.git

Merge tag 'ti-v2021.10-rc2' of https://source.denx.de/u-boot/custodians/u-boot-ti

- Add MMC High speed modes for AM64 and J7200
- Add Sierra/Torrent SERDES driver
- Minor clean-ups for R5F boot from SPL
---

38436abd5e58044eccddbcd7ec3610a9104e86b6
diff --cc configs/am64x_evm_a53_defconfig
index babed94c23,4034cd418f..eba6d33ac6
--- a/configs/am64x_evm_a53_defconfig
+++ b/configs/am64x_evm_a53_defconfig
@@@ -29,9 -30,11 +30,11 @@@ CONFIG_BOARD_LATE_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_I2C=y
  CONFIG_SPL_DM_MAILBOX=y
  CONFIG_SPL_DM_SPI_FLASH=y
  CONFIG_SPL_POWER_DOMAIN=y
diff --cc configs/am64x_evm_r5_defconfig
index a133216a68,c58d71c942..98e9aa4447
--- a/configs/am64x_evm_r5_defconfig
+++ b/configs/am64x_evm_r5_defconfig
@@@ -11,10 -12,13 +12,13 @@@ CONFIG_SYS_SPI_U_BOOT_OFFS=0x8000
  CONFIG_DM_GPIO=y
  CONFIG_SPL_DM_SPI=y
  CONFIG_DEFAULT_DEVICE_TREE="k3-am642-r5-evm"
- CONFIG_SPL_TEXT_BASE=0x70020000
+ CONFIG_SPL_TEXT_BASE=0x70000000
+ CONFIG_ENV_IS_IN_MMC=y
+ CONFIG_SYS_MMC_ENV_DEV=0
+ CONFIG_SYS_MMC_ENV_PART=1
  CONFIG_SPL_MMC_SUPPORT=y
  CONFIG_SPL_SERIAL_SUPPORT=y
 -CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
 +CONFIG_SPL_DRIVERS_MISC=y
  CONFIG_SPL_STACK_R_ADDR=0x82000000
  CONFIG_SPL_SIZE_LIMIT=0x190000
  CONFIG_SPL_SIZE_LIMIT_PROVIDE_STACK=0x4000
diff --cc configs/j7200_evm_r5_defconfig
index 693f7af7d7,78c74a540f..74571cf030
--- a/configs/j7200_evm_r5_defconfig
+++ b/configs/j7200_evm_r5_defconfig
@@@ -90,9 -90,8 +90,9 @@@ CONFIG_SYS_I2C_OMAP24XX=
  CONFIG_DM_MAILBOX=y
  CONFIG_K3_SEC_PROXY=y
  CONFIG_FS_LOADER=y
 +CONFIG_K3_AVS0=y
  CONFIG_SUPPORT_EMMC_BOOT=y
- CONFIG_SPL_MMC_HS200_SUPPORT=y
+ CONFIG_SPL_MMC_HS400_SUPPORT=y
  CONFIG_MMC_SDHCI=y
  CONFIG_SPL_MMC_SDHCI_ADMA=y
  CONFIG_MMC_SDHCI_AM654=y