karo: tx6: introduce generic TARGET_EMMC/TARGET_NAND to simplify Kconfig

diff --git a/board/karo/tx6/Kconfig b/board/karo/tx6/Kconfig
index fbf1d2ad6fa45a1eed31d8d4ce93d7502f3d2f7c..c01fbd5e82819dc2dde2d7d89eca63d141673ca3 100644 (file)
--- a/board/karo/tx6/Kconfig
+++ b/board/karo/tx6/Kconfig
@@ -77,100 +77,56 @@ config SYS_SDRAM_CHIP_SIZE
 choice
        prompt "TX6 module variant"
 
 choice
        prompt "TX6 module variant"
 

-config TARGET_TX6Q_1020
-       bool "TX6Q-1020"
+config TARGET_TX6Q_NAND
+       bool "TX6Q modules with NAND flash (TX6Q-1030/TX6Q-1130)"

        select SOC_MX6Q
        select SYS_I2C
        select SYS_I2C_MXC
        select SOC_MX6Q
        select SYS_I2C
        select SYS_I2C_MXC

-       select TX6_EMMC

 
 

-config TARGET_TX6Q_1036
-       bool "TX6Q-1036"
+config TARGET_TX6Q_EMMC
+       bool "TX6Q modules with eMMC (TX6Q-1020/TX6Q-1036)"

        select SOC_MX6Q
        select SYS_I2C
        select SYS_I2C_MXC
        select TX6_EMMC
 
        select SOC_MX6Q
        select SYS_I2C
        select SYS_I2C_MXC
        select TX6_EMMC
 

-config TARGET_TX6Q_10X0
-       bool "TX6Q-1010 and TX6Q-1030"
-       select SOC_MX6Q
-       select SYS_I2C
-       select SYS_I2C_MXC
-
-config TARGET_TX6Q_11X0
-       bool "TX6Q-1110 and TX6Q-1130"
-       select SOC_MX6Q
-       select SYS_I2C
-       select SYS_I2C_MXC
-       select SYS_LVDS_IF
-       
-config TARGET_TX6S_8034
-       bool "TX6S-8034"
+config TARGET_TX6S_NAND
+       bool "TX6S modules with NAND flash (TX6S-8034/TX6S-8134)"

        select SOC_MX6S
        select SYS_I2C
        select SYS_I2C_MXC
        select SOC_MX6S
        select SYS_I2C
        select SYS_I2C_MXC

-       select SYS_SDRAM_BUS_WIDTH_16

 
 

-config TARGET_TX6S_8035
-       bool "TX6S-8035"
+config TARGET_TX6S_EMMC
+       bool "TX6S modules with eMMC (TX6S-8035/TX6S-8135)"

        select SOC_MX6S
        select SYS_I2C
        select SYS_I2C_MXC
        select SOC_MX6S
        select SYS_I2C
        select SYS_I2C_MXC

-       select SYS_SDRAM_BUS_WIDTH_32

        select TX6_EMMC
 
        select TX6_EMMC
 

-config TARGET_TX6U_8011
-       bool "TX6U-8011"
-       select SOC_MX6DL
-       select SYS_I2C
-       select SYS_I2C_MXC
-       select SYS_SDRAM_BUS_WIDTH_32
-
-config TARGET_TX6U_8012
-       bool "TX6U-8012"
+config TARGET_TX6U_NAND
+       bool "TX6U (i.MX6DL) modules with NAND flash (TX6U-8030/TX6U-8032)"

        select SOC_MX6DL
        select SYS_I2C
        select SYS_I2C_MXC
 
        select SOC_MX6DL
        select SYS_I2C
        select SYS_I2C_MXC
 

-config TARGET_TX6U_8033
-       bool "TX6U-8033"
+config TARGET_TX6U_EMMC
+       bool "TX6U (i.MX6DL) modules with eMMC (TX6U-8033/TX6U-8133)"

        select SOC_MX6DL
        select SYS_I2C
        select SYS_I2C_MXC
        select TX6_EMMC
 
        select SOC_MX6DL
        select SYS_I2C
        select SYS_I2C_MXC
        select TX6_EMMC
 

-config TARGET_TX6U_80X0
-       bool "TX6U-8010 and TX6U-8030"
-       select SOC_MX6DL
-       select SYS_I2C
-       select SYS_I2C_MXC
-
-config TARGET_TX6U_8111
-       bool "TX6U-8111"
-       select SOC_MX6DL
-       select SYS_I2C
-       select SYS_I2C_MXC
-       select SYS_LVDS_IF
-       select SYS_SDRAM_BUS_WIDTH_32
-
-config TARGET_TX6U_81X0
-       bool "TX6U-8110 and TX6U-8130"
-       select SOC_MX6DL
-       select SYS_I2C
-       select SYS_I2C_MXC
-       select SYS_LVDS_IF
-
-config TARGET_TX6UL_0010
-       bool "TX6U-0010"
+config TARGET_TX6UL_NAND
+       bool "TXUL (i.MX6UL) modules with NAND flash (TXUL-5010)"

        select TX6UL
 
        select TX6UL
 

-config TARGET_TX6UL_0011
-       bool "TX6U-0011"
+config TARGET_TX6UL_EMMC
+       bool "TXUL (i.MX6UL) modules with eMMC (TXUL-5011)"

        select TX6UL
        select TX6_EMMC
 
        select TX6UL
        select TX6_EMMC
 

