Merge branch 'tx28-bugfix' into karo-devel

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

diff --git a/board/karo/tx28/Kconfig b/board/karo/tx28/Kconfig
index 896ee62d1bb2eaadc3e0d236de70890c50ec1d9f..f1dd7bbc4d245778bd73e05d2a45ba8c3c134f05 100644 (file)
--- a/board/karo/tx28/Kconfig
+++ b/board/karo/tx28/Kconfig
@@ -1,4 +1,4 @@
-if TARGET_TX28_40X1
+if TARGET_TX28
 
 config SYS_BOARD
        default "tx28"
@@ -10,118 +10,54 @@ config SYS_SOC
        default "mxs"
 
 config SYS_CONFIG_NAME
-       default "tx28-40x1"
-
-endif
-
-if TARGET_TX28_40X1_NOENV
-
-config SYS_BOARD
        default "tx28"
 
-config SYS_VENDOR
-       default "karo"
+config TX28
+       bool
+       default y
+       select SOC_MX28
+       select SPL
+       select APBH_DMA
+       select APBH_DMA_BURST
+       select APBH_DMA_BURST8
+       select CC_OPTIMIZE_LIBS_FOR_SPEED
+       select CMD_NAND_TRIMFFS if CMD_NAND
+       select FDT_FIXUP_PARTITIONS
+       select GET_FEC_MAC_ADDR_FROM_IIM if FEC_MXC
+       select LIB_RAND
+       select MTD_DEVICE
+       select MTD_PARTITIONS
+       select MXS_MMC if MMC
+       select NAND
+       select NAND_MXS
+       select OF_BOARD_SETUP
+       select OF_LIBFDT
+       select PHYLIB
+       select SYS_NAND_USE_FLASH_BBT
 
-config SYS_SOC
-       default "mxs"
+config TARGET_TX28_40X2
+       bool
+       select TX28
 
-config SYS_CONFIG_NAME
-       default "tx28-40x1_noenv"
+config TARGET_TX28_40X3
+       bool
+       select TX28
 
-endif
+config TARGET_TX28_41X0
+       bool
+       select TX28
 
-if TARGET_TX28_40X2
+choice
+       prompt "U-Boot image variant"
+       default TX28_UBOOT
 
-config SYS_BOARD
-       default "tx28"
-
-config SYS_VENDOR
-       default "karo"
-
-config SYS_SOC
-       default "mxs"
-
-config SYS_CONFIG_NAME
-       default "tx28-40x2"
-
-endif
+config TX28_UBOOT
+       bool "Standard U-Boot image"
 
-if TARGET_TX28_40X2_NOENV
+config TX28_UBOOT_NOENV
+       bool "U-Boot using only built-in environment"
+       select UBOOT_IGNORE_ENV
 
-config SYS_BOARD
-       default "tx28"
-
-config SYS_VENDOR
-       default "karo"
-
-config SYS_SOC
-       default "mxs"
-
-config SYS_CONFIG_NAME
-       default "tx28-40x2_noenv"
-
-endif
-
-if TARGET_TX28_40X3
-
-config SYS_BOARD
-       default "tx28"
-
-config SYS_VENDOR
-       default "karo"
-
-config SYS_SOC
-       default "mxs"
-
-config SYS_CONFIG_NAME
-       default "tx28-40x3"
-
-endif
-
-if TARGET_TX28_40X3_NOENV
-
-config SYS_BOARD
-       default "tx28"
-
-config SYS_VENDOR
-       default "karo"
-
-config SYS_SOC
-       default "mxs"
-
-config SYS_CONFIG_NAME
-       default "tx28-40x3_noenv"
-
-endif
-
-if TARGET_TX28_41X0
-
-config SYS_BOARD
-       default "tx28"
-
-config SYS_VENDOR
-       default "karo"
-
-config SYS_SOC
-       default "mxs"
-
-config SYS_CONFIG_NAME
-       default "tx28-41x0"
-
-endif
-
-if TARGET_TX28_41X0_NOENV
-
-config SYS_BOARD
-       default "tx28"
-
-config SYS_VENDOR
-       default "karo"
-
-config SYS_SOC
-       default "mxs"
-
-config SYS_CONFIG_NAME
-       default "tx28-41x0_noenv"
+endchoice
 
 endif