dm: spl: Allow device tree/driver model in board_init_f()

[u-boot] / common / spl / spl.c

diff --git a/common/spl/spl.c b/common/spl/spl.c
index 6a02c9ed96a3f167646e4175c31a2c24b180ce90..074c41d5ad2cd2ef3642cc2b6a71aa3f4c4234c5 100644 (file)
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -125,7 +125,7 @@ __weak void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image)
        typedef void __noreturn (*image_entry_noargs_t)(void);
 
        image_entry_noargs_t image_entry =
-                       (image_entry_noargs_t) spl_image->entry_point;
+               (image_entry_noargs_t)(unsigned long)spl_image->entry_point;
 
        debug("image entry point: 0x%X\n", spl_image->entry_point);
        image_entry();
@@ -148,18 +148,12 @@ static void spl_ram_load_image(void)
 }
 #endif
 
-void board_init_r(gd_t *dummy1, ulong dummy2)
+int spl_init(void)
 {
-       u32 boot_device;
        int ret;
 
-       debug(">>spl:board_init_r()\n");
-
-#if defined(CONFIG_SYS_SPL_MALLOC_START)
-       mem_malloc_init(CONFIG_SYS_SPL_MALLOC_START,
-                       CONFIG_SYS_SPL_MALLOC_SIZE);
-       gd->flags |= GD_FLG_FULL_MALLOC_INIT;
-#elif defined(CONFIG_SYS_MALLOC_F_LEN)
+       debug("spl_init()\n");
+#if defined(CONFIG_SYS_MALLOC_F_LEN)
        gd->malloc_limit = CONFIG_SYS_MALLOC_F_LEN;
        gd->malloc_ptr = 0;
 #endif
@@ -168,17 +162,36 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
                ret = fdtdec_setup();
                if (ret) {
                        debug("fdtdec_setup() returned error %d\n", ret);
-                       hang();
+                       return ret;
                }
        }
        if (IS_ENABLED(CONFIG_SPL_DM)) {
                ret = dm_init_and_scan(true);
                if (ret) {
                        debug("dm_init_and_scan() returned error %d\n", ret);
-                       hang();
+                       return ret;
                }
        }
+       gd->flags |= GD_FLG_SPL_INIT;
+
+       return 0;
+}
 
+void board_init_r(gd_t *dummy1, ulong dummy2)
+{
+       u32 boot_device;
+
+       debug(">>spl:board_init_r()\n");
+
+#if defined(CONFIG_SYS_SPL_MALLOC_START)
+       mem_malloc_init(CONFIG_SYS_SPL_MALLOC_START,
+                       CONFIG_SYS_SPL_MALLOC_SIZE);
+       gd->flags |= GD_FLG_FULL_MALLOC_INIT;
+#endif
+       if (!(gd->flags & GD_FLG_SPL_INIT)) {
+               if (spl_init())
+                       hang();
+       }
 #ifndef CONFIG_PPC
        /*
         * timer_init() does not exist on PPC systems. The timer is initialized
@@ -328,7 +341,7 @@ ulong spl_relocate_stack_gd(void)
        ulong ptr;
 
        /* Get stack position: use 8-byte alignment for ABI compliance */
-       ptr = CONFIG_SPL_STACK_R - sizeof(gd_t);
+       ptr = CONFIG_SPL_STACK_R_ADDR - sizeof(gd_t);
        ptr &= ~7;
        new_gd = (gd_t *)ptr;
        memcpy(new_gd, (void *)gd, sizeof(gd_t));