karo: cleanup after merge of v2015.10-rc2

[karo-tx-uboot.git] / configs / tx48_defconfig

diff --git a/configs/tx48_defconfig b/configs/tx48_defconfig
index 9105d2a36a212f904e63139ad1f910c4160d7a9d..bab5178485641051f5323976f368bb3c0da4c83a 100644 (file)
--- a/configs/tx48_defconfig
+++ b/configs/tx48_defconfig
@@ -1,7 +1,7 @@
 CONFIG_SYS_EXTRA_OPTIONS="SYS_MPU_CLK=720,SYS_DDR_CLK=400"
-+S:CONFIG_ARM=y
-+S:CONFIG_TARGET_TX48=y
-+S:CONFIG_TX48_UBOOT=y
+CONFIG_ARM=y
+CONFIG_TARGET_TX48=y
+CONFIG_TX48_UBOOT=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_BOOTP_SUBNETMASK=y
@@ -17,17 +17,18 @@ CONFIG_CMD_NAND=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_ROMUPDATE=y
 CONFIG_CMD_TIME=y
-+S:CONFIG_DOS_PARTITION=y
+CONFIG_DOS_PARTITION=y
 CONFIG_DM=y
 CONFIG_ENV_IS_IN_NAND=y
-S:CONFIG_ENV_IS_NOWHERE=y
 CONFIG_LCD=y
 CONFIG_MTD_DEVICE=y
 CONFIG_MTD_PARTITIONS=y
-+S:CONFIG_NAND=y
-+S:CONFIG_NAND_OMAP_GPMC=y
+CONFIG_NAND=y
+CONFIG_NAND_OMAP_GPMC=y
 CONFIG_NET=y
 CONFIG_NETDEVICES=y
 CONFIG_OF_LIBFDT=y
 CONFIG_OF_BOARD_SETUP=y
+CONFIG_OMAP_HSMMC=y
 CONFIG_PHY_SMSC=y
+CONFIG_SYS_PROMPT="TX48 U-Boot > "