ARM: renesas: Drop unused mmc.h

[pandora-u-boot.git] / common / splash.c

diff --git a/common/splash.c b/common/splash.c
index de720df..6820db6 100644 (file)
--- a/common/splash.c
+++ b/common/splash.c
@@ -21,9 +21,10 @@
  */
 
 #include <common.h>
+#include <display_options.h>
 #include <env.h>
 #include <splash.h>
-#include <lcd.h>
+#include <video.h>
 
 static struct splash_location default_splash_locations[] = {
        {
@@ -38,6 +39,12 @@ static struct splash_location default_splash_locations[] = {
                .flags = SPLASH_STORAGE_FS,
                .devpart = "0:1",
        },
+       {
+               .name = "mmc_raw",
+               .storage = SPLASH_STORAGE_MMC,
+               .flags = SPLASH_STORAGE_RAW,
+               .devpart = "0:1",
+       },
        {
                .name = "usb_fs",
                .storage = SPLASH_STORAGE_USB,
@@ -52,7 +59,7 @@ static struct splash_location default_splash_locations[] = {
        },
 };
 
-#if defined(CONFIG_DM_VIDEO) && defined(CONFIG_VIDEO_LOGO)
+#ifdef CONFIG_VIDEO_LOGO
 
 #include <bmp_logo_data.h>
 
@@ -89,12 +96,11 @@ __weak int splash_screen_prepare(void)
        return splash_video_logo_load();
 }
 
-#ifdef CONFIG_SPLASH_SCREEN_ALIGN
 void splash_get_pos(int *x, int *y)
 {
        char *s = env_get("splashpos");
 
-       if (!s)
+       if (!CONFIG_IS_ENABLED(SPLASH_SCREEN_ALIGN) || !s)
                return;
 
        if (s[0] == 'm')
@@ -110,9 +116,8 @@ void splash_get_pos(int *x, int *y)
                        *y = simple_strtol(s + 1, NULL, 0);
        }
 }
-#endif /* CONFIG_SPLASH_SCREEN_ALIGN */
 
-#if defined(CONFIG_DM_VIDEO) && !defined(CONFIG_HIDE_LOGO_VERSION)
+#if CONFIG_IS_ENABLED(VIDEO) && !CONFIG_IS_ENABLED(HIDE_LOGO_VERSION)
 
 #ifdef CONFIG_VIDEO_LOGO
 #include <bmp_logo.h>
@@ -120,9 +125,11 @@ void splash_get_pos(int *x, int *y)
 #include <dm.h>
 #include <video_console.h>
 #include <video_font.h>
+#include <video_font_data.h>
 
 void splash_display_banner(void)
 {
+       struct video_fontdata __maybe_unused *fontdata = fonts;
        struct udevice *dev;
        char buf[DISPLAY_OPTIONS_BANNER_LENGTH];
        int col, row, ret;
@@ -131,9 +138,9 @@ void splash_display_banner(void)
        if (ret)
                return;
 
-#ifdef CONFIG_VIDEO_LOGO
-       col = BMP_LOGO_WIDTH / VIDEO_FONT_WIDTH + 1;
-       row = BMP_LOGO_HEIGHT / VIDEO_FONT_HEIGHT + 1;
+#if IS_ENABLED(CONFIG_VIDEO_LOGO)
+       col = BMP_LOGO_WIDTH / fontdata->width + 1;
+       row = BMP_LOGO_HEIGHT / fontdata->height + 1;
 #else
        col = 0;
        row = 0;
@@ -144,20 +151,19 @@ void splash_display_banner(void)
        vidconsole_put_string(dev, buf);
        vidconsole_position_cursor(dev, 0, row);
 }
-#endif /* CONFIG_DM_VIDEO && !CONFIG_HIDE_LOGO_VERSION */
+#endif /* CONFIG_VIDEO && !CONFIG_HIDE_LOGO_VERSION */
 
 /*
  * Common function to show a splash image if env("splashimage") is set.
- * Is used for both dm_video and lcd video stacks. For additional
- * details please refer to doc/README.splashprepare.
+ * For additional details please refer to doc/README.splashprepare.
  */
-#if defined(CONFIG_SPLASH_SCREEN) && defined(CONFIG_CMD_BMP)
 int splash_display(void)
 {
        ulong addr;
        char *s;
        int x = 0, y = 0, ret;
-
+       if (!CONFIG_IS_ENABLED(SPLASH_SCREEN))
+               return -ENOSYS;
        s = env_get("splashimage");
        if (!s)
                return -EINVAL;
@@ -169,16 +175,18 @@ int splash_display(void)
 
        splash_get_pos(&x, &y);
 
-       ret = bmp_display(addr, x, y);
+       if (CONFIG_IS_ENABLED(BMP))
+               ret = bmp_display(addr, x, y);
+       else
+               return -ENOSYS;
 
        /* Skip banner output on video console if the logo is not at 0,0 */
        if (x || y)
                goto end;
 
-#if defined(CONFIG_DM_VIDEO) && !defined(CONFIG_HIDE_LOGO_VERSION)
+#if CONFIG_IS_ENABLED(VIDEO) && !CONFIG_IS_ENABLED(HIDE_LOGO_VERSION)
        splash_display_banner();
 #endif
 end:
        return ret;
 }
-#endif