Merge branch 'next' of git://git.denx.de/u-boot-video

[u-boot] / configs / spear300_nand_defconfig

diff --git a/configs/spear300_nand_defconfig b/configs/spear300_nand_defconfig
index 4694ca9f5f9e1e2b2468343c9ab079501aafc42d..0fa4bb6e34dad271174b0a2d6e957ac3474be05a 100644 (file)
--- a/configs/spear300_nand_defconfig
+++ b/configs/spear300_nand_defconfig
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_TARGET_SPEAR300=y
+CONFIG_SYS_TEXT_BASE=0x00700000
 CONFIG_IDENT_STRING="-SPEAr"
 CONFIG_SYS_EXTRA_OPTIONS="SPEAR300"
 CONFIG_BOOTDELAY=1
@@ -7,6 +8,8 @@ CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="console=ttyAMA0,115200 mem=128M root=/dev/mtdblock7 rootfstype=jffs2"
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 # CONFIG_DISPLAY_BOARDINFO is not set
+# CONFIG_AUTO_COMPLETE is not set
+CONFIG_CMD_IMLS=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_NAND=y
 # CONFIG_CMD_SETEXPR is not set