Merge git://git.denx.de/u-boot-dm

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

diff --git a/arch/sandbox/cpu/spl.c b/arch/sandbox/cpu/spl.c
index e8349c0b932d7202d1daac766a4a657f04e3a1c5..7cc76d4cf1f344ad1e897879a9784dabb2920fbc 100644 (file)
--- a/arch/sandbox/cpu/spl.c
+++ b/arch/sandbox/cpu/spl.c
@@ -25,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;
@@ -33,23 +34,13 @@ 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)
 {