Merge branch 'tx53-bugfix'

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

diff --git a/configs/tx28-40x2_noenv_defconfig b/configs/tx28-40x2_noenv_defconfig
index fa90e4d0b7f4b0cff7882b07764f624c45fb5f2e..2c61b12bf66565942de0d18f4d13e24859054be6 100644 (file)
--- a/configs/tx28-40x2_noenv_defconfig
+++ b/configs/tx28-40x2_noenv_defconfig
@@ -1,8 +1,9 @@
-CONFIG_SYS_EXTRA_OPTIONS=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_SYS_EXTRA_OPTIONS="CONS_INDEX=0,SYS_SDRAM_SIZE=SZ_256M"
+CONFIG_ARM=y
+CONFIG_ARCH_MXS=y
+CONFIG_TARGET_TX28=y
+CONFIG_TARGET_TX28_40X1=y
+CONFIG_TX28_UBOOT_NOENV=y
 CONFIG_BOOTP_DNS=y
 CONFIG_BOOTP_GATEWAY=y
 CONFIG_BOOTP_SUBNETMASK=y
@@ -12,26 +13,18 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_MEMINFO=y
+CONFIG_CMD_MII=y
 CONFIG_CMD_MMC=y
 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
-+S:CONFIG_ENV_IS_NOWHERE=y
+CONFIG_DOS_PARTITION=y
+CONFIG_ENV_IS_IN_NAND=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 > "