karo: tx6: set 'CONFIG_ENV_IS_... appropriately for _mfg U-Boot

diff --git a/configs/tx6q-10x0_mfg_defconfig b/configs/tx6q-10x0_mfg_defconfig
index 20e3d1a2552cb665c7a8e6a2f7eca5198e88be4f..77da179e863a147c20c7c7a21e188e2f87c5c106 100644 (file)
--- a/configs/tx6q-10x0_mfg_defconfig
+++ b/configs/tx6q-10x0_mfg_defconfig
@@ -21,6 +21,7 @@ CONFIG_CMD_I2C=y
 CONFIG_NAND=y
 CONFIG_NAND_MXS=y
 CONFIG_DOS_PARTITION=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
 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 f5078658cf29117a3cf0f4873e05dd610ab5dc56..b9f773518bd89820e34209be8f4f7bcf0d65d086 100644 (file)
--- a/configs/tx6s-8034_noenv_defconfig
+++ b/configs/tx6s-8034_noenv_defconfig
@@ -14,6 +14,7 @@ CONFIG_BOOTP_DNS=y
 CONFIG_MMC=y
 CONFIG_FSL_ESDHC=y
 CONFIG_FSL_USDHC=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_NET=y
 CONFIG_NETDEVICES=y
 CONFIG_FEC_MXC=y


@@ -22,7 +23,6 @@ CONFIG_CMD_I2C=y
 CONFIG_NAND=y
 CONFIG_NAND_MXS=y
 CONFIG_DOS_PARTITION=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
 CONFIG_FEC_MXC_PHYADDR=0
 CONFIG_MXC_OCOTP=y
 CONFIG_CMD_FUSE=y

diff --git a/configs/tx6s-8035_mfg_defconfig b/configs/tx6s-8035_mfg_defconfig
index 158c9b9156bf3e026b35ec0b55632a65d59d4f32..7b652890c4e8026ab9f208c5eebf00c76f25fe60 100644 (file)
--- a/configs/tx6s-8035_mfg_defconfig
+++ b/configs/tx6s-8035_mfg_defconfig
@@ -20,6 +20,7 @@ CONFIG_FEC_MXC=y
 CONFIG_IMX_WATCHDOG=y
 CONFIG_CMD_I2C=y
 CONFIG_DOS_PARTITION=y
 CONFIG_IMX_WATCHDOG=y
 CONFIG_CMD_I2C=y
 CONFIG_DOS_PARTITION=y

+CONFIG_ENV_IS_IN_MMC=y

 CONFIG_FEC_MXC_PHYADDR=0
 CONFIG_MXC_OCOTP=y
 CONFIG_CMD_FUSE=y
 CONFIG_FEC_MXC_PHYADDR=0
 CONFIG_MXC_OCOTP=y
 CONFIG_CMD_FUSE=y

diff --git a/configs/tx6u-8011_mfg_defconfig b/configs/tx6u-8011_mfg_defconfig
index 5e1b5cf478f1ef566e96a6a127350bce4fdcdb88..d682277ab9ba2968f8ba4543a05c88d4abef8ddd 100644 (file)
--- a/configs/tx6u-8011_mfg_defconfig
+++ b/configs/tx6u-8011_mfg_defconfig
@@ -22,6 +22,7 @@ CONFIG_CMD_I2C=y
 CONFIG_NAND=y
 CONFIG_NAND_MXS=y
 CONFIG_DOS_PARTITION=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
 CONFIG_FEC_MXC_PHYADDR=0
 CONFIG_MXC_OCOTP=y
 CONFIG_CMD_FUSE=y