-config TARGET_TX6QP_8037
-       bool "TX6QP-8037"
+config TARGET_TX6QP_EMMC
+       bool "TX6Q modules with i.MX6Q+ and eMMC (TX6QP-8037)"

        select SOC_MX6Q
        select SYS_I2C
        select SYS_I2C_MXC
        select SOC_MX6Q
        select SYS_I2C
        select SYS_I2C_MXC

diff --git a/configs/tx6q-1020_defconfig b/configs/tx6q-1020_defconfig
index b8567d93a94a99cc52d61778e59fd7171706e611..a3684da920d407f0b9c6774e8f8690387c0a36c9 100644 (file)
--- a/configs/tx6q-1020_defconfig
+++ b/configs/tx6q-1020_defconfig
@@ -2,7 +2,7 @@ CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=4096,TX6_REV=0x2"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y

-CONFIG_TARGET_TX6Q_1020=y
+CONFIG_TARGET_TX6Q_EMMC=y

 CONFIG_TX6_UBOOT=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_TX6_UBOOT=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y

diff --git a/configs/tx6q-1020_mfg_defconfig b/configs/tx6q-1020_mfg_defconfig
index 92513b5db464c5b6c5f6dcd407e5b99d06956ae5..eab82df7f23240fc8f0d82b9c274c7d881935710 100644 (file)
--- a/configs/tx6q-1020_mfg_defconfig
+++ b/configs/tx6q-1020_mfg_defconfig
@@ -2,7 +2,7 @@ CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=4096,TX6_REV=0x2"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y

-CONFIG_TARGET_TX6Q_1020=y
+CONFIG_TARGET_TX6Q_EMMC=y

 CONFIG_TX6_UBOOT_MFG=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_TX6_UBOOT_MFG=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y

diff --git a/configs/tx6q-1020_noenv_defconfig b/configs/tx6q-1020_noenv_defconfig
index c60060a4a11ace77348a7230bdc8e9a02d054288..c8a841a38b55a617ee69fe0a33e79fd5efc5080a 100644 (file)
--- a/configs/tx6q-1020_noenv_defconfig
+++ b/configs/tx6q-1020_noenv_defconfig
@@ -2,7 +2,7 @@ CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=4096,TX6_REV=0x2"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y

-CONFIG_TARGET_TX6Q_1020=y
+CONFIG_TARGET_TX6Q_EMMC=y

 CONFIG_TX6_UBOOT_NOENV=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_TX6_UBOOT_NOENV=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y

diff --git a/configs/tx6q-1020_sec_defconfig b/configs/tx6q-1020_sec_defconfig
index c55066a03de997ab4594029feb3d7fa0f6d9930a..e35c396f5ffcc27acc3e6897132d22fb4306f99f 100644 (file)
--- a/configs/tx6q-1020_sec_defconfig
+++ b/configs/tx6q-1020_sec_defconfig
@@ -2,7 +2,7 @@ CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=4096,SECURE_BOOT,TX6_REV=0x2"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y

-CONFIG_TARGET_TX6Q_1020=y
+CONFIG_TARGET_TX6Q_EMMC=y

 CONFIG_TX6_UBOOT=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_TX6_UBOOT=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y

diff --git a/configs/tx6q-1036_defconfig b/configs/tx6q-1036_defconfig
index cce4940040ec78e8465f8bf3019ba1c8cd62433b..d4e3865cad203b24974fedf12ccd0f83f081bc19 100644 (file)
--- a/configs/tx6q-1036_defconfig
+++ b/configs/tx6q-1036_defconfig
@@ -2,7 +2,7 @@ CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=4096"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y

-CONFIG_TARGET_TX6Q_1036=y
+CONFIG_TARGET_TX6Q_EMMC=y

 CONFIG_TX6_UBOOT=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_TX6_UBOOT=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y

diff --git a/configs/tx6q-1036_mfg_defconfig b/configs/tx6q-1036_mfg_defconfig
index b44e41c040de73d2108ef18465ce99663961f584..772bb7761235c137c5451acab5b65a20b6257b0d 100644 (file)
--- a/configs/tx6q-1036_mfg_defconfig
+++ b/configs/tx6q-1036_mfg_defconfig
@@ -2,7 +2,7 @@ CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=4096"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y

-CONFIG_TARGET_TX6Q_1036=y
+CONFIG_TARGET_TX6Q_EMMC=y

 CONFIG_TX6_UBOOT_MFG=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_TX6_UBOOT_MFG=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y

diff --git a/configs/tx6q-1036_noenv_defconfig b/configs/tx6q-1036_noenv_defconfig
index bc6dd53a4130df19439147fa2bf17bb0544e619b..aba1798f0abada712ee837336e5258ee9fea1bbb 100644 (file)
--- a/configs/tx6q-1036_noenv_defconfig
+++ b/configs/tx6q-1036_noenv_defconfig
@@ -2,7 +2,7 @@ CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=4096"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y

-CONFIG_TARGET_TX6Q_1036=y
+CONFIG_TARGET_TX6Q_EMMC=y

 CONFIG_TX6_UBOOT_NOENV=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_TX6_UBOOT_NOENV=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y

