From: Lothar Waßmann <LW@KARO-electronics.de>
Date: Fri, 21 Aug 2015 14:00:29 +0000 (+0200)
Subject: karo: tx6s: add NAND support
X-Git-Tag: KARO-TX6-2015-09-18~4034^2^2~10
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=53d8c76febb3ac2991701d5acc17f14c5049c609

karo: tx6s: add NAND support
---

diff --git a/configs/tx6s-8034_defconfig b/configs/tx6s-8034_defconfig
index 4917287bf4..8e65cbf0d0 100644
--- a/configs/tx6s-8034_defconfig
+++ b/configs/tx6s-8034_defconfig
@@ -20,8 +20,10 @@ CONFIG_NETDEVICES=y
 CONFIG_FEC_MXC=y
 CONFIG_IMX_WATCHDOG=y
 CONFIG_CMD_I2C=y
+CONFIG_NAND=y
+CONFIG_NAND_MXS=y
 CONFIG_DOS_PARTITION=y
-CONFIG_ENV_IS_IN_MMC=y
+CONFIG_ENV_IS_IN_NAND=y
 CONFIG_FEC_MXC_PHYADDR=0
 CONFIG_MXC_OCOTP=y
 CONFIG_CMD_FUSE=y
diff --git a/configs/tx6s-8034_mfg_defconfig b/configs/tx6s-8034_mfg_defconfig
index 6899025f90..cca3102919 100644
--- a/configs/tx6s-8034_mfg_defconfig
+++ b/configs/tx6s-8034_mfg_defconfig
@@ -19,7 +19,10 @@ CONFIG_NETDEVICES=y
 CONFIG_FEC_MXC=y
 CONFIG_IMX_WATCHDOG=y
 CONFIG_CMD_I2C=y
+CONFIG_NAND=y
+CONFIG_NAND_MXS=y
 CONFIG_DOS_PARTITION=y
+CONFIG_ENV_IS_IN_NAND=y
 CONFIG_FEC_MXC_PHYADDR=0
 CONFIG_MXC_OCOTP=y
 CONFIG_CMD_FUSE=y
diff --git a/configs/tx6s-8034_noenv_defconfig b/configs/tx6s-8034_noenv_defconfig
index 220585e74b..f5078658cf 100644
--- a/configs/tx6s-8034_noenv_defconfig
+++ b/configs/tx6s-8034_noenv_defconfig
@@ -14,13 +14,15 @@ CONFIG_BOOTP_DNS=y
 CONFIG_MMC=y
 CONFIG_FSL_ESDHC=y
 CONFIG_FSL_USDHC=y
-CONFIG_LCD=y
 CONFIG_NET=y
 CONFIG_NETDEVICES=y
 CONFIG_FEC_MXC=y
 CONFIG_IMX_WATCHDOG=y
 CONFIG_CMD_I2C=y
+CONFIG_NAND=y
+CONFIG_NAND_MXS=y
 CONFIG_DOS_PARTITION=y
+CONFIG_ENV_IS_IN_NAND=y
 CONFIG_FEC_MXC_PHYADDR=0
 CONFIG_MXC_OCOTP=y
 CONFIG_CMD_FUSE=y