riscv: Call spl_board_init_f() in the generic SPL board_init_f()

The generic SPL version of board_init_f() should give a call to
board specific codes to initialize board in the SPL phase.

Signed-off-by: Bin Meng <bin.meng@windriver.com>
Reviewed-by: Rick Chen <rick@andestech.com>
Reviewed-by: Pragnesh Patel <pragnesh.patel@sifive.com>
Tested-by: Pragnesh Patel <pragnesh.patel@sifive.com>

diff --git a/arch/riscv/include/asm/spl.h b/arch/riscv/include/asm/spl.h
index 45c03fb9b62c172d370389b6b1b1740d2996a940..1487f2d9106670e75e579b3c46690b0725514c1d 100644 (file)
--- a/arch/riscv/include/asm/spl.h
+++ b/arch/riscv/include/asm/spl.h
@@ -28,4 +28,11 @@ enum {
        BOOT_DEVICE_NONE
 };
 
+/**
+ * spl_board_init_f() - initialize board in the SPL phase
+ *
+ * @return 0 if succeeded, -ve on error
+ */
+int spl_board_init_f(void);
+
 #endif

diff --git a/arch/riscv/lib/spl.c b/arch/riscv/lib/spl.c
index c47dcd46ceaed6e1b8dd27484ab761ce9ed0c557..e24ec5a46c08335dbe51996b6a6a8b9d397538c3 100644 (file)
--- a/arch/riscv/lib/spl.c
+++ b/arch/riscv/lib/spl.c
@@ -13,6 +13,11 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
+__weak int spl_board_init_f(void)
+{
+       return 0;
+}
+
 __weak void board_init_f(ulong dummy)
 {
        int ret;
@@ -24,6 +29,10 @@ __weak void board_init_f(ulong dummy)
        arch_cpu_init_dm();
 
        preloader_console_init();
+
+       ret = spl_board_init_f();
+       if (ret)
+               panic("spl_board_init_f() failed: %d\n", ret);
 }
 
 void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image)