omap: Use spl_soc_init instead of spl_board_init

Both spl_board_init and spl_soc_init are available as ways to run
specific code in the SPL's board_init_r. Use the former for init
code that is specific to the SoC and leave spl_board_init available
for boards to use.

Signed-off-by: Paul Kocialkowski <paulk@sys-base.io>
Reviewed-by: Tom Rini <trini@konsulko.com>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index ba0359fed5adb5401ef94ea1b4eb6c3bc03d5f1c..656f588a97c0027fa132be975bb73620b33a653e 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -802,7 +802,7 @@ config ARCH_OMAP2PLUS
        bool "TI OMAP2+"
        select CPU_V7A
        select GPIO_EXTRA_HEADER
-       select SPL_BOARD_INIT if SPL
+       select SPL_SOC_INIT if SPL
        select SPL_STACK_R if SPL
        select SUPPORT_SPL
        imply TI_SYSC if DM && OF_CONTROL

diff --git a/arch/arm/mach-omap2/boot-common.c b/arch/arm/mach-omap2/boot-common.c
index e1ea3515ac10804d6e25c915a85dceb75e705b4c..21b204074e8070c965757cdfbd28ca19ced01550 100644 (file)
--- a/arch/arm/mach-omap2/boot-common.c
+++ b/arch/arm/mach-omap2/boot-common.c
@@ -269,7 +269,7 @@ skip_ipu1:
                debug("%s: IPU2 failed to start (%d)\n", __func__, ret);
 }
 
-void spl_board_init(void)
+void spl_soc_init(void)
 {
        /* Prepare console output */
        preloader_console_init();