From 149c3d17879749fd43935893130ccdb3530bc025 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) --- include/configs/mx7ulp_evk.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/configs/mx7ulp_evk.h b/include/configs/mx7ulp_evk.h index 94537c548b..6fac043849 100644 --- a/include/configs/mx7ulp_evk.h +++ b/include/configs/mx7ulp_evk.h @@ -73,14 +73,14 @@ /* Physical Memory Map */ -#define PHYS_SDRAM 0x60000000 +#define PHYS_SDRAM 0x60000000ul #define PHYS_SDRAM_SIZE SZ_1G #define CONFIG_SYS_MEMTEST_START PHYS_SDRAM #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM #define CONFIG_LOADADDR 0x60800000 -#define CONFIG_SYS_MEMTEST_END 0x9E000000 +#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + (PHYS_SDRAM_SIZE >> 1)) #define CONFIG_EXTRA_ENV_SETTINGS \ "script=boot.scr\0" \ -- 2.17.1