summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--board/compulab/cm_fx6/cm_fx6.c1
-rw-r--r--board/compulab/cm_t35/cm_t35.c1
-rw-r--r--common/splash_source.c58
-rw-r--r--doc/README.splashprepare5
-rw-r--r--include/splash.h8
5 files changed, 72 insertions, 1 deletions
diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c
index 01871e100a..202a178e6a 100644
--- 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 ccefc40eb0..189d903b6e 100644
--- 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 4820c12739..7de8695375 100644
--- 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 a0f0f3ca51..56c1bef662 100644
--- 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 7ae7a68688..d1fba69325 100644
--- 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);