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

[oweals/u-boot.git] / configs / M54451EVB_defconfig

diff --git a/configs/M54451EVB_defconfig b/configs/M54451EVB_defconfig
index d184bca01174c17930e739a504010778d3c9c643..8448b6cfbf825e804d4fe5ae269382a4103b17f3 100644 (file)
--- a/configs/M54451EVB_defconfig
+++ b/configs/M54451EVB_defconfig
@@ -1,10 +1,12 @@
 CONFIG_M68K=y
-CONFIG_SYS_TEXT_BASE=0x00000000
+CONFIG_SYS_TEXT_BASE=0x0
 CONFIG_TARGET_M54451EVB=y
 CONFIG_SYS_EXTRA_OPTIONS="SYS_INPUT_CLKSRC=24000000"
 CONFIG_BOOTDELAY=1
 CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="root=/dev/mtdblock1 rw rootfstype=jffs2 ip=none mtdparts=physmap-flash.0:2M(kernel)ro,-(jffs2)"
+# CONFIG_CMDLINE_EDITING is not set
+# CONFIG_AUTO_COMPLETE is not set
 CONFIG_SYS_PROMPT="-> "
 CONFIG_CMD_IMLS=y
 CONFIG_CMD_I2C=y
@@ -20,5 +22,12 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_DATE=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
+CONFIG_SYS_FLASH_PROTECTION=y
+CONFIG_SYS_FLASH_CFI=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_MII=y
+CONFIG_SPI=y
+CONFIG_CF_SPI=y