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 290c42e73e28239faa4f898ad904511d7a0cb438..b0e2622bab9880511b1696bff1aa1470c2d08c2f 100644 (file)
--- a/configs/edb9315a_defconfig
+++ b/configs/edb9315a_defconfig
@@ -8,6 +8,8 @@ CONFIG_BOOTARGS="root=/dev/nfs console=ttyAM0,115200 ip=dhcp"
 # 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
@@ -35,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