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

[u-boot] / configs / M5485BFE_defconfig

diff --git a/configs/M5485BFE_defconfig b/configs/M5485BFE_defconfig
index 490a8e791732ad7d1a858ce0c14131f87d3e3cee..6b4de534e8093cb4426288861f6a60e46bd24e4a 100644 (file)
--- a/configs/M5485BFE_defconfig
+++ b/configs/M5485BFE_defconfig
@@ -3,6 +3,8 @@ CONFIG_SYS_TEXT_BASE=0xFF800000
 CONFIG_TARGET_M5485EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_BUSCLK=100000000,SYS_BOOTSZ=2,SYS_DRAMSZ=64,SYS_NOR1SZ=16"
 CONFIG_BOOTDELAY=1
+# CONFIG_CMDLINE_EDITING is not set
+# CONFIG_AUTO_COMPLETE is not set
 CONFIG_SYS_PROMPT="-> "
 CONFIG_CMD_IMLS=y
 CONFIG_CMD_I2C=y