diff --git a/configs/tx6q-1036_sec_defconfig b/configs/tx6q-1036_sec_defconfig
index 7a775a965f24b3d40b68a2eaae1634b75d651932..1cca243860a64c19e01ef4243ace9477716fa21f 100644 (file)
--- a/configs/tx6q-1036_sec_defconfig
+++ b/configs/tx6q-1036_sec_defconfig
@@ -2,7 +2,7 @@ CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=4096,SECURE_BOOT"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y

-CONFIG_TARGET_TX6Q_1036=y
+CONFIG_TARGET_TX6Q_EMMC=y

 CONFIG_TX6_UBOOT=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_TX6_UBOOT=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y

diff --git a/configs/tx6q-10x0_defconfig b/configs/tx6q-10x0_defconfig
index fb4dc15cf88e60935f2dab4f739ada9a8ed27e99..6e1514c1ec90ff4037fe4ad5a8f12f0ba97c9662 100644 (file)
--- a/configs/tx6q-10x0_defconfig
+++ b/configs/tx6q-10x0_defconfig
@@ -1,7 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y

-CONFIG_TARGET_TX6Q_10X0=y
+CONFIG_TARGET_TX6Q_NAND=y

 CONFIG_TX6_UBOOT=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_TX6_UBOOT=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y

diff --git a/configs/tx6q-10x0_mfg_defconfig b/configs/tx6q-10x0_mfg_defconfig
index 97e06350d016bde17edf71139ff91d3cfd2c634f..a8b1b289003748f23fd8aad0e1e8707ce6457274 100644 (file)
--- a/configs/tx6q-10x0_mfg_defconfig
+++ b/configs/tx6q-10x0_mfg_defconfig
@@ -1,7 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y

-CONFIG_TARGET_TX6Q_10X0=y
+CONFIG_TARGET_TX6Q_NAND=y

 CONFIG_TX6_UBOOT_MFG=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_TX6_UBOOT_MFG=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y

diff --git a/configs/tx6q-10x0_noenv_defconfig b/configs/tx6q-10x0_noenv_defconfig
index 5b63d3a059e3d6efcb91593bc5cbd4b19960cec4..e9e090c8a2860af6ed124a9892018da9676b546d 100644 (file)
--- a/configs/tx6q-10x0_noenv_defconfig
+++ b/configs/tx6q-10x0_noenv_defconfig
@@ -1,7 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y

-CONFIG_TARGET_TX6Q_10X0=y
+CONFIG_TARGET_TX6Q_NAND=y

 CONFIG_TX6_UBOOT_NOENV=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_TX6_UBOOT_NOENV=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y

diff --git a/configs/tx6q-10x0_sec_defconfig b/configs/tx6q-10x0_sec_defconfig
index cd2db4b85c702659670a779312b0eecdbfc0ff37..ac64560047e69ef8512003f66e0b87f2751f7066 100644 (file)
--- a/configs/tx6q-10x0_sec_defconfig
+++ b/configs/tx6q-10x0_sec_defconfig
@@ -2,7 +2,7 @@ CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y

-CONFIG_TARGET_TX6Q_10X0=y
+CONFIG_TARGET_TX6Q_NAND=y

 CONFIG_TX6_UBOOT=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_TX6_UBOOT=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y

diff --git a/configs/tx6q-11x0_defconfig b/configs/tx6q-11x0_defconfig
index 4856a32cec2fc20e4fafb1633db53f5f8bc909f4..16862b726d5b8ce532f2e4375f3fbc1fc110d74c 100644 (file)
--- a/configs/tx6q-11x0_defconfig
+++ b/configs/tx6q-11x0_defconfig
@@ -2,7 +2,7 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_LVDS_IF"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y

-CONFIG_TARGET_TX6Q_11X0=y
+CONFIG_TARGET_TX6Q_NAND=y

 CONFIG_TX6_UBOOT=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_TX6_UBOOT=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y

diff --git a/configs/tx6q-11x0_mfg_defconfig b/configs/tx6q-11x0_mfg_defconfig
index 25d7b101d01f2faae5286845e0965bfec770dd74..fcb47dcffbff2da46991ae56a941497a0372c077 100644 (file)
--- a/configs/tx6q-11x0_mfg_defconfig
+++ b/configs/tx6q-11x0_mfg_defconfig
@@ -2,7 +2,7 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_LVDS_IF"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y

-CONFIG_TARGET_TX6Q_11X0=y
+CONFIG_TARGET_TX6Q_NAND=y

 CONFIG_TX6_UBOOT_MFG=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_TX6_UBOOT_MFG=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y

diff --git a/configs/tx6q-11x0_noenv_defconfig b/configs/tx6q-11x0_noenv_defconfig
index 50d1be5c3666a8b5c5676ef149c46c078f4f404f..ee3cfe2e280bb9d04aad373ae2b481e81396f607 100644 (file)
--- a/configs/tx6q-11x0_noenv_defconfig
+++ b/configs/tx6q-11x0_noenv_defconfig
@@ -2,7 +2,7 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_LVDS_IF"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y

-CONFIG_TARGET_TX6Q_11X0=y
+CONFIG_TARGET_TX6Q_NAND=y

 CONFIG_TX6_UBOOT_NOENV=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_TX6_UBOOT_NOENV=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y

