karo: tx6: replace open coded interpretation of cpurev by calls to is_cpu_type()

[karo-tx-uboot.git] / board / karo / tx6 / Kconfig

diff --git a/board/karo/tx6/Kconfig b/board/karo/tx6/Kconfig
index c61f91afec699d3cbe47c68dded88367bc1db3c6..51898a379e02e76ed4d205d3f1c1eee1145cefe9 100644 (file)
--- a/board/karo/tx6/Kconfig
+++ b/board/karo/tx6/Kconfig
@@ -1,27 +1,5 @@
 if TARGET_TX6
 
-config MX6
-       bool
-       default y
-
-config MX6Q
-       bool
-
-config MX6DL
-       bool
-
-config MX6QDL
-       bool
-
-config MX6S
-       bool
-
-config MX6SL
-       bool
-
-config MX6SX
-       bool
-
 config SYS_BOARD
        default "tx6"
 
@@ -34,46 +12,50 @@ config SYS_SOC
 config SYS_CONFIG_NAME
        default "tx6"
 
-config CMD_ROMUPDATE
-       bool
-
 config TX6
        bool
        default y
-       select MX6
-       select CMD_BMP if LCD
-       select CMD_BOOTCE
-       select CMD_BOOTZ
-       select CMD_CACHE
-       select CMD_I2C if I2C
-       select CMD_MEMTEST
-       select CMD_TIME
+       select APBH_DMA
+       select APBH_DMA_BURST
+       select APBH_DMA_BURST8
+       select CC_OPTIMIZE_LIBS_FOR_SPEED
        select DM
        select DM_GPIO
-       select SYS_I2C
-       select SYS_I2C_MXC
-       select GET_FEC_MAC_ADDR_FROM_IIM
+       select DM_THERMAL
+       select FSL_ESDHC if MMC
+       select FSL_USDHC if MMC
+       select IMX6_THERMAL
+       select LIB_RAND
+       select PHYLIB
+       select GET_FEC_MAC_ADDR_FROM_IIM if FEC_MXC
+       select MXC_OCOTP if CMD_FUSE
+       select OF_BOARD_SETUP
+       select OF_LIBFDT
 
 config TX6_NAND
        bool
        default ! TX6_EMMC
-       select CMD_NAND
-       select CMD_NAND_TRIMFFS
-       select CMD_MTDPARTS
+       select CMD_NAND_TRIMFFS if CMD_NAND
        select CMD_ROMUPDATE
-       select FDT_FIXUP_PARTITIONS if OF_LIBFDT
-       select MTD_PARTITIONS
-       select NAND_MXS_NO_BBM_SWAP if NAND_MXS
-       select SYS_NAND_USE_FLASH_BBT if NAND_MXS
-       select APBH_DMA
-       select APBH_DMA_BURST
-       select APBH_DMA_BURST8
+       select FDT_FIXUP_PARTITIONS
        select MTD_DEVICE
+       select MTD_PARTITIONS
+       select NAND
+       select NAND_MXS
+       select NAND_MXS_NO_BBM_SWAP
+       select SYS_NAND_USE_FLASH_BBT
 
 config TX6_EMMC
        bool
+       select CMD_MMC
+       select MMC
        select SUPPORT_EMMC_BOOT
 
+config TX6UL
+       bool
+       select SOC_MX6UL
+       select SYS_SDRAM_BUS_WIDTH_16
+
 #
 # variables selected depending on module variant
 #
@@ -86,68 +68,100 @@ config SYS_SDRAM_BUS_WIDTH_16
 config SYS_SDRAM_BUS_WIDTH_32
        bool
 
-
 choice
        prompt "TX6 module variant"
 
-config TARGET_TX6Q_10X0
-       bool "TX6Q-1010 and TX6Q-1030"
-       select MX6Q
-
 config TARGET_TX6Q_1020
        bool "TX6Q-1020"
-       select MX6Q
+       select SOC_MX6Q
+       select SYS_I2C
+       select SYS_I2C_MXC
        select TX6_EMMC
-       select TX6_REV_2
+
+config TARGET_TX6Q_1036
+       bool "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 MX6Q
+       select SOC_MX6Q
+       select SYS_I2C
+       select SYS_I2C_MXC
        select SYS_LVDS_IF
        
 config TARGET_TX6S_8034
        bool "TX6S-8034"
-       select MX6S
+       select SOC_MX6S
+       select SYS_I2C
+       select SYS_I2C_MXC
        select SYS_SDRAM_BUS_WIDTH_16
 
 config TARGET_TX6S_8035
        bool "TX6S-8035"
-       select MX6S
-       select TX6_EMMC
+       select SOC_MX6S
+       select SYS_I2C
+       select SYS_I2C_MXC
        select SYS_SDRAM_BUS_WIDTH_32
-
-config TARGET_TX6U_8010
-       bool "TX6U-8010 and TX6U-8030"
-       select MX6DL
+       select TX6_EMMC
 
 config TARGET_TX6U_8011
        bool "TX6U-8011"
-       select MX6DL
+       select SOC_MX6DL
+       select SYS_I2C
+       select SYS_I2C_MXC
        select SYS_SDRAM_BUS_WIDTH_32
-       select TX6_REV_1
 
 config TARGET_TX6U_8012
        bool "TX6U-8012"
-       select MX6DL
-       select TX6_REV_1
+       select SOC_MX6DL
+       select SYS_I2C
+       select SYS_I2C_MXC
 
-config TARGET_TX6U_81X0
-       bool "TX6U-8110 and TX6U-8130"
-       select MX6DL
-       select SYS_LVDS_IF
+config TARGET_TX6U_8033
+       bool "TX6U-8033"
+       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 MX6DL
+       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
-       select TX6_REV_1
 
-config TARGET_TX6U_8033
-       bool "TX6U-8033"
-       select MX6DL
+config TARGET_TX6UL_0010
+       bool "TX6U-0010"
+       select TX6UL
+
+config TARGET_TX6UL_0011
+       bool "TX6U-0011"
+       select TX6UL
        select TX6_EMMC
-       select TX6_REV_3
 
 endchoice
 
@@ -163,6 +177,7 @@ config TX6_UBOOT_MFG
 
 config TX6_UBOOT_NOENV
        bool "U-Boot using only built-in environment"
+       select UBOOT_IGNORE_ENV
 
 endchoice