From: Lothar Waßmann Date: Mon, 24 Aug 2015 14:55:49 +0000 (+0200) Subject: karo: tx6: set 'CONFIG_ENV_IS_... appropriately for _mfg U-Boot X-Git-Tag: KARO-TX6-2015-09-18~4033 X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=71922e9179e65090a1683d47cfd8e30e4ec42593 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 20e3d1a255..77da179e86 100644 --- 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_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 f5078658cf..b9f773518b 100644 --- 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_LCD=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_ENV_IS_IN_NAND=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 158c9b9156..7b652890c4 100644 --- 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_ENV_IS_IN_MMC=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 5e1b5cf478..d682277ab9 100644 --- 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_ENV_IS_IN_NAND=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 722b295b3e..fba2b06a26 100644 --- 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_ENV_IS_IN_NAND=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 4597a1d7d5..414617e175 100644 --- 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_ENV_IS_NOWHERE=y +CONFIG_ENV_IS_IN_MMC=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 939016e68d..bb825fbc69 100644 --- 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_ENV_IS_IN_NAND=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 91770aa821..428ed2a8e7 100644 --- 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_ENV_IS_IN_NAND=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 b9b4bdedd6..74e5289ed1 100644 --- 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_ENV_IS_IN_NAND=y CONFIG_FEC_MXC_PHYADDR=0 CONFIG_MXC_OCOTP=y CONFIG_CMD_FUSE=y