Merge git://git.denx.de/u-boot-dm

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

diff --git a/configs/aristainetos_defconfig b/configs/aristainetos_defconfig
index fbe8269aa99c6e3ddb863b655767548792e26e6c..253202c62195271ec347e95d3a119caeaea616f6 100644 (file)
--- a/configs/aristainetos_defconfig
+++ b/configs/aristainetos_defconfig
@@ -4,7 +4,6 @@ CONFIG_TARGET_ARISTAINETOS=y
 CONFIG_VIDEO=y
 CONFIG_FIT=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/aristainetos/aristainetos.cfg,MX6DL"
-CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_BOOTDELAY=3
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
@@ -33,6 +32,7 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_CMD_UBI=y
+CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_MTD_UBI_FASTMAP=y