X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=common%2Fsplash.c;h=d251b3b6547018f75faca2da742e89edd53af319;hb=67a2616af18bbb38905b90ed1c6b66659671e1da;hp=561d35b4e41f9072d84e430d028e92ec8aecd8c3;hpb=0dac731d1932027f4f813ec7aede35d5e30dec0e;p=u-boot

diff --git a/common/splash.c b/common/splash.c
index 561d35b4e4..d251b3b654 100644
--- a/common/splash.c
+++ b/common/splash.c
@@ -24,15 +24,43 @@
 #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
 void splash_get_pos(int *x, int *y)
 {
-	char *s = getenv("splashpos");
+	char *s = env_get("splashpos");
 
 	if (!s)
 		return;