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

[u-boot] / configs / sh7757lcr_defconfig

diff --git a/configs/sh7757lcr_defconfig b/configs/sh7757lcr_defconfig
index 2fab7f7ab8f15fb78167ac8307ff9ce27922bcce..87d0a999220c0d59b5c8d514719c3afaf917221a 100644 (file)
--- a/configs/sh7757lcr_defconfig
+++ b/configs/sh7757lcr_defconfig
@@ -6,6 +6,8 @@ CONFIG_BOOTDELAY=3
 CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="console=ttySC2,115200 root=/dev/nfs ip=dhcp"
 CONFIG_VERSION_VARIABLE=y
+# 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
@@ -31,9 +33,12 @@ CONFIG_MAC_PARTITION=y
 CONFIG_DOS_PARTITION=y
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_MMC=y
+CONFIG_SH_MMCIF=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_NETDEVICES=y
 CONFIG_SH_ETHER=y
 CONFIG_SCIF_CONSOLE=y
+CONFIG_SPI=y
+CONFIG_SH_SPI=y
 CONFIG_USE_PRIVATE_LIBGCC=y