Use correct spelling of "U-Boot"

[people/ms/u-boot.git] / common / splash_source.c

diff --git a/common/splash_source.c b/common/splash_source.c
index 4820c12739fb72f4be83040350d12eeaaa6c6a91..a09dd4b46eb643ad7ceaf0cbd52f282fc486fc19 100644 (file)
--- a/common/splash_source.c
+++ b/common/splash_source.c
@@ -12,7 +12,10 @@
 #include <splash.h>
 #include <spi_flash.h>
 #include <spi.h>
+#include <usb.h>
+#include <sata.h>
 #include <bmp_layout.h>
+#include <fs.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -103,6 +106,103 @@ splash_address_too_high:
        return -EFAULT;
 }
 
+static int splash_select_fs_dev(struct splash_location *location)
+{
+       int res;
+
+       switch (location->storage) {
+       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;
+       case SPLASH_STORAGE_SATA:
+               res = fs_set_blk_dev("sata", location->devpart, FS_TYPE_ANY);
+               break;
+       default:
+               printf("Error: unsupported location storage.\n");
+               return -ENODEV;
+       }
+
+       if (res)
+               printf("Error: could not access storage.\n");
+
+       return res;
+}
+
+#ifdef CONFIG_USB_STORAGE
+static int splash_init_usb(void)
+{
+       int err;
+
+       err = usb_init();
+       if (err)
+               return err;
+
+       return usb_stor_scan(1) < 0 ? -ENODEV : 0;
+}
+#else
+static inline int splash_init_usb(void)
+{
+       printf("Cannot load splash image: no USB support\n");
+       return -ENOSYS;
+}
+#endif
+
+#ifdef CONFIG_CMD_SATA
+static int splash_init_sata(void)
+{
+       return sata_initialize();
+}
+#else
+static inline int splash_init_sata(void)
+{
+       printf("Cannot load splash image: no SATA support\n");
+       return -ENOSYS;
+}
+#endif
+
+#define SPLASH_SOURCE_DEFAULT_FILE_NAME                "splash.bmp"
+
+static int splash_load_fs(struct splash_location *location, u32 bmp_load_addr)
+{
+       int res = 0;
+       loff_t bmp_size;
+       char *splash_file;
+
+       splash_file = getenv("splashfile");
+       if (!splash_file)
+               splash_file = SPLASH_SOURCE_DEFAULT_FILE_NAME;
+
+       if (location->storage == SPLASH_STORAGE_USB)
+               res = splash_init_usb();
+
+       if (location->storage == SPLASH_STORAGE_SATA)
+               res = splash_init_sata();
+
+       if (res)
+               return res;
+
+       res = splash_select_fs_dev(location);
+       if (res)
+               return res;
+
+       res = fs_size(splash_file, &bmp_size);
+       if (res) {
+               printf("Error (%d): cannot determine file size\n", res);
+               return res;
+       }
+
+       if (bmp_load_addr + bmp_size >= gd->start_addr_sp) {
+               printf("Error: splashimage address too high. Data overwrites U-Boot and/or placed beyond DRAM boundaries.\n");
+               return -EFAULT;
+       }
+
+       splash_select_fs_dev(location);
+       return fs_read(splash_file, bmp_load_addr, 0, 0, NULL);
+}
+
 /**
  * select_splash_location - return the splash location based on board support
  *                         and env variable "splashsource".
@@ -172,5 +272,10 @@ int splash_source_load(struct splash_location *locations, uint size)
        if (!splash_location)
                return -EINVAL;
 
-       return splash_load_raw(splash_location, bmp_load_addr);
+       if (splash_location->flags & SPLASH_STORAGE_RAW)
+               return splash_load_raw(splash_location, bmp_load_addr);
+       else if (splash_location->flags & SPLASH_STORAGE_FS)
+               return splash_load_fs(splash_location, bmp_load_addr);
+
+       return -EINVAL;
 }