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

[u-boot] / configs / colibri_pxa270_defconfig

diff --git a/configs/colibri_pxa270_defconfig b/configs/colibri_pxa270_defconfig
index 7006e8a524b5beff463ff1be66028fe0dc65bcc3..2a2a82321ee0bfbf6a87b071f212af29e8b08374 100644 (file)
--- a/configs/colibri_pxa270_defconfig
+++ b/configs/colibri_pxa270_defconfig
@@ -1,7 +1,35 @@
 CONFIG_ARM=y
 CONFIG_TARGET_COLIBRI_PXA270=y
-# CONFIG_CMD_IMLS is not set
+CONFIG_SYS_TEXT_BASE=0x0
+CONFIG_ENV_VARS_UBOOT_CONFIG=y
+CONFIG_USE_BOOTARGS=y
+CONFIG_BOOTARGS="console=tty0 console=ttyS0,115200"
+# CONFIG_DISPLAY_BOARDINFO is not set
+CONFIG_DISPLAY_BOARDINFO_LATE=y
+# CONFIG_CMDLINE_EDITING is not set
+# CONFIG_AUTO_COMPLETE is not set
+# CONFIG_SYS_LONGHELP is not set
+CONFIG_SYS_PROMPT="$ "
+# CONFIG_CMD_ELF is not set
+# CONFIG_CMD_EXPORTENV is not set
+# CONFIG_CMD_IMPORTENV is not set
 # CONFIG_CMD_LOADB is not set
 # CONFIG_CMD_LOADS is not set
+CONFIG_CMD_MMC=y
+CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
+CONFIG_CMD_DHCP=y
+CONFIG_CMD_PING=y
+CONFIG_CMD_EXT2=y
+CONFIG_CMD_FAT=y
+CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
+CONFIG_DM=y
+CONFIG_MTD_NOR_FLASH=y
+CONFIG_DM_SERIAL=y
+CONFIG_PXA_SERIAL=y
+CONFIG_USB=y
+CONFIG_USB_STORAGE=y
+# CONFIG_REGEX is not set
 CONFIG_OF_LIBFDT=y
+# CONFIG_EFI_LOADER is not set