From 184cdd8bf9aacdfc0b7b95b219206202112b535e Mon Sep 17 00:00:00 2001 From: Ye Li Date: Mon, 9 Apr 2018 02:06:16 -0700 Subject: [PATCH] MLK-14606 mx7ulp: Modify ENV offset to 896K Since the u-boot size increases after using OF_CONTROL to including DTB, we have to adjust ENV_OFFSET to 896K for SD/eMMC/FLASH. Signed-off-by: Ye Li (cherry picked from commit 9d2df7407c58cd8b29fcbf57144e8ad9d8795207) (cherry picked from commit b2c8c63fe7eff0cd5aea875ddc94a2f70d42d6cd) (cherry picked from commit 43c66ac2138ec3414d2300ec82f7e65f5081b668) (cherry picked from commit fd53b1346dc1186ea6f4d28f14397e3303e4f8ff) --- configs/mx7ulp_evk_defconfig | 2 +- configs/mx7ulp_evk_emmc_defconfig | 2 +- configs/mx7ulp_evk_m4boot_defconfig | 2 +- configs/mx7ulp_evk_plugin_defconfig | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/mx7ulp_evk_defconfig b/configs/mx7ulp_evk_defconfig index a6666e06b0..9641439933 100644 --- a/configs/mx7ulp_evk_defconfig +++ b/configs/mx7ulp_evk_defconfig @@ -5,7 +5,7 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_SYS_MEMTEST_START=0x60000000 CONFIG_SYS_MEMTEST_END=0x9e000000 CONFIG_ENV_SIZE=0x2000 -CONFIG_ENV_OFFSET=0xC0000 +CONFIG_ENV_OFFSET=0xE0000 CONFIG_DM_GPIO=y CONFIG_TARGET_MX7ULP_EVK=y CONFIG_DEFAULT_DEVICE_TREE="imx7ulp-evk-qspi" diff --git a/configs/mx7ulp_evk_emmc_defconfig b/configs/mx7ulp_evk_emmc_defconfig index 463dd055f6..cd218ce99d 100644 --- a/configs/mx7ulp_evk_emmc_defconfig +++ b/configs/mx7ulp_evk_emmc_defconfig @@ -5,7 +5,7 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_SYS_MEMTEST_START=0x60000000 CONFIG_SYS_MEMTEST_END=0x9e000000 CONFIG_ENV_SIZE=0x2000 -CONFIG_ENV_OFFSET=0xC0000 +CONFIG_ENV_OFFSET=0xE0000 CONFIG_DM_GPIO=y CONFIG_TARGET_MX7ULP_EVK=y CONFIG_DEFAULT_DEVICE_TREE="imx7ulp-evk-emmc" diff --git a/configs/mx7ulp_evk_m4boot_defconfig b/configs/mx7ulp_evk_m4boot_defconfig index 13efda4ca0..d30e1b0496 100644 --- a/configs/mx7ulp_evk_m4boot_defconfig +++ b/configs/mx7ulp_evk_m4boot_defconfig @@ -5,7 +5,7 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_SYS_MEMTEST_START=0x60000000 CONFIG_SYS_MEMTEST_END=0x9e000000 CONFIG_ENV_SIZE=0x2000 -CONFIG_ENV_OFFSET=0xC0000 +CONFIG_ENV_OFFSET=0xE0000 CONFIG_DM_GPIO=y CONFIG_TARGET_MX7ULP_EVK=y CONFIG_DEFAULT_DEVICE_TREE="imx7ulp-evk-qspi" diff --git a/configs/mx7ulp_evk_plugin_defconfig b/configs/mx7ulp_evk_plugin_defconfig index 2eab6d1846..bc07e550c3 100644 --- a/configs/mx7ulp_evk_plugin_defconfig +++ b/configs/mx7ulp_evk_plugin_defconfig @@ -5,7 +5,7 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_SYS_MEMTEST_START=0x60000000 CONFIG_SYS_MEMTEST_END=0x9e000000 CONFIG_ENV_SIZE=0x2000 -CONFIG_ENV_OFFSET=0xC0000 +CONFIG_ENV_OFFSET=0xE0000 CONFIG_DM_GPIO=y CONFIG_TARGET_MX7ULP_EVK=y CONFIG_DEFAULT_DEVICE_TREE="imx7ulp-evk-qspi" -- 2.17.1