karo: cleanup after merge of v2015.10-rc2

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

diff --git a/board/karo/tx28/Kconfig b/board/karo/tx28/Kconfig
index 7c18a451e8a073592c8d19b4aef9e2e953355b96..aad93e6079444aaa92b5ae4c0c472f78dd1f3a6a 100644 (file)
--- a/board/karo/tx28/Kconfig
+++ b/board/karo/tx28/Kconfig
@@ -15,50 +15,37 @@ config SYS_CONFIG_NAME
 config TX28
        bool
        default y
-       select SPL
        select SOC_MX28
+       select SPL
        select APBH_DMA
        select APBH_DMA_BURST
        select APBH_DMA_BURST8
        select CC_OPTIMIZE_LIBS_FOR_SPEED
-       select CMD_BMP if LCD
        select CMD_NAND_TRIMFFS if CMD_NAND
-       select CMD_ROMUPDATE if !SPL_BUILD
-       select FDT_FIXUP_PARTITIONS if OF_LIBFDT
+       select FDT_FIXUP_PARTITIONS
        select GET_FEC_MAC_ADDR_FROM_IIM if FEC_MXC
        select LIB_RAND
-       select MTD_PARTITIONS if CMD_NAND
-       select MTD_DEVICE if CMD_NAND
-       select SYS_NAND_USE_FLASH_BBT if NAND
-
-config TARGET_TX28_40X1_NOENV
-       bool
-       select TX28
+       select MTD_DEVICE
+       select MTD_PARTITIONS
+       select MXS_MMC if MMC
+       select NAND
+       select NAND_MXS
+       select OF_BOARD_SETUP
+       select OF_LIBFDT
+       select SYS_NAND_USE_FLASH_BBT
 
 config TARGET_TX28_40X2
        bool
        select TX28
 
-config TARGET_TX28_40X2_NOENV
-       bool
-       select TX28
-
 config TARGET_TX28_40X3
        bool
        select TX28
 
-config TARGET_TX28_40X3_NOENV
-       bool
-       select TX28
-
 config TARGET_TX28_41X0
        bool
        select TX28
 
-config TARGET_TX28_41X0_NOENV
-       bool
-       select TX28
-
 choice
        prompt "U-Boot image variant"
        default TX28_UBOOT
@@ -68,6 +55,7 @@ config TX28_UBOOT
 
 config TX28_UBOOT_NOENV
        bool "U-Boot using only built-in environment"
+       select UBOOT_IGNORE_ENV
 
 endchoice