Merge branch 'master' of git://www.denx.de/git/u-boot-imx

[oweals/u-boot.git] / configs / tec-ng_defconfig

diff --git a/configs/tec-ng_defconfig b/configs/tec-ng_defconfig
index 7dbb4cd8d41076b2b417e6d9246178ae17d5fb6b..f830389e978d9122dc898a14235d33c9dbb3e84e 100644 (file)
--- a/configs/tec-ng_defconfig
+++ b/configs/tec-ng_defconfig
@@ -1,11 +1,12 @@
 CONFIG_ARM=y
 CONFIG_TEGRA=y
-CONFIG_SPL_DM=y
 CONFIG_TEGRA30=y
 CONFIG_TARGET_TEC_NG=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra30-tec-ng"
 CONFIG_FIT=y
 CONFIG_OF_SYSTEM_SETUP=y
+CONFIG_CONSOLE_MUX=y
+CONFIG_SYS_STDIO_DEREGISTER=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="Tegra30 (TEC-NG) # "
 CONFIG_CMD_BOOTZ=y
@@ -29,9 +30,13 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_SPL_DM=y
+# CONFIG_BLK is not set
+# CONFIG_DM_MMC_OPS is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_SYS_NS16550=y
 CONFIG_TEGRA20_SLINK=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
+CONFIG_USB_STORAGE=y