diff mbox series

[v3,3/5] imx8mp_evk: spl: use spl_early_init

Message ID 20200526233350.25190-3-festevam@gmail.com
State Accepted
Commit bdada3b14d554b029ec0406ca04cd54482c20d81
Delegated to: Stefano Babic
Headers show
Series [v3,1/5] imx8mp_evk: spl: drop useless code | expand

Commit Message

Fabio Estevam May 26, 2020, 11:33 p.m. UTC
From: Peng Fan <peng.fan@nxp.com>

Use spl_early_init to replace spl_init, spl_init will be invoked
in board_init_r, we only need use spl_early_init to setup malloc
and scan early dt.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
Signed-off-by: Fabio Estevam <festevam@gmail.com>
---
Changes since v2:
- None. Rebased against U-Boot master

 board/freescale/imx8mp_evk/spl.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Comments

Stefano Babic June 8, 2020, 5:22 p.m. UTC | #1
> From: Peng Fan <peng.fan@nxp.com>
> Use spl_early_init to replace spl_init, spl_init will be invoked
> in board_init_r, we only need use spl_early_init to setup malloc
> and scan early dt.
> Signed-off-by: Peng Fan <peng.fan@nxp.com>
> Signed-off-by: Fabio Estevam <festevam@gmail.com>
Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic
diff mbox series

Patch

diff --git a/board/freescale/imx8mp_evk/spl.c b/board/freescale/imx8mp_evk/spl.c
index 3b3112077a..6fc3df5aee 100644
--- a/board/freescale/imx8mp_evk/spl.c
+++ b/board/freescale/imx8mp_evk/spl.c
@@ -118,17 +118,17 @@  void board_init_f(ulong dummy)
 
 	board_early_init_f();
 
-	preloader_console_init();
-
-	/* Clear the BSS. */
-	memset(__bss_start, 0, __bss_end - __bss_start);
-
-	ret = spl_init();
+	ret = spl_early_init();
 	if (ret) {
 		debug("spl_init() failed: %d\n", ret);
 		hang();
 	}
 
+	preloader_console_init();
+
+	/* Clear the BSS. */
+	memset(__bss_start, 0, __bss_end - __bss_start);
+
 	enable_tzc380();
 
 	setup_i2c(0, CONFIG_SYS_I2C_SPEED, 0x7f, &i2c_pad_info1);