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

[u-boot] / configs / r7780mp_defconfig

diff --git a/configs/r7780mp_defconfig b/configs/r7780mp_defconfig
index e4b8fb4bd8d1cd1894cf581643ab96e77b9b25fb..60271d37e297f77109d1fa6aa1283d3f8ce44101 100644 (file)
--- a/configs/r7780mp_defconfig
+++ b/configs/r7780mp_defconfig
@@ -1,19 +1,19 @@
 CONFIG_SH=y
+CONFIG_SYS_TEXT_BASE=0x0FFC0000
 CONFIG_TARGET_R7780MP=y
-CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_BOOTDELAY=3
 CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="console=ttySC0,115200"
+# CONFIG_CMDLINE_EDITING is not set
+# CONFIG_AUTO_COMPLETE is not set
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_CONSOLE is not set
 # CONFIG_CMD_BOOTD is not set
 # CONFIG_CMD_RUN is not set
 # CONFIG_CMD_IMI is not set
-# CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_XIMG is not set
 # CONFIG_CMD_EDITENV is not set
 # CONFIG_CMD_ENV_EXISTS is not set
-# CONFIG_CMD_FPGA is not set
 CONFIG_CMD_IDE=y
 # CONFIG_CMD_LOADB is not set
 # CONFIG_CMD_LOADS is not set
@@ -27,6 +27,7 @@ CONFIG_CMD_PING=y
 # CONFIG_CMD_MISC is not set
 CONFIG_CMD_EXT2=y
 CONFIG_DOS_PARTITION=y
+CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_PCI=y
 CONFIG_SCIF_CONSOLE=y