From: Tom Rini <trini@konsulko.com>
Date: Sun, 25 Feb 2018 20:38:42 +0000 (-0500)
Subject: Merge git://git.denx.de/u-boot-imx
X-Git-Tag: v2018.03-rc4~28
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e12546de54fc9be818e8d39967b07fa351d9e5ba;p=u-boot

Merge git://git.denx.de/u-boot-imx
---

e12546de54fc9be818e8d39967b07fa351d9e5ba
diff --cc configs/imx6q_icore_nand_defconfig
index 0000000000,034e17479e..2a86059226
mode 000000,100644..100644
--- a/configs/imx6q_icore_nand_defconfig
+++ b/configs/imx6q_icore_nand_defconfig
@@@ -1,0 -1,47 +1,48 @@@
+ CONFIG_ARM=y
+ CONFIG_ARCH_MX6=y
+ CONFIG_SYS_TEXT_BASE=0x17800000
+ CONFIG_SPL_GPIO_SUPPORT=y
+ CONFIG_SPL_LIBCOMMON_SUPPORT=y
+ CONFIG_SPL_LIBGENERIC_SUPPORT=y
+ CONFIG_TARGET_MX6Q_ENGICAM=y
+ CONFIG_SPL_SERIAL_SUPPORT=y
+ CONFIG_SPL_WATCHDOG_SUPPORT=y
+ # CONFIG_CMD_BMODE is not set
+ CONFIG_DEFAULT_DEVICE_TREE="imx6q-icore"
+ CONFIG_FIT=y
+ CONFIG_FIT_SIGNATURE=y
+ CONFIG_FIT_VERBOSE=y
+ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
+ CONFIG_BOOTDELAY=3
++CONFIG_SUPPORT_RAW_INITRD=y
+ CONFIG_SPL=y
+ CONFIG_SPL_DMA_SUPPORT=y
+ CONFIG_HUSH_PARSER=y
+ CONFIG_SYS_PROMPT="icorem6qdl> "
+ CONFIG_CMD_MEMTEST=y
+ CONFIG_CMD_GPIO=y
+ CONFIG_CMD_I2C=y
+ CONFIG_CMD_MMC=y
+ CONFIG_CMD_MII=y
+ CONFIG_CMD_PING=y
+ CONFIG_CMD_CACHE=y
+ CONFIG_CMD_EXT4=y
+ CONFIG_CMD_EXT4_WRITE=y
+ CONFIG_CMD_FAT=y
+ CONFIG_CMD_FS_GENERIC=y
+ CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand"
+ CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:2m(spl),2m(uboot),1m(env),8m(kernel),1m(dtb),-(rootfs)"
+ CONFIG_CMD_UBI=y
+ CONFIG_ENV_IS_IN_NAND=y
+ CONFIG_SYS_I2C_MXC=y
+ CONFIG_NAND=y
+ CONFIG_NAND_MXS=y
+ CONFIG_PHYLIB=y
+ CONFIG_PHY_SMSC=y
+ CONFIG_FEC_MXC=y
+ CONFIG_PINCTRL=y
+ CONFIG_PINCTRL_IMX6=y
+ CONFIG_MXC_UART=y
+ CONFIG_IMX_THERMAL=y
+ CONFIG_VIDEO=y
+ CONFIG_VIDEO_IPUV3=y
diff --cc configs/imx6qdl_icore_mipi_defconfig
index e79f29aeb6,e212cd1c18..208fc89b7e
--- a/configs/imx6qdl_icore_mipi_defconfig
+++ b/configs/imx6qdl_icore_mipi_defconfig
@@@ -17,9 -17,8 +17,9 @@@ CONFIG_FIT_SIGNATURE=
  CONFIG_FIT_VERBOSE=y
  CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
  CONFIG_BOOTDELAY=3
 +CONFIG_SUPPORT_RAW_INITRD=y
  CONFIG_SPL=y
- CONFIG_SPL_EXT_SUPPORT=y
+ CONFIG_SPL_LOAD_FIT=y
  CONFIG_SPL_OS_BOOT=y
  CONFIG_HUSH_PARSER=y
  CONFIG_SYS_PROMPT="icorem6qdl-mipi> "
diff --cc configs/imx6qdl_icore_mmc_defconfig
index 3f7075767b,1a0ee83633..d386946df6
--- a/configs/imx6qdl_icore_mmc_defconfig
+++ b/configs/imx6qdl_icore_mmc_defconfig
@@@ -17,9 -17,8 +17,9 @@@ CONFIG_FIT_SIGNATURE=
  CONFIG_FIT_VERBOSE=y
  CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
  CONFIG_BOOTDELAY=3
 +CONFIG_SUPPORT_RAW_INITRD=y
  CONFIG_SPL=y
- CONFIG_SPL_EXT_SUPPORT=y
+ CONFIG_SPL_LOAD_FIT=y
  CONFIG_SPL_OS_BOOT=y
  CONFIG_HUSH_PARSER=y
  CONFIG_SYS_PROMPT="icorem6qdl> "
diff --cc configs/imx6qdl_icore_rqs_defconfig
index 485b9bf02e,98ba9345d5..13f3455369
--- a/configs/imx6qdl_icore_rqs_defconfig
+++ b/configs/imx6qdl_icore_rqs_defconfig
@@@ -16,9 -16,8 +16,9 @@@ CONFIG_FIT_SIGNATURE=
  CONFIG_FIT_VERBOSE=y
  CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
  CONFIG_BOOTDELAY=3
 +CONFIG_SUPPORT_RAW_INITRD=y
  CONFIG_SPL=y
- CONFIG_SPL_EXT_SUPPORT=y
+ CONFIG_SPL_LOAD_FIT=y
  CONFIG_SPL_OS_BOOT=y
  CONFIG_HUSH_PARSER=y
  CONFIG_SYS_PROMPT="icorem6qdl-rqs> "
diff --cc configs/imx6ul_geam_mmc_defconfig
index e887327e21,2493c70e53..b6d8680b08
--- a/configs/imx6ul_geam_mmc_defconfig
+++ b/configs/imx6ul_geam_mmc_defconfig
@@@ -16,9 -16,7 +16,8 @@@ CONFIG_FIT_SIGNATURE=
  CONFIG_FIT_VERBOSE=y
  CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
  CONFIG_BOOTDELAY=3
 +CONFIG_SUPPORT_RAW_INITRD=y
  CONFIG_SPL=y
- CONFIG_SPL_EXT_SUPPORT=y
  CONFIG_HUSH_PARSER=y
  CONFIG_SYS_PROMPT="geam6ul> "
  CONFIG_CRC32_VERIFY=y
diff --cc configs/imx6ul_isiot_emmc_defconfig
index 35e889283a,6e7de0882a..a9bfbfd254
--- a/configs/imx6ul_isiot_emmc_defconfig
+++ b/configs/imx6ul_isiot_emmc_defconfig
@@@ -16,9 -16,7 +16,8 @@@ CONFIG_FIT_SIGNATURE=
  CONFIG_FIT_VERBOSE=y
  CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
  CONFIG_BOOTDELAY=3
 +CONFIG_SUPPORT_RAW_INITRD=y
  CONFIG_SPL=y
- CONFIG_SPL_EXT_SUPPORT=y
  CONFIG_HUSH_PARSER=y
  CONFIG_SYS_PROMPT="isiotmx6ul> "
  CONFIG_CRC32_VERIFY=y