diff options
| author | Ye Li <ye.li@nxp.com> | 2019-12-09 21:28:01 -0800 |
|---|---|---|
| committer | Ye Li <ye.li@nxp.com> | 2019-12-09 22:34:46 -0800 |
| commit | ce15b01bac8f6a0cf9265eca913bf4560513c0af (patch) | |
| tree | ace47e94516272ddf3e692904c2649a30d3f1739 /include/configs | |
| parent | de526460611fb5ce855854f0df909fa76f13501e (diff) | |
MLK-23101 imx8mn: Fix address conflict in SPL
The latest patch "MLK-23081 imx8mn: Change SPL malloc and BSS address" changed
SPL runtime data to OCRAM_S. But this introduced a conflict with
CONFIG_SAVED_DRAM_TIMING_BASE which is also using OCRAM_S for DDR parameters.
To fix the issue, adjust the SPL runtime data addresses to reserve 16KB space for
DDR parameter and move SPL BSS to OCRAM.
Signed-off-by: Ye Li <ye.li@nxp.com>
Acked-by: Peng Fan <peng.fan@nxp.com>
(cherry picked from commit 20fdadfa50227b518d1a185da4c59e756eb8e594)
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/imx8mn_evk.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/configs/imx8mn_evk.h b/include/configs/imx8mn_evk.h index a3187ea129e..a32483c7221 100644 --- a/include/configs/imx8mn_evk.h +++ b/include/configs/imx8mn_evk.h @@ -16,7 +16,7 @@ #define CONFIG_CSF_SIZE 0x2000 /* 8K region */ #endif -#define CONFIG_SPL_MAX_SIZE (216 * 1024) +#define CONFIG_SPL_MAX_SIZE (208 * 1024) #define CONFIG_SYS_MONITOR_LEN (512 * 1024) #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300 @@ -35,14 +35,14 @@ #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT #define CONFIG_SPL_GPIO_SUPPORT -#define CONFIG_SPL_BSS_START_ADDR 0x00180000 +#define CONFIG_SPL_BSS_START_ADDR 0x0095e000 #define CONFIG_SPL_BSS_MAX_SIZE 0x2000 /* 8 KB */ #define CONFIG_SYS_SPL_MALLOC_START 0x42200000 #define CONFIG_SYS_SPL_MALLOC_SIZE 0x10000 /* 64 KB */ #define CONFIG_SYS_ICACHE_OFF #define CONFIG_SYS_DCACHE_OFF -#define CONFIG_MALLOC_F_ADDR 0x182000 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ +#define CONFIG_MALLOC_F_ADDR 0x184000 /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */ #define CONFIG_SPL_ABORT_ON_RAW_IMAGE /* For RAW image gives a error info not panic */ |