common: board_f: Fix style violations

[people/ms/u-boot.git] / common / splash.c

diff --git a/common/splash.c b/common/splash.c
index 5cf52723a565980c19b744299c1e84ab58d635c0..d251b3b6547018f75faca2da742e89edd53af319 100644 (file)
--- a/common/splash.c
+++ b/common/splash.c
@@ -20,17 +20,77 @@
  *
  */
 
+#include <common.h>
 #include <splash.h>
-#include <config.h>
+#include <lcd.h>
 
-#ifdef CONFIG_SPLASH_SCREEN_PREPARE
-int splash_screen_prepare(void)
+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 board_splash_screen_prepare();
+       return splash_source_load(default_splash_locations,
+                                 ARRAY_SIZE(default_splash_locations));
 }
-#else
-int splash_screen_prepare(void)
+
+#ifdef CONFIG_SPLASH_SCREEN_ALIGN
+void splash_get_pos(int *x, int *y)
 {
-       return 0;
+       char *s = env_get("splashpos");
+
+       if (!s)
+               return;
+
+       if (s[0] == 'm')
+               *x = BMP_ALIGN_CENTER;
+       else
+               *x = simple_strtol(s, NULL, 0);
+
+       s = strchr(s + 1, ',');
+       if (s != NULL) {
+               if (s[1] == 'm')
+                       *y = BMP_ALIGN_CENTER;
+               else
+                       *y = simple_strtol(s + 1, NULL, 0);
+       }
+}
+#endif /* CONFIG_SPLASH_SCREEN_ALIGN */
+
+#if defined(CONFIG_SPLASH_SCREEN) && defined(CONFIG_LCD)
+int lcd_splash(ulong addr)
+{
+       int x = 0, y = 0, ret;
+
+       ret = splash_screen_prepare();
+       if (ret)
+               return ret;
+
+       splash_get_pos(&x, &y);
+
+       return bmp_display(addr, x, y);
 }
 #endif