karo: cleanup after merge of v2015.10-rc2

[karo-tx-uboot.git] / configs / tx6q-11x0_noenv_defconfig

diff --git a/configs/tx6q-11x0_noenv_defconfig b/configs/tx6q-11x0_noenv_defconfig
index 6068f63e9ae54e229ae21ecb19698d6333d52f39..cf3b034d4c9ec67a52ca7e08875f3a20931b965a 100644 (file)
--- a/configs/tx6q-11x0_noenv_defconfig
+++ b/configs/tx6q-11x0_noenv_defconfig
@@ -1,29 +1,35 @@
 CONFIG_SYS_EXTRA_OPTIONS="SYS_LVDS_IF"
 CONFIG_ARM=y
-CONFIG_SOC_MX6Q=y
 CONFIG_TARGET_TX6=y
 CONFIG_TARGET_TX6Q_11X0=y
 CONFIG_TX6_UBOOT_NOENV=y
-CONFIG_CMD_MII=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
 CONFIG_CMD_DHCP=y
+CONFIG_CMD_FUSE=y
+CONFIG_CMD_I2C=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_BOOTP_SUBNETMASK=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_DNS=y
-CONFIG_MMC=y
-CONFIG_FSL_ESDHC=y
-CONFIG_FSL_USDHC=y
+CONFIG_CMD_TIME=y
+CONFIG_DOS_PARTITION=y
+CONFIG_ENV_IS_IN_NAND=y
+CONFIG_FEC_MXC=y
+CONFIG_FEC_MXC_PHYADDR=0
+CONFIG_IMX_WATCHDOG=y
 CONFIG_LCD=y
+CONFIG_MMC=y
 CONFIG_NET=y
 CONFIG_NETDEVICES=y
-CONFIG_FEC_MXC=y
-CONFIG_IMX_WATCHDOG=y
-CONFIG_CMD_I2C=y
-CONFIG_NAND=y
-CONFIG_NAND_MXS=y
-CONFIG_DOS_PARTITION=y
-CONFIG_FEC_MXC_PHYADDR=0
-CONFIG_MXC_OCOTP=y
-CONFIG_CMD_FUSE=y
 CONFIG_PHY_SMSC=y
+CONFIG_SYS_PROMPT="TX6Q U-Boot > "