X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=board%2Fkaro%2Ftx6%2FKconfig;h=11218913477c22ad2ea1a61c3e5449d055e4b4d1;hb=8122bb73a48d5c2e376c43c1d5b703516ea944dd;hp=c61f91afec699d3cbe47c68dded88367bc1db3c6;hpb=8f02caac64980faa73b2bf00462b400c86257d04;p=karo-tx-uboot.git

diff --git a/board/karo/tx6/Kconfig b/board/karo/tx6/Kconfig
index c61f91afec..1121891347 100644
--- 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,55 @@ 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_I2C
+	select SYS_I2C_SOFT
+	select SYS_SDRAM_BUS_WIDTH_16
+
+config TX6QP
+	bool
+
 #
 # variables selected depending on module variant
 #
@@ -86,68 +73,67 @@ config SYS_SDRAM_BUS_WIDTH_16
 config SYS_SDRAM_BUS_WIDTH_32
 	bool
 
+config SYS_SDRAM_CHIP_SIZE
+	int "SDRAM chip size in MiB"
 
 choice
 	prompt "TX6 module variant"
 
-config TARGET_TX6Q_10X0
-	bool "TX6Q-1010 and TX6Q-1030"
-	select MX6Q
+config TARGET_TX6Q_NAND
+	bool "TX6Q modules with NAND flash (TX6Q-1030/TX6Q-1130)"
+	select SOC_MX6Q
+	select SYS_I2C
+	select SYS_I2C_MXC
 
-config TARGET_TX6Q_1020
-	bool "TX6Q-1020"
-	select MX6Q
+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 TX6_REV_2
-
-config TARGET_TX6Q_11X0
-	bool "TX6Q-1110 and TX6Q-1130"
-	select MX6Q
-	select SYS_LVDS_IF
-	
-config TARGET_TX6S_8034
-	bool "TX6S-8034"
-	select MX6S
-	select SYS_SDRAM_BUS_WIDTH_16
 
-config TARGET_TX6S_8035
-	bool "TX6S-8035"
-	select MX6S
+config TARGET_TX6S_NAND
+	bool "TX6S modules with NAND flash (TX6S-8034/TX6S-8134)"
+	select SOC_MX6S
+	select SYS_I2C
+	select SYS_I2C_MXC
+
+config TARGET_TX6S_EMMC
+	bool "TX6S modules with eMMC (TX6S-8035/TX6S-8135)"
+	select SOC_MX6S
+	select SYS_I2C
+	select SYS_I2C_MXC
+	select TX6_EMMC
+
+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_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_TX6UL_NAND
+	bool "TXUL (i.MX6UL) modules with NAND flash (TXUL-5010)"
+	select TX6UL
+
+config TARGET_TX6UL_EMMC
+	bool "TXUL (i.MX6UL) modules with eMMC (TXUL-5011)"
+	select TX6UL
 	select TX6_EMMC
-	select SYS_SDRAM_BUS_WIDTH_32
-
-config TARGET_TX6U_8010
-	bool "TX6U-8010 and TX6U-8030"
-	select MX6DL
-
-config TARGET_TX6U_8011
-	bool "TX6U-8011"
-	select MX6DL
-	select SYS_SDRAM_BUS_WIDTH_32
-	select TX6_REV_1
-
-config TARGET_TX6U_8012
-	bool "TX6U-8012"
-	select MX6DL
-	select TX6_REV_1
-
-config TARGET_TX6U_81X0
-	bool "TX6U-8110 and TX6U-8130"
-	select MX6DL
-	select SYS_LVDS_IF
-
-config TARGET_TX6U_8111
-	bool "TX6U-8111"
-	select MX6DL
-	select SYS_SDRAM_BUS_WIDTH_32
-	select SYS_LVDS_IF
-	select TX6_REV_1
-
-config TARGET_TX6U_8033
-	bool "TX6U-8033"
-	select MX6DL
+
+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 TX6_EMMC
-	select TX6_REV_3
+	select TX6QP
 
 endchoice
 
@@ -163,6 +149,7 @@ config TX6_UBOOT_MFG
 
 config TX6_UBOOT_NOENV
 	bool "U-Boot using only built-in environment"
+	select UBOOT_IGNORE_ENV
 
 endchoice