projects / u-boot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 304c45c)
MLK-18939 mx7ulp_evk: Fix mtest end address issue
authorYe Li <ye.li@nxp.com>
Fri, 27 Jul 2018 14:03:47 +0000 (07:03 -0700)
committerYe Li <ye.li@nxp.com>
Thu, 29 Apr 2021 07:56:04 +0000 (00:56 -0700)
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 <ye.li@nxp.com>
(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 patch | blob | history
configs/mx7ulp_evk_emmc_defconfig patch | blob | history
configs/mx7ulp_evk_m4boot_defconfig patch | blob | history
configs/mx7ulp_evk_plugin_defconfig patch | blob | history

diff --git a/configs/mx7ulp_evk_defconfig b/configs/mx7ulp_evk_defconfig
index 9641439..544564b 100644 (file)
--- 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 cd218ce..4d0e136 100644 (file)
--- 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 d30e1b0..52634fb 100644 (file)
--- 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 bc07e55..8c6d9dc 100644 (file)
--- 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