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

[u-boot] / configs / M54455EVB_defconfig

diff --git a/configs/M54455EVB_defconfig b/configs/M54455EVB_defconfig
index ce7af8a3c801f3f4729a8c32ddd35a3834859d0c..5620c4ec5473c5408b7b29267fb7c35938814eb1 100644 (file)
--- a/configs/M54455EVB_defconfig
+++ b/configs/M54455EVB_defconfig
@@ -1,10 +1,12 @@
 CONFIG_M68K=y
-CONFIG_SYS_TEXT_BASE=0x04000000
+CONFIG_SYS_TEXT_BASE=0x4000000
 CONFIG_TARGET_M54455EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_ATMEL_BOOT,SYS_INPUT_CLKSRC=33333333"
 CONFIG_BOOTDELAY=1
 CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="root=/dev/mtdblock1 rw rootfstype=jffs2 ip=none mtdparts=physmap-flash.0:5M(kernel)ro,-(jffs2)"
+# CONFIG_CMDLINE_EDITING is not set
+# CONFIG_AUTO_COMPLETE is not set
 CONFIG_SYS_PROMPT="-> "
 CONFIG_CMD_IMLS=y
 CONFIG_CMD_IDE=y
@@ -27,3 +29,5 @@ CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI=y
+CONFIG_CF_SPI=y