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

[u-boot] / configs / ts4600_defconfig

diff --git a/configs/ts4600_defconfig b/configs/ts4600_defconfig
index 40e20c48afba55855cc7fcd79defe07c94d1b6ea..91af6ce9cdcb5a98c4ab8d5cb8688645c655c385 100644 (file)
--- a/configs/ts4600_defconfig
+++ b/configs/ts4600_defconfig
@@ -1,20 +1,25 @@
 CONFIG_ARM=y
-CONFIG_TARGET_TS4600=y
+CONFIG_ARCH_MX28=y
+CONFIG_SYS_TEXT_BASE=0x40002000
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
+CONFIG_TARGET_TS4600=y
+CONFIG_SPL=y
 CONFIG_FIT=y
-CONFIG_SYS_EXTRA_OPTIONS="ENV_IS_IN_MMC"
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 # CONFIG_DISPLAY_CPUINFO is not set
-CONFIG_SPL=y
+CONFIG_ARCH_MISC_INIT=y
+CONFIG_BOARD_EARLY_INIT_F=y
+# CONFIG_SPL_FRAMEWORK is not set
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
-# CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 CONFIG_CMD_MMC=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
+CONFIG_ENV_IS_IN_MMC=y
 CONFIG_MMC_MXS=y
+CONFIG_CONS_INDEX=0
 CONFIG_OF_LIBFDT=y