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

[u-boot] / configs / whistler_defconfig

diff --git a/configs/whistler_defconfig b/configs/whistler_defconfig
index 8c07c184a9cd84bd2f48d311ff8d58b14e8c381c..a818a0f2c500e7cce2c6116de0915f2af4aaf03f 100644 (file)
--- a/configs/whistler_defconfig
+++ b/configs/whistler_defconfig
@@ -1,4 +1,19 @@
-+S:CONFIG_ARM=y
-+S:CONFIG_TEGRA=y
-+S:CONFIG_TEGRA20=y
-+S:CONFIG_TARGET_WHISTLER=y
+CONFIG_ARM=y
+CONFIG_TEGRA=y
+CONFIG_SPL_DM=y
+CONFIG_TEGRA20=y
+CONFIG_TARGET_WHISTLER=y
+CONFIG_DEFAULT_DEVICE_TREE="tegra20-whistler"
+CONFIG_OF_SYSTEM_SETUP=y
+CONFIG_SYS_PROMPT="Tegra20 (Whistler) # "
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+CONFIG_CMD_GPIO=y
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_NFS is not set
+CONFIG_SYS_NS16550=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
+CONFIG_USE_PRIVATE_LIBGCC=y