diff options
| -rw-r--r-- | common/splash_source.c | 10 | ||||
| -rw-r--r-- | doc/README.splashprepare | 9 |
2 files changed, 14 insertions, 5 deletions
diff --git a/common/splash_source.c b/common/splash_source.c index 62763b9ebd5..e1e73dbdc57 100644 --- a/common/splash_source.c +++ b/common/splash_source.c @@ -303,6 +303,7 @@ static int splash_load_fit(struct splash_location *location, u32 bmp_load_addr) { int res; int node_offset; + const char *splash_file; int splash_offset; int splash_size; struct image_header *img_header; @@ -335,10 +336,15 @@ static int splash_load_fit(struct splash_location *location, u32 bmp_load_addr) return -EINVAL; } - node_offset = fit_image_get_node(fit_header, location->name); + /* Get the splash image node */ + splash_file = env_get("splashfile"); + if (!splash_file) + splash_file = SPLASH_SOURCE_DEFAULT_FILE_NAME; + + node_offset = fit_image_get_node(fit_header, splash_file); if (node_offset < 0) { debug("Could not find splash image '%s' in FIT\n", - location->name); + splash_file); return -ENOENT; } diff --git a/doc/README.splashprepare b/doc/README.splashprepare index f1418de18b0..3cb5b5aeb48 100644 --- a/doc/README.splashprepare +++ b/doc/README.splashprepare @@ -26,6 +26,9 @@ screen data is loaded as a file. The name of the splash screen file can be controlled with the environment variable "splashfile". To enable loading the splash image from a FIT image, CONFIG_FIT must be -enabled. Struct splash_location field 'name' should match the splash image -name within the FIT and the FIT should start at the 'offset' field address in -the specified storage. +enabled. The FIT image has to start at the 'offset' field address in the +selected splash location. The name of splash image within the FIT shall be +specified by the environment variable "splashfile". + +In case the environment variable "splashfile" is not defined the default name +'splash.bmp' will be used. |