diff --git a/configs/tx6q-11x0_sec_defconfig b/configs/tx6q-11x0_sec_defconfig
index 4a0a117720487ab053516fa6ade0a10aa866e74c..3744f9a78e95fff00090ee5347518d15ee0a9b52 100644 (file)
--- a/configs/tx6q-11x0_sec_defconfig
+++ b/configs/tx6q-11x0_sec_defconfig
@@ -2,7 +2,7 @@ CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT,SYS_LVDS_IF"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y

-CONFIG_TARGET_TX6Q_11X0=y
+CONFIG_TARGET_TX6Q_NAND=y

 CONFIG_TX6_UBOOT=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_TX6_UBOOT=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y

diff --git a/configs/tx6qp-8037_defconfig b/configs/tx6qp-8037_defconfig
index 8f2947b164a011ac2e51ab9516ea291a27446af4..046d2b98934b31d3aa12eb88ef9b290c7b232972 100644 (file)
--- a/configs/tx6qp-8037_defconfig
+++ b/configs/tx6qp-8037_defconfig
@@ -2,7 +2,7 @@ CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y

-CONFIG_TARGET_TX6QP_8037=y
+CONFIG_TARGET_TX6QP_EMMC=y

 CONFIG_TX6_UBOOT=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_TX6_UBOOT=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y

diff --git a/configs/tx6qp-8037_mfg_defconfig b/configs/tx6qp-8037_mfg_defconfig
index dd26543e10ece6fc0e2d55dc0f7424b5ff576244..1fa3366d260dc88f5ae9322b093bb81906f94764 100644 (file)
--- a/configs/tx6qp-8037_mfg_defconfig
+++ b/configs/tx6qp-8037_mfg_defconfig
@@ -2,7 +2,7 @@ CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y

-CONFIG_TARGET_TX6QP_8037=y
+CONFIG_TARGET_TX6QP_EMMC=y

 CONFIG_TX6_UBOOT_MFG=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_TX6_UBOOT_MFG=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y

diff --git a/configs/tx6qp-8037_noenv_defconfig b/configs/tx6qp-8037_noenv_defconfig
index d363bb4e653b361697fcebdb4a630184a323a5eb..cf1e7d5a93e9dafd46092323741bee3883f93372 100644 (file)
--- a/configs/tx6qp-8037_noenv_defconfig
+++ b/configs/tx6qp-8037_noenv_defconfig
@@ -2,7 +2,7 @@ CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y

-CONFIG_TARGET_TX6QP_8037=y
+CONFIG_TARGET_TX6QP_EMMC=y

 CONFIG_TX6_UBOOT_NOENV=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_TX6_UBOOT_NOENV=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y

diff --git a/configs/tx6qp-8037_sec_defconfig b/configs/tx6qp-8037_sec_defconfig
index 70b9d7c4033c991191dd1645631f6dc86967fe69..88820f616ce9c46c4722d9f4a870dc05ee69ca5d 100644 (file)
--- a/configs/tx6qp-8037_sec_defconfig
+++ b/configs/tx6qp-8037_sec_defconfig
@@ -2,7 +2,7 @@ CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024,SECURE_BOOT"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y

-CONFIG_TARGET_TX6QP_8037=y
+CONFIG_TARGET_TX6QP_EMMC=y

 CONFIG_TX6_UBOOT=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_TX6_UBOOT=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y

diff --git a/configs/tx6s-8034_defconfig b/configs/tx6s-8034_defconfig
index ff723a7831301b8d4baa55cd75bc838231ab4ff5..3c10572fe0e1816b8365ed212085120afe7064b2 100644 (file)
--- a/configs/tx6s-8034_defconfig
+++ b/configs/tx6s-8034_defconfig
@@ -2,7 +2,7 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_BUS_WIDTH=16"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y

-CONFIG_TARGET_TX6S_8034=y
+CONFIG_TARGET_TX6S_NAND=y

 CONFIG_TX6_UBOOT=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_TX6_UBOOT=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y

diff --git a/configs/tx6s-8034_mfg_defconfig b/configs/tx6s-8034_mfg_defconfig
index a639f137ad3e92e666649732429d158f62017ddd..08b04f048921c1bb2f04f15b0f93a019aad2c37d 100644 (file)
--- a/configs/tx6s-8034_mfg_defconfig
+++ b/configs/tx6s-8034_mfg_defconfig
@@ -2,7 +2,7 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_BUS_WIDTH=16"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y

-CONFIG_TARGET_TX6S_8034=y
+CONFIG_TARGET_TX6S_NAND=y

 CONFIG_TX6_UBOOT_MFG=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_TX6_UBOOT_MFG=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y

diff --git a/configs/tx6s-8034_noenv_defconfig b/configs/tx6s-8034_noenv_defconfig
index ed4e98d126908ecbee22a04b2ccfa8538928727e..0639684d8b8cb6d6e21537a99b4fe7fefbf242d9 100644 (file)
--- a/configs/tx6s-8034_noenv_defconfig
+++ b/configs/tx6s-8034_noenv_defconfig
@@ -2,7 +2,7 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_BUS_WIDTH=16"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y

-CONFIG_TARGET_TX6S_8034=y
+CONFIG_TARGET_TX6S_NAND=y

 CONFIG_TX6_UBOOT_NOENV=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_TX6_UBOOT_NOENV=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y

