From 87f6e2f51e337623b1794e916d8b8eb654736c0d Mon Sep 17 00:00:00 2001 From: Peng Fan Date: Tue, 26 May 2020 20:33:46 -0300 Subject: imx8mp_evk: spl: drop useless code Drop useless getting ccm device, there is no need to explicted do this in board code, and we not enable SPL CLK currently. Signed-off-by: Peng Fan Signed-off-by: Fabio Estevam --- board/freescale/imx8mp_evk/spl.c | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'board/freescale/imx8mp_evk/spl.c') diff --git a/board/freescale/imx8mp_evk/spl.c b/board/freescale/imx8mp_evk/spl.c index cd5b32c3f8c..f2cc1777577 100644 --- a/board/freescale/imx8mp_evk/spl.c +++ b/board/freescale/imx8mp_evk/spl.c @@ -29,11 +29,6 @@ #include #include -#include -#include -#include -#include - DECLARE_GLOBAL_DATA_PTR; int spl_board_boot_device(enum boot_device boot_dev_spl) @@ -48,16 +43,7 @@ void spl_dram_init(void) void spl_board_init(void) { - struct udevice *dev; - int ret; - puts("Normal Boot\n"); - - ret = uclass_get_device_by_name(UCLASS_CLK, - "clock-controller@30380000", - &dev); - if (ret < 0) - printf("Failed to find clock node. Check device tree\n"); } #define I2C_PAD_CTRL (PAD_CTL_DSE6 | PAD_CTL_HYS | PAD_CTL_PUE | PAD_CTL_PE) -- cgit v1.2.3 From ebdd07f5b2e4b00eee7f8630b3b026a65c3f51c4 Mon Sep 17 00:00:00 2001 From: Peng Fan Date: Tue, 26 May 2020 20:33:47 -0300 Subject: imx8mp_evk: spl: drop timer_init timer_init has been invoked in arch_cpu_init, no need to invoke it again in board code. Signed-off-by: Peng Fan Signed-off-by: Fabio Estevam --- board/freescale/imx8mp_evk/spl.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'board/freescale/imx8mp_evk/spl.c') diff --git a/board/freescale/imx8mp_evk/spl.c b/board/freescale/imx8mp_evk/spl.c index f2cc1777577..f45f935b934 100644 --- a/board/freescale/imx8mp_evk/spl.c +++ b/board/freescale/imx8mp_evk/spl.c @@ -114,8 +114,6 @@ void board_init_f(ulong dummy) board_early_init_f(); - timer_init(); - preloader_console_init(); /* Clear the BSS. */ -- cgit v1.2.3 From bdada3b14d554b029ec0406ca04cd54482c20d81 Mon Sep 17 00:00:00 2001 From: Peng Fan Date: Tue, 26 May 2020 20:33:48 -0300 Subject: imx8mp_evk: spl: use spl_early_init 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 Signed-off-by: Fabio Estevam --- board/freescale/imx8mp_evk/spl.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'board/freescale/imx8mp_evk/spl.c') diff --git a/board/freescale/imx8mp_evk/spl.c b/board/freescale/imx8mp_evk/spl.c index f45f935b934..d4feb84d93e 100644 --- a/board/freescale/imx8mp_evk/spl.c +++ b/board/freescale/imx8mp_evk/spl.c @@ -114,17 +114,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); -- cgit v1.2.3 From 0ec9d5bda93e0203405ffff134ce7b2d7fbda6aa Mon Sep 17 00:00:00 2001 From: Peng Fan Date: Tue, 26 May 2020 20:33:49 -0300 Subject: imx8mp_evk: spl: no need the code since spl framework could do that We no need invoke the code, since spl framework could help us do that. Signed-off-by: Peng Fan Signed-off-by: Fabio Estevam --- board/freescale/imx8mp_evk/spl.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'board/freescale/imx8mp_evk/spl.c') diff --git a/board/freescale/imx8mp_evk/spl.c b/board/freescale/imx8mp_evk/spl.c index d4feb84d93e..3b3a854e29b 100644 --- a/board/freescale/imx8mp_evk/spl.c +++ b/board/freescale/imx8mp_evk/spl.c @@ -104,6 +104,7 @@ int board_fit_config_name_match(const char *name) } #endif +/* Do not use BSS area in this phase */ void board_init_f(ulong dummy) { int ret; @@ -122,9 +123,6 @@ void board_init_f(ulong dummy) 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); @@ -133,6 +131,4 @@ void board_init_f(ulong dummy) /* DDR initialization */ spl_dram_init(); - - board_init_r(NULL, 0); } -- cgit v1.2.3