splash_source: add support for filesystem formatted mmc

Add support for loading splash image from an SD card formatted with
a filesystem. Update boards to maintain original behavior where needed.

Cc: Igor Grinberg <grinberg@compulab.co.il>
Cc: Tom Rini <trini@konsulko.com>
Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>

diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c
index 01871e100af33486294fb487c798eee2e3b0da17..202a178e6a73ddd81eb7f29f6a4118aa6f150e72 100644 (file)
--- a/board/compulab/cm_fx6/cm_fx6.c
+++ b/board/compulab/cm_fx6/cm_fx6.c
@@ -39,6 +39,7 @@ static struct splash_location cm_fx6_splash_locations[] = {
        {
                .name = "sf",
                .storage = SPLASH_STORAGE_SF,
+               .flags = SPLASH_STORAGE_RAW,
                .offset = 0x100000,
        },
 };

diff --git a/board/compulab/cm_t35/cm_t35.c b/board/compulab/cm_t35/cm_t35.c
index ccefc40eb013c670bd18ff3ebd7f606c340aa522..189d903b6e39c804edc444041f235e1bbafb6a66 100644 (file)
--- a/board/compulab/cm_t35/cm_t35.c
+++ b/board/compulab/cm_t35/cm_t35.c
@@ -64,6 +64,7 @@ struct splash_location splash_locations[] = {
        {
                .name = "nand",
                .storage = SPLASH_STORAGE_NAND,
+               .flags = SPLASH_STORAGE_RAW,
                .offset = 0x100000,
        },
 };

diff --git a/common/splash_source.c b/common/splash_source.c
index 4820c12739fb72f4be83040350d12eeaaa6c6a91..7de8695375d016cb7cc7db3f29fef438c90eaf2b 100644 (file)
--- a/common/splash_source.c
+++ b/common/splash_source.c
@@ -13,6 +13,7 @@
 #include <spi_flash.h>
 #include <spi.h>
 #include <bmp_layout.h>
+#include <fs.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -103,6 +104,56 @@ 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;
+       default:
+               printf("Error: unsupported location storage.\n");
+               return -ENODEV;
+       }
+
+       if (res)
+               printf("Error: could not access storage.\n");
+
+       return res;
+}
+
+#define SPLASH_SOURCE_DEFAULT_FILE_NAME                "splash.bmp"
+
+static int splash_load_fs(struct splash_location *location, u32 bmp_load_addr)
+{
+       int res;
+       loff_t bmp_size;
+       char *splash_file;
+
+       splash_file = getenv("splashfile");
+       if (!splash_file)
+               splash_file = SPLASH_SOURCE_DEFAULT_FILE_NAME;
+
+       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 +223,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;
 }

diff --git a/doc/README.splashprepare b/doc/README.splashprepare
index a0f0f3ca51f794630f3f398f40dae0c567c1ad1a..56c1bef66216310667b2110103224fe5dc5fd6bd 100644 (file)
--- a/doc/README.splashprepare
+++ b/doc/README.splashprepare
@@ -19,3 +19,8 @@ splashsource works as follows:
   use that splash location.
 - If splashsource is undefined, use the first splash location as default.
 - If splashsource is set to an unsupported value, do not load a splash screen.
+
+A splash source location can describe either storage with raw data, or storage
+formatted with a file system. In case of a filesystem, the splash screen data is
+loaded as a file. The name of the splash screen file can be controlled with the
+environment variable "splashfile".

diff --git a/include/splash.h b/include/splash.h
index 7ae7a686888c8e94b4051e38789ee3b48adce098..d1fba69325458719c4760a3d07d47f74a6bf0b2d 100644 (file)
--- a/include/splash.h
+++ b/include/splash.h
@@ -27,12 +27,20 @@
 enum splash_storage {
        SPLASH_STORAGE_NAND,
        SPLASH_STORAGE_SF,
+       SPLASH_STORAGE_MMC,
+};
+
+enum splash_flags {
+       SPLASH_STORAGE_RAW,
+       SPLASH_STORAGE_FS,
 };
 
 struct splash_location {
        char *name;
        enum splash_storage storage;
+       enum splash_flags flags;
        u32 offset;     /* offset from start of storage */
+       char *devpart;  /* Use the load command dev:part conventions */
 };
 
 int splash_source_load(struct splash_location *locations, uint size);