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

[u-boot] / configs / edb9315a_defconfig

diff --git a/configs/edb9315a_defconfig b/configs/edb9315a_defconfig
index ebcd0f5b1fe4424313c24e7db94b72da68181b48..b0e2622bab9880511b1696bff1aa1470c2d08c2f 100644 (file)
--- a/configs/edb9315a_defconfig
+++ b/configs/edb9315a_defconfig
@@ -1,17 +1,19 @@
 CONFIG_ARM=y
 CONFIG_TARGET_EDB93XX=y
+CONFIG_SYS_TEXT_BASE=0x60000000
 CONFIG_SYS_EXTRA_OPTIONS="MK_edb9315a"
-CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="root=/dev/nfs console=ttyAM0,115200 ip=dhcp"
 # CONFIG_DISPLAY_CPUINFO is not set
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_HUSH_PARSER=y
+# CONFIG_CMDLINE_EDITING is not set
+# CONFIG_AUTO_COMPLETE is not set
 CONFIG_SYS_PROMPT="EDB9315A> "
 CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_IMLS=y
 # CONFIG_CMD_XIMG is not set
-# CONFIG_CMD_FPGA is not set
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
@@ -20,6 +22,7 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_JFFS2=y
 # CONFIG_DOS_PARTITION is not set
+CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_LED_STATUS=y
 CONFIG_LED_STATUS0=y
 CONFIG_LED_STATUS_BIT=0
@@ -34,5 +37,6 @@ CONFIG_LED_STATUS_GREEN_ENABLE=y
 CONFIG_LED_STATUS_GREEN=0
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_CONS_INDEX=0
 CONFIG_USB=y
 CONFIG_USB_STORAGE=y