diff --git a/configs/tx6s-8034_sec_defconfig b/configs/tx6s-8034_sec_defconfig
index 4bdc10b75dafa892ac2e6f63f39a4976cd629406..b8cc8dde7734af95f6d1d426057044d10c0b2364 100644 (file)
--- a/configs/tx6s-8034_sec_defconfig
+++ b/configs/tx6s-8034_sec_defconfig
@@ -2,7 +2,7 @@ CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT,SYS_SDRAM_BUS_WIDTH=16"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y

-CONFIG_TARGET_TX6S_8034=y
+CONFIG_TARGET_TX6S_NAND=y

 CONFIG_TX6_UBOOT=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_TX6_UBOOT=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y

diff --git a/configs/tx6s-8035_defconfig b/configs/tx6s-8035_defconfig
index 86561489583a0c51ea698e976324e54e3c583896..fb477c41fc830a77fee2dbfd1eed78f70d86dd3b 100644 (file)
--- a/configs/tx6s-8035_defconfig
+++ b/configs/tx6s-8035_defconfig
@@ -2,7 +2,7 @@ CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024,SYS_SDRAM_BUS_WIDTH=32"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y

-CONFIG_TARGET_TX6S_8035=y
+CONFIG_TARGET_TX6S_EMMC=y

 CONFIG_TX6_UBOOT=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_TX6_UBOOT=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y

diff --git a/configs/tx6s-8035_mfg_defconfig b/configs/tx6s-8035_mfg_defconfig
index 1b2f6d65548a7693b53555b02dadb4991bc4e2c7..4fcbbea842e86987170873b406b9d78118058f39 100644 (file)
--- a/configs/tx6s-8035_mfg_defconfig
+++ b/configs/tx6s-8035_mfg_defconfig
@@ -2,7 +2,7 @@ CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024,SYS_SDRAM_BUS_WIDTH=32"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y

-CONFIG_TARGET_TX6S_8035=y
+CONFIG_TARGET_TX6S_EMMC=y

 CONFIG_TX6_UBOOT_MFG=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_TX6_UBOOT_MFG=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y

diff --git a/configs/tx6s-8035_noenv_defconfig b/configs/tx6s-8035_noenv_defconfig
index 52241abc5fc65d9ff4ccde6aeb25d5055915debb..6bd85a2abcdaeb5058dd6354a60cfd12832a6e02 100644 (file)
--- a/configs/tx6s-8035_noenv_defconfig
+++ b/configs/tx6s-8035_noenv_defconfig
@@ -2,7 +2,7 @@ CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024,SYS_SDRAM_BUS_WIDTH=32"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y

-CONFIG_TARGET_TX6S_8035=y
+CONFIG_TARGET_TX6S_EMMC=y

 CONFIG_TX6_UBOOT_NOENV=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_TX6_UBOOT_NOENV=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y

diff --git a/configs/tx6s-8035_sec_defconfig b/configs/tx6s-8035_sec_defconfig
index ea6e847df4233d50a3402ce367fc491e57972b27..f38d9b4e6df51348010a84f39b8fdae7b9952acd 100644 (file)
--- a/configs/tx6s-8035_sec_defconfig
+++ b/configs/tx6s-8035_sec_defconfig
@@ -2,7 +2,7 @@ CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024,SECURE_BOOT,SYS_SDRAM_BUS_WIDTH=32"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y

-CONFIG_TARGET_TX6S_8035=y
+CONFIG_TARGET_TX6S_EMMC=y

 CONFIG_TX6_UBOOT=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_TX6_UBOOT=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y

diff --git a/configs/tx6u-8012_defconfig b/configs/tx6u-8012_defconfig
index 7d0d775c2d03e40a1c261529ce2f1478b576891d..b8331e54bf1d903518c3c90104cff4e0bc9da0b8 100644 (file)
--- a/configs/tx6u-8012_defconfig
+++ b/configs/tx6u-8012_defconfig
@@ -2,7 +2,7 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_NAND_BLOCKS=2048,TX6_REV=0x1"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y

-CONFIG_TARGET_TX6U_8012=y
+CONFIG_TARGET_TX6U_NAND=y

 CONFIG_TX6_UBOOT=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_TX6_UBOOT=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y

diff --git a/configs/tx6u-8012_mfg_defconfig b/configs/tx6u-8012_mfg_defconfig
index 398d38d8a225d9dcec30371e86f5e8fc1d5538a1..40eb32e71bd5586b6fea240ce490dfc3116c7963 100644 (file)
--- a/configs/tx6u-8012_mfg_defconfig
+++ b/configs/tx6u-8012_mfg_defconfig
@@ -2,7 +2,7 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_NAND_BLOCKS=2048,TX6_REV=0x1"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y

-CONFIG_TARGET_TX6U_8012=y
+CONFIG_TARGET_TX6U_NAND=y

 CONFIG_TX6_UBOOT_MFG=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_TX6_UBOOT_MFG=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y

diff --git a/configs/tx6u-8012_noenv_defconfig b/configs/tx6u-8012_noenv_defconfig
index 78f1e7487d3f39b7fad6d1eea579e67c967ad6bf..d8956c66eab47a282fd3cb4aada37b5665097526 100644 (file)
--- a/configs/tx6u-8012_noenv_defconfig
+++ b/configs/tx6u-8012_noenv_defconfig
@@ -2,7 +2,7 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_NAND_BLOCKS=2048,TX6_REV=0x1"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y

