Merge tag 'u-boot-imx-20200623' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx

[oweals/u-boot.git] / configs / mx31pdk_defconfig

diff --git a/configs/mx31pdk_defconfig b/configs/mx31pdk_defconfig
index 5245938a34c0c108387c9d1f54072c8c49fac5c5..c53c23a363b367b52dca739f40e073506ff2a733 100644 (file)
--- a/configs/mx31pdk_defconfig
+++ b/configs/mx31pdk_defconfig
@@ -2,14 +2,16 @@ CONFIG_ARM=y
 # CONFIG_SPL_USE_ARCH_MEMCPY is not set
 # CONFIG_SPL_USE_ARCH_MEMSET is not set
 CONFIG_ARCH_MX31=y
+CONFIG_SPL_LDSCRIPT="arch/arm/cpu/u-boot-spl.lds"
 CONFIG_SYS_TEXT_BASE=0x87e00000
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
-CONFIG_TARGET_MX31PDK=y
-CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_ENV_SIZE=0x20000
 CONFIG_ENV_OFFSET=0x40000
+CONFIG_TARGET_MX31PDK=y
+CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_NR_DRAM_BANKS=1
 CONFIG_SPL=y
+CONFIG_ENV_OFFSET_REDUND=0x60000
 CONFIG_SPL_TEXT_BASE=0x87dc0000
 # CONFIG_SPL_FRAMEWORK is not set
 CONFIG_SPL_NAND_SUPPORT=y
@@ -25,7 +27,6 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
-CONFIG_ENV_OFFSET_REDUND=0x60000
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_MXC_GPIO=y
 # CONFIG_MMC is not set