Merge tag 'dm-pull-30may20' of https://gitlab.denx.de/u-boot/custodians/u-boot-dm

[J-u-boot.git] / configs / apf27_defconfig

diff --git a/configs/apf27_defconfig b/configs/apf27_defconfig
index caf3c7bf569a35a18a8f8e27121470afa4d47884..73a53047244da401184a2c75f29b7c4ec180f4ef 100644 (file)
--- a/configs/apf27_defconfig
+++ b/configs/apf27_defconfig
@@ -2,11 +2,12 @@ CONFIG_ARM=y
 # CONFIG_SPL_USE_ARCH_MEMCPY is not set
 CONFIG_TARGET_APF27=y
 CONFIG_SYS_TEXT_BASE=0xA0000800
-CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_ENV_SIZE=0x20000
 CONFIG_ENV_OFFSET=0x100000
+CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_SPL=y
+CONFIG_ENV_OFFSET_REDUND=0x180000
 CONFIG_IDENT_STRING=" apf27 patch 3.10"
 CONFIG_SPL_TEXT_BASE=0xA0000000
 CONFIG_ENV_VARS_UBOOT_CONFIG=y
@@ -42,15 +43,14 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=mxc_nand.0:1M(u-boot)ro,512K(env),512K(env2),5
 CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
-CONFIG_ENV_OFFSET_REDUND=0x180000
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_FPGA_XILINX=y
 CONFIG_FPGA_SPARTAN3=y
 CONFIG_MXC_GPIO=y
 CONFIG_MMC_MXC=y
+CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 CONFIG_NAND_MXC=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
 CONFIG_MII=y
 CONFIG_OF_LIBFDT=y
-CONFIG_MTD=y