-CONFIG_TARGET_TX6U_8012=y
+CONFIG_TARGET_TX6U_NAND=y

 CONFIG_TX6_UBOOT_NOENV=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_TX6_UBOOT_NOENV=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y

diff --git a/configs/tx6u-8012_sec_defconfig b/configs/tx6u-8012_sec_defconfig
index fadc106a5b93394e3286ec280b65fdb288b01edc..cb657e16120fa851b3f15f297adac5eccf3a23ed 100644 (file)
--- a/configs/tx6u-8012_sec_defconfig
+++ b/configs/tx6u-8012_sec_defconfig
@@ -2,7 +2,7 @@ CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT,SYS_NAND_BLOCKS=2048,TX6_REV=0x1"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y

-CONFIG_TARGET_TX6U_8012=y
+CONFIG_TARGET_TX6U_NAND=y

 CONFIG_TX6_UBOOT=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_TX6_UBOOT=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y

diff --git a/configs/tx6u-8033_defconfig b/configs/tx6u-8033_defconfig
index 0a08ec10a094355189f047dbb13dfcb82593b520..b9d7c16c8b4577b5dee88e4f8727d3561d46f1ac 100644 (file)
--- a/configs/tx6u-8033_defconfig
+++ b/configs/tx6u-8033_defconfig
@@ -2,7 +2,7 @@ CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y

-CONFIG_TARGET_TX6U_8033=y
+CONFIG_TARGET_TX6U_EMMC=y

 CONFIG_TX6_UBOOT=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_TX6_UBOOT=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y

diff --git a/configs/tx6u-8033_mfg_defconfig b/configs/tx6u-8033_mfg_defconfig
index f5104b085b9517d47632039a2875ba89f2f9de9c..d6323d41dde66d984d66b03d31bba7c1d9aee315 100644 (file)
--- a/configs/tx6u-8033_mfg_defconfig
+++ b/configs/tx6u-8033_mfg_defconfig
@@ -2,7 +2,7 @@ CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y

-CONFIG_TARGET_TX6U_8033=y
+CONFIG_TARGET_TX6U_EMMC=y

 CONFIG_TX6_UBOOT_MFG=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_TX6_UBOOT_MFG=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y

diff --git a/configs/tx6u-8033_noenv_defconfig b/configs/tx6u-8033_noenv_defconfig
index 10f957107f85302b97e3b4ebb521741353ab99d8..0fddb34915ee85ec0656265e9a2af915f108f290 100644 (file)
--- a/configs/tx6u-8033_noenv_defconfig
+++ b/configs/tx6u-8033_noenv_defconfig
@@ -2,7 +2,7 @@ CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y

-CONFIG_TARGET_TX6U_8033=y
+CONFIG_TARGET_TX6U_EMMC=y

 CONFIG_TX6_UBOOT_NOENV=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_TX6_UBOOT_NOENV=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y

diff --git a/configs/tx6u-8033_sec_defconfig b/configs/tx6u-8033_sec_defconfig
index 35de96e094c81261ef2c733d5426f1b5a81198e4..640284f971af9bc6af8753314432c15e72d5522f 100644 (file)
--- a/configs/tx6u-8033_sec_defconfig
+++ b/configs/tx6u-8033_sec_defconfig
@@ -2,7 +2,7 @@ CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024,SECURE_BOOT"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y

-CONFIG_TARGET_TX6U_8033=y
+CONFIG_TARGET_TX6U_EMMC=y

 CONFIG_TX6_UBOOT=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_TX6_UBOOT=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y

diff --git a/configs/tx6u-80x0_defconfig b/configs/tx6u-80x0_defconfig
index cd28f7b5999c1fee2b454abf8f148cdf659ce74d..8ef4f36f5fd7ea0b1e773f2196e249481f7e005b 100644 (file)
--- a/configs/tx6u-80x0_defconfig
+++ b/configs/tx6u-80x0_defconfig
@@ -1,7 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y

-CONFIG_TARGET_TX6U_80X0=y
+CONFIG_TARGET_TX6U_NAND=y

 CONFIG_TX6_UBOOT=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_TX6_UBOOT=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y

diff --git a/configs/tx6u-80x0_mfg_defconfig b/configs/tx6u-80x0_mfg_defconfig
index a0e422ebd503fe0b32ce2b8e1097991a67d87e6e..1634be62e7f24353b3d5a2746cebab1b8bab08c4 100644 (file)
--- a/configs/tx6u-80x0_mfg_defconfig
+++ b/configs/tx6u-80x0_mfg_defconfig
@@ -1,7 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y

-CONFIG_TARGET_TX6U_80X0=y
+CONFIG_TARGET_TX6U_NAND=y

 CONFIG_TX6_UBOOT_MFG=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_TX6_UBOOT_MFG=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y

diff --git a/configs/tx6u-80x0_noenv_defconfig b/configs/tx6u-80x0_noenv_defconfig
index 0b50a79e93dcf9f114151f2e2cb42313465c5d1a..f70c0fbf65e2004a1d3b6b12b2103f1d9fc24368 100644 (file)
--- a/configs/tx6u-80x0_noenv_defconfig
+++ b/configs/tx6u-80x0_noenv_defconfig
@@ -1,7 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y

