Add support for loading splash image from USB drive formatted with a
filesystem.

Cc: Igor Grinberg <[email protected]>
Cc: Tom Rini <[email protected]>
Signed-off-by: Nikita Kiryanov <[email protected]>
---
 common/splash_source.c | 11 +++++++++++
 include/splash.h       |  1 +
 2 files changed, 12 insertions(+)

diff --git a/common/splash_source.c b/common/splash_source.c
index cb45c63..937ce17 100644
--- a/common/splash_source.c
+++ b/common/splash_source.c
@@ -12,6 +12,7 @@
 #include <splash.h>
 #include <spi_flash.h>
 #include <spi.h>
+#include <usb.h>
 #include <bmp_layout.h>
 #include <fs.h>
 
@@ -112,6 +113,9 @@ static int splash_select_fs_dev(struct splash_location 
*location)
        case SPLASH_STORAGE_MMC:
                res = fs_set_blk_dev("mmc", location->devpart, FS_TYPE_ANY);
                break;
+       case SPLASH_STORAGE_USB:
+               res = fs_set_blk_dev("usb", location->devpart, FS_TYPE_ANY);
+               break;
        default:
                printf("Error: unsupported location storage.\n");
                return -ENODEV;
@@ -128,6 +132,13 @@ static int splash_load_fs(struct splash_location 
*location, u32 bmp_load_addr)
        int res;
        loff_t bmp_size;
 
+#ifdef CONFIG_USB_STORAGE
+       if (location->storage == SPLASH_STORAGE_USB) {
+               usb_init();
+               usb_stor_scan(1);
+       }
+#endif
+
        res = splash_select_fs_dev(location);
        if (res)
                return res;
diff --git a/include/splash.h b/include/splash.h
index d1fba69..b728bd6 100644
--- a/include/splash.h
+++ b/include/splash.h
@@ -28,6 +28,7 @@ enum splash_storage {
        SPLASH_STORAGE_NAND,
        SPLASH_STORAGE_SF,
        SPLASH_STORAGE_MMC,
+       SPLASH_STORAGE_USB,
 };
 
 enum splash_flags {
-- 
1.9.1

_______________________________________________
U-Boot mailing list
[email protected]
http://lists.denx.de/mailman/listinfo/u-boot

Reply via email to