Merge git://git.denx.de/u-boot-fsl-qoriq

[people/ms/u-boot.git] / configs / sh7785lcr_defconfig

diff --git a/configs/sh7785lcr_defconfig b/configs/sh7785lcr_defconfig
index a7b4171005838fa3cfbda67d54636aa992c0991e..8c8c2881402e593b0c041bf6d6dd57956a675efb 100644 (file)
--- a/configs/sh7785lcr_defconfig
+++ b/configs/sh7785lcr_defconfig
@@ -1,6 +1,5 @@
 CONFIG_SH=y
 CONFIG_TARGET_SH7785LCR=y
-CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_BOOTDELAY=3
 CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="console=ttySC1,115200 root=/dev/nfs ip=dhcp"
@@ -9,7 +8,6 @@ CONFIG_VERSION_VARIABLE=y
 # CONFIG_CMD_CONSOLE is not set
 # CONFIG_CMD_BOOTD 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
@@ -28,6 +26,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_MAC_PARTITION=y
+CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_PCI=y
 CONFIG_SCIF_CONSOLE=y