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

[u-boot] / configs / integratorap_cm946es_defconfig

diff --git a/configs/integratorap_cm946es_defconfig b/configs/integratorap_cm946es_defconfig
index 32aba7714b86b3f85f4e4e050931ac9281a2b2e0..d7ac44189de9522a4e2ec8b358caaeb37db0cd42 100644 (file)
--- a/configs/integratorap_cm946es_defconfig
+++ b/configs/integratorap_cm946es_defconfig
@@ -8,6 +8,8 @@ CONFIG_BOOTARGS="root=/dev/mtdblock0 console=ttyAM0 console=tty"
 # CONFIG_DISPLAY_CPUINFO 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="Integrator-AP # "
 CONFIG_CMD_IMLS=y
 CONFIG_CMD_ARMFLASH=y