From feded177815d23fe83aba5da532d86c438805b4b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Lothar=20Wa=C3=9Fmann?= Date: Fri, 1 Jul 2016 13:30:48 +0200 Subject: [PATCH] karo: tx6: introduce generic TARGET_EMMC/TARGET_NAND to simplify Kconfig --- board/karo/tx6/Kconfig | 80 +++++++----------------------- configs/tx6q-1020_defconfig | 2 +- configs/tx6q-1020_mfg_defconfig | 2 +- configs/tx6q-1020_noenv_defconfig | 2 +- configs/tx6q-1020_sec_defconfig | 2 +- configs/tx6q-1036_defconfig | 2 +- configs/tx6q-1036_mfg_defconfig | 2 +- configs/tx6q-1036_noenv_defconfig | 2 +- configs/tx6q-1036_sec_defconfig | 2 +- configs/tx6q-10x0_defconfig | 2 +- configs/tx6q-10x0_mfg_defconfig | 2 +- configs/tx6q-10x0_noenv_defconfig | 2 +- configs/tx6q-10x0_sec_defconfig | 2 +- configs/tx6q-11x0_defconfig | 2 +- configs/tx6q-11x0_mfg_defconfig | 2 +- configs/tx6q-11x0_noenv_defconfig | 2 +- configs/tx6q-11x0_sec_defconfig | 2 +- configs/tx6qp-8037_defconfig | 2 +- configs/tx6qp-8037_mfg_defconfig | 2 +- configs/tx6qp-8037_noenv_defconfig | 2 +- configs/tx6qp-8037_sec_defconfig | 2 +- configs/tx6s-8034_defconfig | 2 +- configs/tx6s-8034_mfg_defconfig | 2 +- configs/tx6s-8034_noenv_defconfig | 2 +- configs/tx6s-8034_sec_defconfig | 2 +- configs/tx6s-8035_defconfig | 2 +- configs/tx6s-8035_mfg_defconfig | 2 +- configs/tx6s-8035_noenv_defconfig | 2 +- configs/tx6s-8035_sec_defconfig | 2 +- configs/tx6u-8012_defconfig | 2 +- configs/tx6u-8012_mfg_defconfig | 2 +- configs/tx6u-8012_noenv_defconfig | 2 +- configs/tx6u-8012_sec_defconfig | 2 +- configs/tx6u-8033_defconfig | 2 +- configs/tx6u-8033_mfg_defconfig | 2 +- configs/tx6u-8033_noenv_defconfig | 2 +- configs/tx6u-8033_sec_defconfig | 2 +- configs/tx6u-80x0_defconfig | 2 +- configs/tx6u-80x0_mfg_defconfig | 2 +- configs/tx6u-80x0_noenv_defconfig | 2 +- configs/tx6u-80x0_sec_defconfig | 2 +- configs/tx6u-81x0_defconfig | 2 +- configs/tx6u-81x0_mfg_defconfig | 2 +- configs/tx6u-81x0_noenv_defconfig | 2 +- configs/tx6u-81x0_sec_defconfig | 2 +- configs/tx6ul-0010_defconfig | 2 +- configs/tx6ul-0010_mfg_defconfig | 2 +- configs/tx6ul-0010_noenv_defconfig | 2 +- configs/tx6ul-0010_sec_defconfig | 2 +- configs/tx6ul-0011_defconfig | 2 +- configs/tx6ul-0011_mfg_defconfig | 2 +- configs/tx6ul-0011_noenv_defconfig | 2 +- configs/tx6ul-0011_sec_defconfig | 2 +- 53 files changed, 70 insertions(+), 114 deletions(-) diff --git a/board/karo/tx6/Kconfig b/board/karo/tx6/Kconfig index fbf1d2ad6f..c01fbd5e82 100644 --- a/board/karo/tx6/Kconfig +++ b/board/karo/tx6/Kconfig @@ -77,100 +77,56 @@ config SYS_SDRAM_CHIP_SIZE 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 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 -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 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 SYS_SDRAM_BUS_WIDTH_32 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 -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 -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 -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 -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 diff --git a/configs/tx6q-1020_defconfig b/configs/tx6q-1020_defconfig index b8567d93a9..a3684da920 100644 --- 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_TARGET_TX6Q_1020=y +CONFIG_TARGET_TX6Q_EMMC=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 92513b5db4..eab82df7f2 100644 --- 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_TARGET_TX6Q_1020=y +CONFIG_TARGET_TX6Q_EMMC=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 c60060a4a1..c8a841a38b 100644 --- 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_TARGET_TX6Q_1020=y +CONFIG_TARGET_TX6Q_EMMC=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 c55066a03d..e35c396f5f 100644 --- 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_TARGET_TX6Q_1020=y +CONFIG_TARGET_TX6Q_EMMC=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 cce4940040..d4e3865cad 100644 --- 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_TARGET_TX6Q_1036=y +CONFIG_TARGET_TX6Q_EMMC=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 b44e41c040..772bb77612 100644 --- 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_TARGET_TX6Q_1036=y +CONFIG_TARGET_TX6Q_EMMC=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 bc6dd53a41..aba1798f0a 100644 --- 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_TARGET_TX6Q_1036=y +CONFIG_TARGET_TX6Q_EMMC=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 7a775a965f..1cca243860 100644 --- 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_TARGET_TX6Q_1036=y +CONFIG_TARGET_TX6Q_EMMC=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 fb4dc15cf8..6e1514c1ec 100644 --- 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_TARGET_TX6Q_10X0=y +CONFIG_TARGET_TX6Q_NAND=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 97e06350d0..a8b1b28900 100644 --- 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_TARGET_TX6Q_10X0=y +CONFIG_TARGET_TX6Q_NAND=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 5b63d3a059..e9e090c8a2 100644 --- 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_TARGET_TX6Q_10X0=y +CONFIG_TARGET_TX6Q_NAND=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 cd2db4b85c..ac64560047 100644 --- 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_TARGET_TX6Q_10X0=y +CONFIG_TARGET_TX6Q_NAND=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 4856a32cec..16862b726d 100644 --- 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_TARGET_TX6Q_11X0=y +CONFIG_TARGET_TX6Q_NAND=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 25d7b101d0..fcb47dcffb 100644 --- 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_TARGET_TX6Q_11X0=y +CONFIG_TARGET_TX6Q_NAND=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 50d1be5c36..ee3cfe2e28 100644 --- 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_TARGET_TX6Q_11X0=y +CONFIG_TARGET_TX6Q_NAND=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 4a0a117720..3744f9a78e 100644 --- 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_TARGET_TX6Q_11X0=y +CONFIG_TARGET_TX6Q_NAND=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 8f2947b164..046d2b9893 100644 --- 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_TARGET_TX6QP_8037=y +CONFIG_TARGET_TX6QP_EMMC=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 dd26543e10..1fa3366d26 100644 --- 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_TARGET_TX6QP_8037=y +CONFIG_TARGET_TX6QP_EMMC=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 d363bb4e65..cf1e7d5a93 100644 --- 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_TARGET_TX6QP_8037=y +CONFIG_TARGET_TX6QP_EMMC=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 70b9d7c403..88820f616c 100644 --- 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_TARGET_TX6QP_8037=y +CONFIG_TARGET_TX6QP_EMMC=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 ff723a7831..3c10572fe0 100644 --- 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_TARGET_TX6S_8034=y +CONFIG_TARGET_TX6S_NAND=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 a639f137ad..08b04f0489 100644 --- 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_TARGET_TX6S_8034=y +CONFIG_TARGET_TX6S_NAND=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 ed4e98d126..0639684d8b 100644 --- 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_TARGET_TX6S_8034=y +CONFIG_TARGET_TX6S_NAND=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 4bdc10b75d..b8cc8dde77 100644 --- 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_TARGET_TX6S_8034=y +CONFIG_TARGET_TX6S_NAND=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 8656148958..fb477c41fc 100644 --- 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_TARGET_TX6S_8035=y +CONFIG_TARGET_TX6S_EMMC=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 1b2f6d6554..4fcbbea842 100644 --- 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_TARGET_TX6S_8035=y +CONFIG_TARGET_TX6S_EMMC=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 52241abc5f..6bd85a2abc 100644 --- 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_TARGET_TX6S_8035=y +CONFIG_TARGET_TX6S_EMMC=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 ea6e847df4..f38d9b4e6d 100644 --- 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_TARGET_TX6S_8035=y +CONFIG_TARGET_TX6S_EMMC=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 7d0d775c2d..b8331e54bf 100644 --- 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_TARGET_TX6U_8012=y +CONFIG_TARGET_TX6U_NAND=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 398d38d8a2..40eb32e71b 100644 --- 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_TARGET_TX6U_8012=y +CONFIG_TARGET_TX6U_NAND=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 78f1e7487d..d8956c66ea 100644 --- 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_TARGET_TX6U_8012=y +CONFIG_TARGET_TX6U_NAND=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 fadc106a5b..cb657e1612 100644 --- 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_TARGET_TX6U_8012=y +CONFIG_TARGET_TX6U_NAND=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 0a08ec10a0..b9d7c16c8b 100644 --- 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_TARGET_TX6U_8033=y +CONFIG_TARGET_TX6U_EMMC=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 f5104b085b..d6323d41dd 100644 --- 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_TARGET_TX6U_8033=y +CONFIG_TARGET_TX6U_EMMC=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 10f957107f..0fddb34915 100644 --- 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_TARGET_TX6U_8033=y +CONFIG_TARGET_TX6U_EMMC=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 35de96e094..640284f971 100644 --- 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_TARGET_TX6U_8033=y +CONFIG_TARGET_TX6U_EMMC=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 cd28f7b599..8ef4f36f5f 100644 --- 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_TARGET_TX6U_80X0=y +CONFIG_TARGET_TX6U_NAND=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 a0e422ebd5..1634be62e7 100644 --- 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_TARGET_TX6U_80X0=y +CONFIG_TARGET_TX6U_NAND=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 0b50a79e93..f70c0fbf65 100644 --- 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_TARGET_TX6U_80X0=y +CONFIG_TARGET_TX6U_NAND=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 e045c555e9..9ca5b74a6c 100644 --- 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_TARGET_TX6U_80X0=y +CONFIG_TARGET_TX6U_NAND=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 bdc74287fa..97ad112b7d 100644 --- 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_TARGET_TX6U_81X0=y +CONFIG_TARGET_TX6U_NAND=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 c0e8e5f7c2..7a6d7aae50 100644 --- 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_TARGET_TX6U_81X0=y +CONFIG_TARGET_TX6U_NAND=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 357face9bf..55df71d5d2 100644 --- 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_TARGET_TX6U_81X0=y +CONFIG_TARGET_TX6U_NAND=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 c1988c2c06..7e9114bf0d 100644 --- 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_TARGET_TX6U_81X0=y +CONFIG_TARGET_TX6U_NAND=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 b03ffb1f74..b0390d7167 100644 --- 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_TARGET_TX6UL_0010=y +CONFIG_TARGET_TX6UL_NAND=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 988e3eead2..3857bb7b4d 100644 --- 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_TARGET_TX6UL_0010=y +CONFIG_TARGET_TX6UL_NAND=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 5d523058a3..d9edfedca3 100644 --- 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_TARGET_TX6UL_0010=y +CONFIG_TARGET_TX6UL_NAND=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 27d8df0547..83ce789598 100644 --- 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_TARGET_TX6UL_0010=y +CONFIG_TARGET_TX6UL_NAND=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 34fc697696..478dcd4f14 100644 --- 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_TARGET_TX6UL_0011=y +CONFIG_TARGET_TX6UL_EMMC=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 6c9b3c14b0..db2e47b32b 100644 --- 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_TARGET_TX6UL_0011=y +CONFIG_TARGET_TX6UL_EMMC=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 dac05c9f31..9fcebbc5e4 100644 --- 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_TARGET_TX6UL_0011=y +CONFIG_TARGET_TX6UL_EMMC=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 63f4154130..6c9f9f7e0f 100644 --- 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_TARGET_TX6UL_0011=y +CONFIG_TARGET_TX6UL_EMMC=y CONFIG_TX6_UBOOT=y CONFIG_BOOTP_DNS=y CONFIG_BOOTP_GATEWAY=y -- 2.39.2