From 736ea652c6dbc7bb9f52bceff35a5f4bb98ca4dc Mon Sep 17 00:00:00 2001 From: Ye Li Date: Wed, 24 Apr 2019 21:57:23 -0700 Subject: [PATCH] MLK-20654-2 imx8: SPL: Move arch_cpu_init to board_init_f Since we have data section save/restore in arch_cpu_init, need it in early stage, so move arch_cpu_init to board_init_f Signed-off-by: Ye Li --- board/freescale/imx8qm_arm2/spl.c | 4 ++-- board/freescale/imx8qm_mek/spl.c | 4 ++-- board/freescale/imx8qxp_arm2/spl.c | 4 ++-- board/freescale/imx8qxp_mek/spl.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/board/freescale/imx8qm_arm2/spl.c b/board/freescale/imx8qm_arm2/spl.c index a38d947bb5..008e8f3f39 100644 --- a/board/freescale/imx8qm_arm2/spl.c +++ b/board/freescale/imx8qm_arm2/spl.c @@ -27,8 +27,6 @@ void spl_board_init(void) continue; } - arch_cpu_init(); - board_early_init_f(); timer_init(); @@ -61,5 +59,7 @@ void board_init_f(ulong dummy) /* Clear the BSS. */ memset(__bss_start, 0, __bss_end - __bss_start); + arch_cpu_init(); + board_init_r(NULL, 0); } diff --git a/board/freescale/imx8qm_mek/spl.c b/board/freescale/imx8qm_mek/spl.c index a38d947bb5..008e8f3f39 100644 --- a/board/freescale/imx8qm_mek/spl.c +++ b/board/freescale/imx8qm_mek/spl.c @@ -27,8 +27,6 @@ void spl_board_init(void) continue; } - arch_cpu_init(); - board_early_init_f(); timer_init(); @@ -61,5 +59,7 @@ void board_init_f(ulong dummy) /* Clear the BSS. */ memset(__bss_start, 0, __bss_end - __bss_start); + arch_cpu_init(); + board_init_r(NULL, 0); } diff --git a/board/freescale/imx8qxp_arm2/spl.c b/board/freescale/imx8qxp_arm2/spl.c index a38d947bb5..008e8f3f39 100644 --- a/board/freescale/imx8qxp_arm2/spl.c +++ b/board/freescale/imx8qxp_arm2/spl.c @@ -27,8 +27,6 @@ void spl_board_init(void) continue; } - arch_cpu_init(); - board_early_init_f(); timer_init(); @@ -61,5 +59,7 @@ void board_init_f(ulong dummy) /* Clear the BSS. */ memset(__bss_start, 0, __bss_end - __bss_start); + arch_cpu_init(); + board_init_r(NULL, 0); } diff --git a/board/freescale/imx8qxp_mek/spl.c b/board/freescale/imx8qxp_mek/spl.c index a38d947bb5..008e8f3f39 100644 --- a/board/freescale/imx8qxp_mek/spl.c +++ b/board/freescale/imx8qxp_mek/spl.c @@ -27,8 +27,6 @@ void spl_board_init(void) continue; } - arch_cpu_init(); - board_early_init_f(); timer_init(); @@ -61,5 +59,7 @@ void board_init_f(ulong dummy) /* Clear the BSS. */ memset(__bss_start, 0, __bss_end - __bss_start); + arch_cpu_init(); + board_init_r(NULL, 0); } -- 2.17.1