Merge branch 'master' of git://git.denx.de/u-boot-arm

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

diff --git a/common/spl/spl.c b/common/spl/spl.c
index da31457..774fdad 100644 (file)
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -205,6 +205,16 @@ 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
+#ifdef CONFIG_SPL_SATA_SUPPORT
+       case BOOT_DEVICE_SATA:
+               spl_sata_load_image();
+               break;
+#endif
        default:
                debug("SPL: Un-supported Boot Device\n");
                hang();