Merge branch 'u-boot-arm/next' into 'u-boot-arm/master'

[platform/kernel/u-boot.git] / common / spl / spl.c

diff --git a/common/spl/spl.c b/common/spl/spl.c
index d6b0e01..0645cee 100644 (file)
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -85,8 +85,9 @@ void spl_parse_image_header(const struct image_header *header)
                }
                spl_image.os = image_get_os(header);
                spl_image.name = image_get_name(header);
-               debug("spl: payload image: %s load addr: 0x%x size: %d\n",
-                       spl_image.name, spl_image.load_addr, spl_image.size);
+               debug("spl: payload image: %.*s load addr: 0x%x size: %d\n",
+                       sizeof(spl_image.name), spl_image.name,
+                       spl_image.load_addr, spl_image.size);
        } else {
                /* Signature not found - assume u-boot.bin */
                debug("mkimage signature not found - ih_magic = %x\n",
@@ -204,6 +205,11 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
                spl_net_load_image("usb_ether");
                break;
 #endif
+#ifdef CONFIG_SPL_USB_SUPPORT
+       case BOOT_DEVICE_USB:
+               spl_usb_load_image();
+               break;
+#endif
        default:
                debug("SPL: Un-supported Boot Device\n");
                hang();