ARM: uniphier: print Support Card info very late

[u-boot] / arch / sandbox / cpu / spl.c

diff --git a/arch/sandbox/cpu/spl.c b/arch/sandbox/cpu/spl.c
index e17c0ed0875e46c21dbc2b8ea4b3fffddea09fb5..7cc76d4cf1f344ad1e897879a9784dabb2920fbc 100644 (file)
--- a/arch/sandbox/cpu/spl.c
+++ b/arch/sandbox/cpu/spl.c
@@ -6,6 +6,7 @@
 #include <common.h>
 #include <dm.h>
 #include <os.h>
+#include <spl.h>
 #include <asm/spl.h>
 #include <asm/state.h>
 
@@ -24,7 +25,8 @@ u32 spl_boot_device(void)
        return BOOT_DEVICE_BOARD;
 }
 
-void spl_board_announce_boot_device(void)
+static int spl_board_load_image(struct spl_image_info *spl_image,
+                               struct spl_boot_device *bootdev)
 {
        char fname[256];
        int ret;
@@ -32,20 +34,26 @@ void spl_board_announce_boot_device(void)
        ret = os_find_u_boot(fname, sizeof(fname));
        if (ret) {
                printf("(%s not found, error %d)\n", fname, ret);
-               return;
-       }
-       printf("%s\n", fname);
-}
-
-int spl_board_load_image(void)
-{
-       char fname[256];
-       int ret;
-
-       ret = os_find_u_boot(fname, sizeof(fname));
-       if (ret)
                return ret;
+       }
 
        /* Hopefully this will not return */
        return os_spl_to_uboot(fname);
 }
+SPL_LOAD_IMAGE_METHOD("sandbox", 0, BOOT_DEVICE_BOARD, spl_board_load_image);
+
+void spl_board_init(void)
+{
+       struct udevice *dev;
+
+       preloader_console_init();
+
+       /*
+       * Scan all the devices so that we can output their platform data. See
+       * sandbox_spl_probe().
+       */
+       for (uclass_first_device(UCLASS_MISC, &dev);
+       dev;
+       uclass_next_device(&dev))
+               ;
+}