From: Tom Rini <trini@konsulko.com>
Date: Thu, 24 Oct 2019 13:51:48 +0000 (-0400)
Subject: Merge branch '2019-10-24-UFS-support'
X-Git-Tag: v2020.01-rc1~9
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=17fd9915a4c639381804ed28274fa136ae3b0bee;p=oweals%2Fu-boot.git

Merge branch '2019-10-24-UFS-support'

- Add Universal Flash Storage (UFS) support
---

17fd9915a4c639381804ed28274fa136ae3b0bee
diff --cc configs/j721e_evm_a72_defconfig
index f1f4d8af85,bfb7c15cae..b79fe14a5a
--- a/configs/j721e_evm_a72_defconfig
+++ b/configs/j721e_evm_a72_defconfig
@@@ -34,9 -34,9 +34,10 @@@ CONFIG_SPL_YMODEM_SUPPORT=
  CONFIG_CMD_ASKENV=y
  # CONFIG_CMD_FLASH is not set
  CONFIG_CMD_MMC=y
 +CONFIG_CMD_MTD=y
  CONFIG_CMD_REMOTEPROC=y
  CONFIG_CMD_SF=y
+ CONFIG_CMD_UFS=y
  # CONFIG_CMD_SETEXPR is not set
  CONFIG_CMD_TIME=y
  CONFIG_CMD_EXT4_WRITE=y
@@@ -94,6 -87,7 +97,9 @@@ CONFIG_CADENCE_QSPI=
  CONFIG_SYSRESET=y
  CONFIG_SPL_SYSRESET=y
  CONFIG_SYSRESET_TI_SCI=y
+ CONFIG_UFS=y
+ CONFIG_CADENCE_UFS=y
+ CONFIG_TI_J721E_UFS=y
  CONFIG_OF_LIBFDT_OVERLAY=y
 +CONFIG_MTDIDS_DEFAULT="nor0=47040000.spi.0,nor0=47034000.hyperbus"
 +CONFIG_MTDPARTS_DEFAULT="mtdparts=47034000.hyperbus:512k(hbmc.tiboot3),2m(hbmc.tispl),4m(hbmc.u-boot),256k(hbmc.env),1m(hbmc.sysfw),-@8m(hbmc.rootfs)"