diff --git a/configs/tx6u-8012_mfg_defconfig b/configs/tx6u-8012_mfg_defconfig
index 722b295b3ee5703064187fab2b7b3e2afb3e9f53..fba2b06a269b50f8b57a51fbc64ab0d6322b4e3b 100644 (file)
--- a/configs/tx6u-8012_mfg_defconfig
+++ b/configs/tx6u-8012_mfg_defconfig
@@ -22,6 +22,7 @@ CONFIG_CMD_I2C=y
 CONFIG_NAND=y
 CONFIG_NAND_MXS=y
 CONFIG_DOS_PARTITION=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
 CONFIG_FEC_MXC_PHYADDR=0
 CONFIG_MXC_OCOTP=y
 CONFIG_CMD_FUSE=y

diff --git a/configs/tx6u-8033_mfg_defconfig b/configs/tx6u-8033_mfg_defconfig
index 4597a1d7d5b7fd70908736fefb5a4c3413537fed..414617e175d0a7edaa6bde3317313c9f8ada9ce5 100644 (file)
--- a/configs/tx6u-8033_mfg_defconfig
+++ b/configs/tx6u-8033_mfg_defconfig
@@ -20,7 +20,7 @@ CONFIG_FEC_MXC=y
 CONFIG_IMX_WATCHDOG=y
 CONFIG_CMD_I2C=y
 CONFIG_DOS_PARTITION=y
 CONFIG_IMX_WATCHDOG=y
 CONFIG_CMD_I2C=y
 CONFIG_DOS_PARTITION=y

-CONFIG_ENV_IS_NOWHERE=y
+CONFIG_ENV_IS_IN_MMC=y

 CONFIG_FEC_MXC_PHYADDR=0
 CONFIG_MXC_OCOTP=y
 CONFIG_CMD_FUSE=y
 CONFIG_FEC_MXC_PHYADDR=0
 CONFIG_MXC_OCOTP=y
 CONFIG_CMD_FUSE=y

diff --git a/configs/tx6u-80x0_mfg_defconfig b/configs/tx6u-80x0_mfg_defconfig
index 939016e68d6c9e3a34b54cf9ca2dc71bb2a1a2e7..bb825fbc69a889f2006327128d148d945a6627bc 100644 (file)
--- a/configs/tx6u-80x0_mfg_defconfig
+++ b/configs/tx6u-80x0_mfg_defconfig
@@ -21,6 +21,7 @@ CONFIG_CMD_I2C=y
 CONFIG_NAND=y
 CONFIG_NAND_MXS=y
 CONFIG_DOS_PARTITION=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
 CONFIG_FEC_MXC_PHYADDR=0
 CONFIG_MXC_OCOTP=y
 CONFIG_CMD_FUSE=y

diff --git a/configs/tx6u-8111_mfg_defconfig b/configs/tx6u-8111_mfg_defconfig
index 91770aa82190cee1126a402ec3302107ee54bb42..428ed2a8e78ab5a92c1dfa76e1a93e13fc3318f2 100644 (file)
--- a/configs/tx6u-8111_mfg_defconfig
+++ b/configs/tx6u-8111_mfg_defconfig
@@ -22,6 +22,7 @@ CONFIG_CMD_I2C=y
 CONFIG_NAND=y
 CONFIG_NAND_MXS=y
 CONFIG_DOS_PARTITION=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
 CONFIG_FEC_MXC_PHYADDR=0
 CONFIG_MXC_OCOTP=y
 CONFIG_CMD_FUSE=y

diff --git a/configs/tx6u-81x0_mfg_defconfig b/configs/tx6u-81x0_mfg_defconfig
index b9b4bdedd667b514ce52f3bf278bea7a5c8f1658..74e5289ed1e84700db537c5788f12fa6fda91453 100644 (file)
--- a/configs/tx6u-81x0_mfg_defconfig
+++ b/configs/tx6u-81x0_mfg_defconfig
@@ -22,6 +22,7 @@ CONFIG_CMD_I2C=y
 CONFIG_NAND=y
 CONFIG_NAND_MXS=y
 CONFIG_DOS_PARTITION=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
 CONFIG_FEC_MXC_PHYADDR=0
 CONFIG_MXC_OCOTP=y
 CONFIG_CMD_FUSE=y