-CONFIG_TARGET_TX6U_80X0=y
+CONFIG_TARGET_TX6U_NAND=y

 CONFIG_TX6_UBOOT_NOENV=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_TX6_UBOOT_NOENV=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y

diff --git a/configs/tx6u-80x0_sec_defconfig b/configs/tx6u-80x0_sec_defconfig
index e045c555e929820b10c49db9a2ae1c6456094889..9ca5b74a6c962e129b6ba7af0bfbf502498531eb 100644 (file)
--- a/configs/tx6u-80x0_sec_defconfig
+++ b/configs/tx6u-80x0_sec_defconfig
@@ -2,7 +2,7 @@ CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y

-CONFIG_TARGET_TX6U_80X0=y
+CONFIG_TARGET_TX6U_NAND=y

 CONFIG_TX6_UBOOT=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_TX6_UBOOT=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y

diff --git a/configs/tx6u-81x0_defconfig b/configs/tx6u-81x0_defconfig
index bdc74287fa657f9cdcdf3e1c7d57967b191302ab..97ad112b7decbb5295a25b8979c1bf4bf50a6946 100644 (file)
--- a/configs/tx6u-81x0_defconfig
+++ b/configs/tx6u-81x0_defconfig
@@ -2,7 +2,7 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_LVDS_IF"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y

-CONFIG_TARGET_TX6U_81X0=y
+CONFIG_TARGET_TX6U_NAND=y

 CONFIG_TX6_UBOOT=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_TX6_UBOOT=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y

diff --git a/configs/tx6u-81x0_mfg_defconfig b/configs/tx6u-81x0_mfg_defconfig
index c0e8e5f7c20e85735db1676aa5d62071e2da19e2..7a6d7aae50f81ae34caa3bb95a2ca28a7dfaa8b1 100644 (file)
--- a/configs/tx6u-81x0_mfg_defconfig
+++ b/configs/tx6u-81x0_mfg_defconfig
@@ -2,7 +2,7 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_LVDS_IF"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y

-CONFIG_TARGET_TX6U_81X0=y
+CONFIG_TARGET_TX6U_NAND=y

 CONFIG_TX6_UBOOT_MFG=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_TX6_UBOOT_MFG=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y

diff --git a/configs/tx6u-81x0_noenv_defconfig b/configs/tx6u-81x0_noenv_defconfig
index 357face9bf5935284e0b144df78b8175ab8b54e1..55df71d5d21f5276c2cde56deb4ed7209b488f7e 100644 (file)
--- a/configs/tx6u-81x0_noenv_defconfig
+++ b/configs/tx6u-81x0_noenv_defconfig
@@ -2,7 +2,7 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_LVDS_IF"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y

-CONFIG_TARGET_TX6U_81X0=y
+CONFIG_TARGET_TX6U_NAND=y

 CONFIG_TX6_UBOOT_NOENV=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_TX6_UBOOT_NOENV=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y

diff --git a/configs/tx6u-81x0_sec_defconfig b/configs/tx6u-81x0_sec_defconfig
index c1988c2c0630a4101edc4bd10da764a85c98c22a..7e9114bf0d78e5accc211ac21058da99ba6f9c77 100644 (file)
--- a/configs/tx6u-81x0_sec_defconfig
+++ b/configs/tx6u-81x0_sec_defconfig
@@ -2,7 +2,7 @@ CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT,SYS_LVDS_IF"
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y
 CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_TX6=y

-CONFIG_TARGET_TX6U_81X0=y
+CONFIG_TARGET_TX6U_NAND=y

 CONFIG_TX6_UBOOT=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_TX6_UBOOT=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y

diff --git a/configs/tx6ul-0010_defconfig b/configs/tx6ul-0010_defconfig
index b03ffb1f74b9cd90c9e983ef9b0dec56d8f89951..b0390d71678b106b2312eed9ada26d26957aa455 100644 (file)
--- a/configs/tx6ul-0010_defconfig
+++ b/configs/tx6ul-0010_defconfig
@@ -2,7 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_SOC_MX6UL=y
 CONFIG_TARGET_TX6=y
 CONFIG_ARCH_MX6=y
 CONFIG_SOC_MX6UL=y
 CONFIG_TARGET_TX6=y

-CONFIG_TARGET_TX6UL_0010=y
+CONFIG_TARGET_TX6UL_NAND=y

 CONFIG_TX6_UBOOT=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_TX6_UBOOT=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y

diff --git a/configs/tx6ul-0010_mfg_defconfig b/configs/tx6ul-0010_mfg_defconfig
index 988e3eead236a20feab7d58e961473b09bebc164..3857bb7b4d2c3367ba46d7eac3177a4e161260a2 100644 (file)
--- a/configs/tx6ul-0010_mfg_defconfig
+++ b/configs/tx6ul-0010_mfg_defconfig
@@ -2,7 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_SOC_MX6UL=y
 CONFIG_TARGET_TX6=y
 CONFIG_ARCH_MX6=y
 CONFIG_SOC_MX6UL=y
 CONFIG_TARGET_TX6=y

-CONFIG_TARGET_TX6UL_0010=y
+CONFIG_TARGET_TX6UL_NAND=y

 CONFIG_TX6_UBOOT_MFG=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_TX6_UBOOT_MFG=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y

