blk: Rename if_type to uclass_id

[platform/kernel/u-boot.git] / common / splash.c

diff --git a/common/splash.c b/common/splash.c
index 0bcedbb..0e520cc 100644 (file)
--- a/common/splash.c
+++ b/common/splash.c
@@ -21,6 +21,7 @@
  */
 
 #include <common.h>
+#include <display_options.h>
 #include <env.h>
 #include <splash.h>
 #include <lcd.h>
@@ -52,20 +53,20 @@ 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>
 
 static int splash_video_logo_load(void)
 {
        char *splashimage;
-       u32 bmp_load_addr;
+       ulong bmp_load_addr;
 
        splashimage = env_get("splashimage");
        if (!splashimage)
                return -ENOENT;
 
-       bmp_load_addr = simple_strtoul(splashimage, 0, 16);
+       bmp_load_addr = hextoul(splashimage, 0);
        if (!bmp_load_addr) {
                printf("Error: bad 'splashimage' address\n");
                return -EFAULT;
@@ -144,8 +145,6 @@ void splash_display_banner(void)
        vidconsole_put_string(dev, buf);
        vidconsole_position_cursor(dev, 0, row);
 }
-#else
-static inline void splash_display_banner(void) { }
 #endif /* CONFIG_DM_VIDEO && !CONFIG_HIDE_LOGO_VERSION */
 
 /*
@@ -164,7 +163,7 @@ int splash_display(void)
        if (!s)
                return -EINVAL;
 
-       addr = simple_strtoul(s, NULL, 16);
+       addr = hextoul(s, NULL);
        ret = splash_screen_prepare();
        if (ret)
                return ret;
@@ -177,7 +176,9 @@ int splash_display(void)
        if (x || y)
                goto end;
 
+#if defined(CONFIG_DM_VIDEO) && !defined(CONFIG_HIDE_LOGO_VERSION)
        splash_display_banner();
+#endif
 end:
        return ret;
 }