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 1ad7fb6c60e8641878684490e909cea1030e81cb..7cc76d4cf1f344ad1e897879a9784dabb2920fbc 100644 (file)
--- a/arch/sandbox/cpu/spl.c
+++ b/arch/sandbox/cpu/spl.c
@@ -25,19 +25,6 @@ u32 spl_boot_device(void)
        return BOOT_DEVICE_BOARD;
 }
 
-void spl_board_announce_boot_device(void)
-{
-       char fname[256];
-       int ret;
-
-       ret = os_find_u_boot(fname, sizeof(fname));
-       if (ret) {
-               printf("(%s not found, error %d)\n", fname, ret);
-               return;
-       }
-       printf("%s\n", fname);
-}
-
 static int spl_board_load_image(struct spl_image_info *spl_image,
                                struct spl_boot_device *bootdev)
 {
@@ -45,13 +32,15 @@ static int spl_board_load_image(struct spl_image_info *spl_image,
        int ret;
 
        ret = os_find_u_boot(fname, sizeof(fname));
-       if (ret)
+       if (ret) {
+               printf("(%s not found, error %d)\n", fname, ret);
                return ret;
+       }
 
        /* Hopefully this will not return */
        return os_spl_to_uboot(fname);
 }
-SPL_LOAD_IMAGE_METHOD(0, BOOT_DEVICE_BOARD, spl_board_load_image);
+SPL_LOAD_IMAGE_METHOD("sandbox", 0, BOOT_DEVICE_BOARD, spl_board_load_image);
 
 void spl_board_init(void)
 {