Merge branch 'rmobile' of git://git.denx.de/u-boot-sh

[u-boot] / configs / ts4600_defconfig

diff --git a/configs/ts4600_defconfig b/configs/ts4600_defconfig
index 209aa0850efc45dc82d5664d19084ea278f54759..c155425d344b2a6c1902137f69af1aa3b068bd84 100644 (file)
--- a/configs/ts4600_defconfig
+++ b/configs/ts4600_defconfig
@@ -3,12 +3,12 @@ CONFIG_TARGET_TS4600=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_FIT=y
-CONFIG_SYS_EXTRA_OPTIONS="ENV_IS_IN_MMC"
+CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 # CONFIG_DISPLAY_CPUINFO is not set
+CONFIG_ARCH_MISC_INIT=y
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_SPL=y
-CONFIG_ARCH_MISC_INIT=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set