board: sifive: Rename spl_soc_init() to spl_dram_init()

Rename spl_soc_init() to spl_dram_init() because the generic function
name does not reflect what the function actually does. Also
spl_dram_init() is commonly used for dram initialization and should be
called from board_init_f().

Signed-off-by: Lukas Funke <lukas.funke@weidmueller.com>
Reviewed-by: Leo Yu-Chi Liang <ycliang@andestech.com>

diff --git a/arch/riscv/cpu/fu540/spl.c b/arch/riscv/cpu/fu540/spl.c
index 45657b790965e21e486878f5c718dacbf748ec52..cedb70b66a221228b406c5486f3f630bc3d2a341 100644 (file)
--- a/arch/riscv/cpu/fu540/spl.c
+++ b/arch/riscv/cpu/fu540/spl.c
@@ -7,7 +7,7 @@
 #include <dm.h>
 #include <log.h>
 
-int spl_soc_init(void)
+int spl_dram_init(void)
 {
        int ret;
        struct udevice *dev;

diff --git a/arch/riscv/cpu/fu740/spl.c b/arch/riscv/cpu/fu740/spl.c
index c6816e9ed4c358ca3aa0ec0e2dafa44469ff674b..16b307f0361ab4301fe4602b142d3d46d7ca877c 100644 (file)
--- a/arch/riscv/cpu/fu740/spl.c
+++ b/arch/riscv/cpu/fu740/spl.c
@@ -10,7 +10,7 @@
 
 #define CSR_U74_FEATURE_DISABLE        0x7c1
 
-int spl_soc_init(void)
+int spl_dram_init(void)
 {
        int ret;
        struct udevice *dev;

diff --git a/arch/riscv/include/asm/arch-fu540/spl.h b/arch/riscv/include/asm/arch-fu540/spl.h
index 4697279f438ba68ef760f55cff1d560a0b03122e..519e7eb210f1a12c6cc19b2811054761b9174568 100644 (file)
--- a/arch/riscv/include/asm/arch-fu540/spl.h
+++ b/arch/riscv/include/asm/arch-fu540/spl.h
@@ -9,6 +9,6 @@
 #ifndef _SPL_SIFIVE_H
 #define _SPL_SIFIVE_H
 
-int spl_soc_init(void);
+int spl_dram_init(void);
 
 #endif /* _SPL_SIFIVE_H */

diff --git a/arch/riscv/include/asm/arch-fu740/spl.h b/arch/riscv/include/asm/arch-fu740/spl.h
index 15ad9e7c8b7788b35d93cb058e2c47ad6fd790ad..b327ac503612795242e57a2f8eb123be2d689a6a 100644 (file)
--- a/arch/riscv/include/asm/arch-fu740/spl.h
+++ b/arch/riscv/include/asm/arch-fu740/spl.h
@@ -9,6 +9,6 @@
 #ifndef _SPL_SIFIVE_H
 #define _SPL_SIFIVE_H
 
-int spl_soc_init(void);
+int spl_dram_init(void);
 
 #endif /* _SPL_SIFIVE_H */

diff --git a/board/sifive/unleashed/spl.c b/board/sifive/unleashed/spl.c
index fe27316b2d9ac75c371774fb1d35ca28d24bee4c..9df9c68604e2f3335ba3aa3a35af5a58a12b99b5 100644 (file)
--- a/board/sifive/unleashed/spl.c
+++ b/board/sifive/unleashed/spl.c
@@ -27,9 +27,9 @@ int spl_board_init_f(void)
 {
        int ret;
 
-       ret = spl_soc_init();
+       ret = spl_dram_init();
        if (ret) {
-               debug("FU540 SPL init failed: %d\n", ret);
+               debug("FU540 DRAM init failed: %d\n", ret);
                return ret;
        }
 

diff --git a/board/sifive/unmatched/spl.c b/board/sifive/unmatched/spl.c
index e69bed9d99d3054b0e6866ecbc7ffed6a501e3b9..6fc1d809540841a3452ebe8e126918a07d0c4e94 100644 (file)
--- a/board/sifive/unmatched/spl.c
+++ b/board/sifive/unmatched/spl.c
@@ -134,9 +134,9 @@ int spl_board_init_f(void)
 {
        int ret;
 
-       ret = spl_soc_init();
+       ret = spl_dram_init();
        if (ret) {
-               debug("HiFive Unmatched FU740 SPL init failed: %d\n", ret);
+               debug("HiFive Unmatched FU740 DRAM init failed: %d\n", ret);
                goto end;
        }