V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

splash: Introduce default_splash_locations 

This change introduces default_splash_locations which
simplifies splash recovery from the first partition of
USB/MMC/SATA drive.

Given usual mapping of the first partition of external media for
basic boot stuff like uImage/zImage, .dtb etc it looks quite
obvious option to put there splash.bmp as well.

Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
Cc: Nikita Kiryanov <nikita@compulab.co.il>
Cc: Simon Glass <sjg@chromium.org>
Cc: Jeroen Hofstee <jeroen@myspectrum.nl>
Signed-off-by: Anatolij Gustschin <agust@denx.de>
This commit is contained in:
Alexey Brodkin 2016-07-01 22:48:16 +03:00 committed by Anatolij Gustschin
parent d7b60fbfa6
commit b6de2cd7ee
2 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
common/splash.c
View File

@ -24,9 +24,37 @@
#include <splash.h> #include <splash.h>
#include <lcd.h> #include <lcd.h>
static struct splash_location default_splash_locations[] = {
{
.name = "sf",
.storage = SPLASH_STORAGE_SF,
.flags = SPLASH_STORAGE_RAW,
.offset = 0x0,
},
{
.name = "mmc_fs",
.storage = SPLASH_STORAGE_MMC,
.flags = SPLASH_STORAGE_FS,
.devpart = "0:1",
},
{
.name = "usb_fs",
.storage = SPLASH_STORAGE_USB,
.flags = SPLASH_STORAGE_FS,
.devpart = "0:1",
},
{
.name = "sata_fs",
.storage = SPLASH_STORAGE_SATA,
.flags = SPLASH_STORAGE_FS,
.devpart = "0:1",
},
};
__weak int splash_screen_prepare(void) __weak int splash_screen_prepare(void)
{ {
return 0; return splash_source_load(default_splash_locations,
ARRAY_SIZE(default_splash_locations));
} }
#ifdef CONFIG_SPLASH_SCREEN_ALIGN #ifdef CONFIG_SPLASH_SCREEN_ALIGN

9
include/splash.h
View File

@ -47,7 +47,16 @@ struct splash_location {
char *ubivol; /* UBI volume-name for ubifsmount */ char *ubivol; /* UBI volume-name for ubifsmount */
}; };
#ifdef CONFIG_SPLASH_SOURCE
int splash_source_load(struct splash_location *locations, uint size); int splash_source_load(struct splash_location *locations, uint size);
#else
static inline int splash_source_load(struct splash_location *locations,
uint size)
{
return 0;
}
#endif
int splash_screen_prepare(void); int splash_screen_prepare(void);
#ifdef CONFIG_SPLASH_SCREEN_ALIGN #ifdef CONFIG_SPLASH_SCREEN_ALIGN