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

[people/ms/u-boot.git] / configs / zipitz2_defconfig

diff --git a/configs/zipitz2_defconfig b/configs/zipitz2_defconfig
index d9819a570db8caeec105909b88bd60a51dcf9b6e..584657995477da8ea06265235cc0a671043a0098 100644 (file)
--- a/configs/zipitz2_defconfig
+++ b/configs/zipitz2_defconfig
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_ZIPITZ2=y
+# CONFIG_CONSOLE_MUX is not set
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="$ "
@@ -13,7 +14,9 @@ CONFIG_CMD_USB=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_PXA_SERIAL=y
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y
+CONFIG_LCD=y
 CONFIG_OF_LIBFDT=y
 # CONFIG_EFI_LOADER is not set