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

[u-boot] / configs / at91sam9261ek_dataflash_cs0_defconfig

diff --git a/configs/at91sam9261ek_dataflash_cs0_defconfig b/configs/at91sam9261ek_dataflash_cs0_defconfig
index b2a46cb5412560ea24b47d318711852bbeae4192..15adf43c42cf7830cdfd0ac3440cb43c118f3b23 100644 (file)
--- a/configs/at91sam9261ek_dataflash_cs0_defconfig
+++ b/configs/at91sam9261ek_dataflash_cs0_defconfig
@@ -3,6 +3,8 @@ CONFIG_ARCH_AT91=y
 CONFIG_TARGET_AT91SAM9261EK=y
 CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9261,SYS_USE_DATAFLASH_CS0"
 CONFIG_BOOTDELAY=3
+# CONFIG_CONSOLE_MUX is not set
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_SYS_PROMPT="U-Boot> "
 # CONFIG_CMD_BDI is not set
@@ -16,6 +18,8 @@ CONFIG_CMD_USB=y
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_FAT=y
+# CONFIG_MMC is not set
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_LCD=y
 CONFIG_OF_LIBFDT=y