karo: cleanup after merge of v2015.10-rc2

[karo-tx-uboot.git] / configs / tx28-40x2_defconfig

diff --git a/configs/tx28-40x2_defconfig b/configs/tx28-40x2_defconfig
index f84c66ec627e5beb7b09142e1abe4d24d286d134..9eeefca52da378707f0988c671ccd77120ff462b 100644 (file)
--- a/configs/tx28-40x2_defconfig
+++ b/configs/tx28-40x2_defconfig
@@ -1,11 +1,12 @@
 CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=SZ_256M"
-+S:CONFIG_ARM=y
-+S:CONFIG_TARGET_TX28=y
-+S:CONFIG_TARGET_TX28_40X1=y
-+S:CONFIG_TX28_UBOOT=y
+CONFIG_ARM=y
+CONFIG_TARGET_TX28=y
+CONFIG_TARGET_TX28_40X1=y
+CONFIG_TX28_UBOOT=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_BOOTP_SUBNETMASK=y
+CONFIG_CMD_BMP=y
 CONFIG_CMD_BOOTCE=y
 CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_CACHE=y
@@ -18,21 +19,14 @@ CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_PING=y
+CONFIG_CMD_ROMUPDATE=y
 CONFIG_CMD_TIME=y
-+S:CONFIG_DOS_PARTITION=y
-CONFIG_DM=y
+CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
-S:CONFIG_ENV_IS_NOWHERE=y
 CONFIG_FEC_MXC=y
-CONFIG_GET_FEC_MAC_ADDR_FROM_IIM=y
 CONFIG_LCD=y
-CONFIG_MTD_DEVICE=y
-CONFIG_MTD_PARTITIONS=y
-CONFIG_MXS_MMC=y
-+S:CONFIG_NAND=y
-+S:CONFIG_NAND_MXS=y
+CONFIG_MMC=y
 CONFIG_NET=y
 CONFIG_NETDEVICES=y
-CONFIG_OF_LIBFDT=y
-CONFIG_OF_BOARD_SETUP=y
 CONFIG_PHY_SMSC=y
+CONFIG_SYS_PROMPT="TX28 U-Boot > "