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

[u-boot] / configs / r2dplus_defconfig

diff --git a/configs/r2dplus_defconfig b/configs/r2dplus_defconfig
index 9bd36dddd6322aa9ae2515e07bdbc30b12a82c12..b8b73c7fbd9f50310431b9b616317318f7c93218 100644 (file)
--- a/configs/r2dplus_defconfig
+++ b/configs/r2dplus_defconfig
@@ -1,9 +1,12 @@
 CONFIG_SH=y
+CONFIG_SYS_TEXT_BASE=0x8FE00000
 CONFIG_TARGET_R2DPLUS=y
-CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_BOOTDELAY=-1
 CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="console=ttySC0,115200"
+# CONFIG_CMDLINE_EDITING is not set
+# CONFIG_AUTO_COMPLETE is not set
+CONFIG_CMD_IMLS=y
 CONFIG_CMD_IDE=y
 CONFIG_CMD_PCI=y
 # CONFIG_CMD_SETEXPR is not set
@@ -11,6 +14,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT2=y
 CONFIG_DOS_PARTITION=y
+CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_NETDEVICES=y
 CONFIG_RTL8139=y