diff options
| author | Tom Rini <trini@konsulko.com> | 2016-07-27 15:22:21 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-07-27 15:22:21 -0400 |
| commit | c6f086ddcbfb47918b82f6a135c61f432540da42 (patch) | |
| tree | 0482b02162e5dbc71e5c43ebda54ff3c4adec7ca /common | |
| parent | 0b6699ad8ea95803d7ce40d1dc1caea902a6d22c (diff) | |
| parent | b6de2cd7ee5af536ae67ab5522b69e5c4925f5f2 (diff) | |
| download | u-boot-imx-c6f086ddcbfb47918b82f6a135c61f432540da42.zip u-boot-imx-c6f086ddcbfb47918b82f6a135c61f432540da42.tar.gz u-boot-imx-c6f086ddcbfb47918b82f6a135c61f432540da42.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-video
Diffstat (limited to 'common')
| -rw-r--r-- | common/splash.c | 30 | ||||
| -rw-r--r-- | common/splash_source.c | 6 |
2 files changed, 34 insertions, 2 deletions
diff --git a/common/splash.c b/common/splash.c index 561d35b..89af437 100644 --- a/common/splash.c +++ b/common/splash.c @@ -24,9 +24,37 @@ #include <splash.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) { - return 0; + return splash_source_load(default_splash_locations, + ARRAY_SIZE(default_splash_locations)); } #ifdef CONFIG_SPLASH_SCREEN_ALIGN diff --git a/common/splash_source.c b/common/splash_source.c index 914f12f..230b2db 100644 --- a/common/splash_source.c +++ b/common/splash_source.c @@ -146,7 +146,11 @@ static int splash_init_usb(void) if (err) return err; - return usb_stor_scan(1) < 0 ? -ENODEV : 0; +#ifndef CONFIG_DM_USB + err = usb_stor_scan(1) < 0 ? -ENODEV : 0; +#endif + + return err; } #else static inline int splash_init_usb(void) |