From bc1cca1c3ce23e7e424398af6ba79fd23e4e0fef Mon Sep 17 00:00:00 2001 From: Ye Li Date: Fri, 27 Jul 2018 07:03:47 -0700 Subject: [PATCH] MLK-18939 mx7ulp_evk: Fix mtest end address issue When TEE is enabled, the high 32MB memory is reserved to TEE. So the mtest end address 0x9e000000 will overlay with u-boot runtime text and data. Fix the issue by changing the mtest end to half of DDR size. Signed-off-by: Ye Li (cherry picked from commit 9b56f22639703bd70bfdd1de0cbdcef2b80f0bff) (cherry picked from commit e9c1c97f64df33eaded9f78268782a246010928f) (cherry picked from commit 87e7df87b7818052a8c915a5eaeb468d22004383) (cherry picked from commit 149c3d17879749fd43935893130ccdb3530bc025) (cherry picked from commit 60aac7b7aed2d708c01c0fe2f41dc52daa587737) (cherry picked from commit 4ae5fb7f3c5c862107d814e107142eb2c39a8e19) --- 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 9641439933..544564b775 100644 --- a/configs/mx7ulp_evk_defconfig +++ b/configs/mx7ulp_evk_defconfig @@ -3,7 +3,7 @@ CONFIG_ARCH_MX7ULP=y CONFIG_SYS_TEXT_BASE=0x67800000 CONFIG_NR_DRAM_BANKS=1 CONFIG_SYS_MEMTEST_START=0x60000000 -CONFIG_SYS_MEMTEST_END=0x9e000000 +CONFIG_SYS_MEMTEST_END=0x80000000 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0xE0000 CONFIG_DM_GPIO=y diff --git a/configs/mx7ulp_evk_emmc_defconfig b/configs/mx7ulp_evk_emmc_defconfig index cd218ce99d..4d0e13699e 100644 --- a/configs/mx7ulp_evk_emmc_defconfig +++ b/configs/mx7ulp_evk_emmc_defconfig @@ -3,7 +3,7 @@ CONFIG_ARCH_MX7ULP=y CONFIG_SYS_TEXT_BASE=0x67800000 CONFIG_NR_DRAM_BANKS=1 CONFIG_SYS_MEMTEST_START=0x60000000 -CONFIG_SYS_MEMTEST_END=0x9e000000 +CONFIG_SYS_MEMTEST_END=0x80000000 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0xE0000 CONFIG_DM_GPIO=y diff --git a/configs/mx7ulp_evk_m4boot_defconfig b/configs/mx7ulp_evk_m4boot_defconfig index d30e1b0496..52634fbf68 100644 --- a/configs/mx7ulp_evk_m4boot_defconfig +++ b/configs/mx7ulp_evk_m4boot_defconfig @@ -3,7 +3,7 @@ CONFIG_ARCH_MX7ULP=y CONFIG_SYS_TEXT_BASE=0x67800000 CONFIG_NR_DRAM_BANKS=1 CONFIG_SYS_MEMTEST_START=0x60000000 -CONFIG_SYS_MEMTEST_END=0x9e000000 +CONFIG_SYS_MEMTEST_END=0x80000000 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0xE0000 CONFIG_DM_GPIO=y diff --git a/configs/mx7ulp_evk_plugin_defconfig b/configs/mx7ulp_evk_plugin_defconfig index bc07e550c3..8c6d9dcbe4 100644 --- a/configs/mx7ulp_evk_plugin_defconfig +++ b/configs/mx7ulp_evk_plugin_defconfig @@ -3,7 +3,7 @@ CONFIG_ARCH_MX7ULP=y CONFIG_SYS_TEXT_BASE=0x67800000 CONFIG_NR_DRAM_BANKS=1 CONFIG_SYS_MEMTEST_START=0x60000000 -CONFIG_SYS_MEMTEST_END=0x9e000000 +CONFIG_SYS_MEMTEST_END=0x80000000 CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0xE0000 CONFIG_DM_GPIO=y -- 2.17.1