diff --git a/configs/tx6ul-0010_noenv_defconfig b/configs/tx6ul-0010_noenv_defconfig
index 5d523058a3be5223270bf98835f995d68880a546..d9edfedca3522057adfe39e52a2612af0b9e676f 100644 (file)
--- a/configs/tx6ul-0010_noenv_defconfig
+++ b/configs/tx6ul-0010_noenv_defconfig
@@ -2,7 +2,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_SOC_MX6UL=y
 CONFIG_TARGET_TX6=y
 CONFIG_ARCH_MX6=y
 CONFIG_SOC_MX6UL=y
 CONFIG_TARGET_TX6=y

-CONFIG_TARGET_TX6UL_0010=y
+CONFIG_TARGET_TX6UL_NAND=y

 CONFIG_TX6_UBOOT_NOENV=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_TX6_UBOOT_NOENV=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y

diff --git a/configs/tx6ul-0010_sec_defconfig b/configs/tx6ul-0010_sec_defconfig
index 27d8df05473f190c3e500dcb228e5c4029d6ea39..83ce789598b7f9080e1bb25c2020113ab42de6f1 100644 (file)
--- a/configs/tx6ul-0010_sec_defconfig
+++ b/configs/tx6ul-0010_sec_defconfig
@@ -3,7 +3,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_SOC_MX6UL=y
 CONFIG_TARGET_TX6=y
 CONFIG_ARCH_MX6=y
 CONFIG_SOC_MX6UL=y
 CONFIG_TARGET_TX6=y

-CONFIG_TARGET_TX6UL_0010=y
+CONFIG_TARGET_TX6UL_NAND=y

 CONFIG_TX6_UBOOT=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_TX6_UBOOT=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y

diff --git a/configs/tx6ul-0011_defconfig b/configs/tx6ul-0011_defconfig
index 34fc697696bea4edd0501e90a1ad4b2e5683ad5c..478dcd4f145846d7971562d445381cef8196a85a 100644 (file)
--- a/configs/tx6ul-0011_defconfig
+++ b/configs/tx6ul-0011_defconfig
@@ -3,7 +3,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_SOC_MX6UL=y
 CONFIG_TARGET_TX6=y
 CONFIG_ARCH_MX6=y
 CONFIG_SOC_MX6UL=y
 CONFIG_TARGET_TX6=y

-CONFIG_TARGET_TX6UL_0011=y
+CONFIG_TARGET_TX6UL_EMMC=y

 CONFIG_TX6_UBOOT=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_TX6_UBOOT=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y

diff --git a/configs/tx6ul-0011_mfg_defconfig b/configs/tx6ul-0011_mfg_defconfig
index 6c9b3c14b0e873327a883a7df5d524ceaf233a08..db2e47b32b87277fe754cf43797424b68833eb8e 100644 (file)
--- a/configs/tx6ul-0011_mfg_defconfig
+++ b/configs/tx6ul-0011_mfg_defconfig
@@ -3,7 +3,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_SOC_MX6UL=y
 CONFIG_TARGET_TX6=y
 CONFIG_ARCH_MX6=y
 CONFIG_SOC_MX6UL=y
 CONFIG_TARGET_TX6=y

-CONFIG_TARGET_TX6UL_0011=y
+CONFIG_TARGET_TX6UL_EMMC=y

 CONFIG_TX6_UBOOT_MFG=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_TX6_UBOOT_MFG=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y

diff --git a/configs/tx6ul-0011_noenv_defconfig b/configs/tx6ul-0011_noenv_defconfig
index dac05c9f31e12a36b9fadb29cb0250b3c2541efa..9fcebbc5e4e21f1049f22b57c93ef320860a2d9d 100644 (file)
--- a/configs/tx6ul-0011_noenv_defconfig
+++ b/configs/tx6ul-0011_noenv_defconfig
@@ -3,7 +3,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_SOC_MX6UL=y
 CONFIG_TARGET_TX6=y
 CONFIG_ARCH_MX6=y
 CONFIG_SOC_MX6UL=y
 CONFIG_TARGET_TX6=y

-CONFIG_TARGET_TX6UL_0011=y
+CONFIG_TARGET_TX6UL_EMMC=y

 CONFIG_TX6_UBOOT_NOENV=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_TX6_UBOOT_NOENV=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y

diff --git a/configs/tx6ul-0011_sec_defconfig b/configs/tx6ul-0011_sec_defconfig
index 63f41541307461495d2f9459f39385c6154830aa..6c9f9f7e0f6da6e1a9d2a775d8fa2642492de526 100644 (file)
--- a/configs/tx6ul-0011_sec_defconfig
+++ b/configs/tx6ul-0011_sec_defconfig
@@ -3,7 +3,7 @@ CONFIG_ARM=y
 CONFIG_ARCH_MX6=y
 CONFIG_SOC_MX6UL=y
 CONFIG_TARGET_TX6=y
 CONFIG_ARCH_MX6=y
 CONFIG_SOC_MX6UL=y
 CONFIG_TARGET_TX6=y

-CONFIG_TARGET_TX6UL_0011=y
+CONFIG_TARGET_TX6UL_EMMC=y

 CONFIG_TX6_UBOOT=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_TX6_UBOOT=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y