From: Ye Li <[email protected]> To enable icache and dcache in SPL, add the definition of secure DDR space could be accessed by SPL and move arch_cpu_init before spl_early_init
Signed-off-by: Ye Li <[email protected]> --- board/nxp/imx94_evk/spl.c | 4 ++-- board/nxp/imx952_evk/spl.c | 4 ++-- board/nxp/imx95_evk/spl.c | 4 ++-- board/nxp/imx95_frdm/spl.c | 4 ++-- include/configs/imx94_evk.h | 3 +++ include/configs/imx952_evk.h | 2 +- include/configs/imx95_evk.h | 3 +++ include/configs/imx95_frdm.h | 3 +++ 8 files changed, 18 insertions(+), 9 deletions(-) diff --git a/board/nxp/imx94_evk/spl.c b/board/nxp/imx94_evk/spl.c index 739a5f1f559..713b531de0f 100644 --- a/board/nxp/imx94_evk/spl.c +++ b/board/nxp/imx94_evk/spl.c @@ -74,6 +74,8 @@ void board_init_f(ulong dummy) timer_init(); + arch_cpu_init(); + spl_early_init(); /* Need enable SCMI drivers and ELE driver before enabling console */ @@ -81,8 +83,6 @@ void board_init_f(ulong dummy) if (ret) hang(); /* if MU not probed, nothing can output, just hang here */ - arch_cpu_init(); - preloader_console_init(); debug("SOC: 0x%x\n", gd->arch.soc_rev); diff --git a/board/nxp/imx952_evk/spl.c b/board/nxp/imx952_evk/spl.c index 615c3b67fb6..447f43bf2f5 100644 --- a/board/nxp/imx952_evk/spl.c +++ b/board/nxp/imx952_evk/spl.c @@ -87,6 +87,8 @@ void board_init_f(ulong dummy) timer_init(); + arch_cpu_init(); + /* Need dm_init() to run before any SCMI calls can be made. */ spl_early_init(); @@ -95,8 +97,6 @@ void board_init_f(ulong dummy) if (ret) hang(); /* if MU not probed, nothing can output, just hang here */ - arch_cpu_init(); - preloader_console_init(); debug("SOC: 0x%x\n", gd->arch.soc_rev); diff --git a/board/nxp/imx95_evk/spl.c b/board/nxp/imx95_evk/spl.c index 2fd69447e1e..f47a75eaf5b 100644 --- a/board/nxp/imx95_evk/spl.c +++ b/board/nxp/imx95_evk/spl.c @@ -61,6 +61,8 @@ void board_init_f(ulong dummy) timer_init(); + arch_cpu_init(); + /* Need dm_init() to run before any SCMI calls can be made. */ spl_early_init(); @@ -69,8 +71,6 @@ void board_init_f(ulong dummy) if (ret) hang(); /* if MU not probed, nothing can output, just hang here */ - arch_cpu_init(); - preloader_console_init(); debug("SOC: 0x%x\n", gd->arch.soc_rev); diff --git a/board/nxp/imx95_frdm/spl.c b/board/nxp/imx95_frdm/spl.c index c8a5b4f9d41..2e899b63061 100644 --- a/board/nxp/imx95_frdm/spl.c +++ b/board/nxp/imx95_frdm/spl.c @@ -61,6 +61,8 @@ void board_init_f(ulong dummy) timer_init(); + arch_cpu_init(); + /* Need dm_init() to run before any SCMI calls can be made. */ spl_early_init(); @@ -69,8 +71,6 @@ void board_init_f(ulong dummy) if (ret) hang(); /* if MU not probed, nothing can output, just hang here */ - arch_cpu_init(); - preloader_console_init(); debug("SOC: 0x%x\n", gd->arch.soc_rev); diff --git a/include/configs/imx94_evk.h b/include/configs/imx94_evk.h index 2623c13db06..64150245d26 100644 --- a/include/configs/imx94_evk.h +++ b/include/configs/imx94_evk.h @@ -18,4 +18,7 @@ #define PHYS_SDRAM_SIZE 0x70000000UL /* 2GB - 256MB DDR */ #define PHYS_SDRAM_2_SIZE 0x180000000 /* 8GB */ +#define CFG_SYS_SECURE_SDRAM_BASE 0x8A000000 /* Secure DDR region for A55 */ +#define CFG_SYS_SECURE_SDRAM_SIZE 0x04000000 + #endif diff --git a/include/configs/imx952_evk.h b/include/configs/imx952_evk.h index 4ff56eb8adf..689fe9b4dc4 100644 --- a/include/configs/imx952_evk.h +++ b/include/configs/imx952_evk.h @@ -20,6 +20,6 @@ #define PHYS_SDRAM_2_SIZE 0x380000000 /* 14GB */ #define CFG_SYS_SECURE_SDRAM_BASE 0x8A000000 /* Secure DDR region for A55, SPL could use first 2MB */ -#define CFG_SYS_SECURE_SDRAM_SIZE 0x06000000 +#define CFG_SYS_SECURE_SDRAM_SIZE 0x04000000 #endif diff --git a/include/configs/imx95_evk.h b/include/configs/imx95_evk.h index 1fdc9ce21ef..57658d438a7 100644 --- a/include/configs/imx95_evk.h +++ b/include/configs/imx95_evk.h @@ -23,4 +23,7 @@ #define PHYS_SDRAM_2_SIZE 0x380000000 /* 14GB (Totally 16GB) */ #endif +#define CFG_SYS_SECURE_SDRAM_BASE 0x8A000000 /* Secure DDR region for A55 */ +#define CFG_SYS_SECURE_SDRAM_SIZE 0x04000000 + #endif diff --git a/include/configs/imx95_frdm.h b/include/configs/imx95_frdm.h index 132eea28643..e64294a2bb1 100644 --- a/include/configs/imx95_frdm.h +++ b/include/configs/imx95_frdm.h @@ -20,4 +20,7 @@ #define PHYS_SDRAM_2_SIZE 0x180000000 /* 6GB (Totally 8GB) */ +#define CFG_SYS_SECURE_SDRAM_BASE 0x8A000000 /* Secure DDR region for A55 */ +#define CFG_SYS_SECURE_SDRAM_SIZE 0x04000000 + #endif -- 2.50.1
