X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=board%2Fkaro%2Ftx6%2FKconfig;h=03a412e3f748643f1e7c1aa2cf6b1abd44b250f1;hb=3054d43b45eff6d66e4e11341c94a01f67765905;hp=11218913477c22ad2ea1a61c3e5449d055e4b4d1;hpb=13a3e2ee237f515af5738c07aaf604db9b54be34;p=karo-tx-uboot.git

diff --git a/board/karo/tx6/Kconfig b/board/karo/tx6/Kconfig
index 1121891347..03a412e3f7 100644
--- a/board/karo/tx6/Kconfig
+++ b/board/karo/tx6/Kconfig
@@ -51,12 +51,14 @@ config TX6_EMMC
 	select MMC
 	select SUPPORT_EMMC_BOOT
 
-config TX6UL
+config BOARD_TX6UL
 	bool
-	select SOC_MX6UL
 	select SYS_I2C
 	select SYS_I2C_SOFT
 	select SYS_SDRAM_BUS_WIDTH_16
+	help
+	  Common settings for TX6UL with i.MX6UL and i.MX6ULL.
+	  Selected by TARGET_TX6UL_EMMC or TARGET_TX6UL_NAND.
 
 config TX6QP
 	bool
@@ -86,7 +88,7 @@ config TARGET_TX6Q_NAND
 	select SYS_I2C_MXC
 
 config TARGET_TX6Q_EMMC
-	bool "TX6Q modules with eMMC (TX6Q-1020/TX6Q-1036)"
+	bool "TX6Q modules with eMMC (TX6Q-1036)"
 	select SOC_MX6Q
 	select SYS_I2C
 	select SYS_I2C_MXC
@@ -120,11 +122,11 @@ config TARGET_TX6U_EMMC
 
 config TARGET_TX6UL_NAND
 	bool "TXUL (i.MX6UL) modules with NAND flash (TXUL-5010)"
-	select TX6UL
+	select BOARD_TX6UL
 
 config TARGET_TX6UL_EMMC
 	bool "TXUL (i.MX6UL) modules with eMMC (TXUL-5011)"
-	select TX6UL
+	select BOARD_TX6UL
 	select TX6_EMMC
 
 config TARGET_TX6QP_EMMC
@@ -137,6 +139,23 @@ config TARGET_TX6QP_EMMC
 
 endchoice
 
+if BOARD_TX6UL
+
+choice
+	prompt "TX6UL SOC variant"
+
+config TX6UL
+	bool "i.MX6UL"
+	select SOC_MX6UL
+
+config TX6ULL
+	bool "i.MX6ULL"
+	select SOC_MX6ULL
+
+endchoice
+
+endif
+
 choice
 	prompt "U-Boot image variant"
 	default TX6_UBOOT