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

[u-boot] / configs / zipitz2_defconfig

diff --git a/configs/zipitz2_defconfig b/configs/zipitz2_defconfig
index 8d921a0bfe7728197a31f9e02bab72cf4c6ab0d3..935058a2b873bdd35df52c5db35615190e70eb78 100644 (file)
--- a/configs/zipitz2_defconfig
+++ b/configs/zipitz2_defconfig
@@ -1,2 +1,29 @@
 CONFIG_ARM=y
 CONFIG_TARGET_ZIPITZ2=y
+CONFIG_SYS_TEXT_BASE=0x0
+CONFIG_USE_BOOTARGS=y
+CONFIG_BOOTARGS="console=tty0 console=ttyS2,115200 fbcon=rotate:3"
+# CONFIG_CONSOLE_MUX is not set
+# CONFIG_DISPLAY_BOARDINFO is not set
+CONFIG_HUSH_PARSER=y
+# CONFIG_CMDLINE_EDITING is not set
+# CONFIG_AUTO_COMPLETE is not set
+CONFIG_SYS_PROMPT="$ "
+CONFIG_CMD_MMC=y
+CONFIG_CMD_SPI=y
+CONFIG_CMD_USB=y
+# CONFIG_CMD_SETEXPR is not set
+CONFIG_CMD_CACHE=y
+CONFIG_CMD_EXT2=y
+CONFIG_CMD_FAT=y
+CONFIG_ENV_IS_IN_FLASH=y
+# CONFIG_NET is not set
+CONFIG_MTD_NOR_FLASH=y
+CONFIG_CONS_INDEX=2
+CONFIG_PXA_SERIAL=y
+CONFIG_USB=y
+CONFIG_USB_STORAGE=y
+CONFIG_LCD=y
+CONFIG_LZMA=y
+CONFIG_OF_LIBFDT=y
+# CONFIG_EFI_LOADER is not set