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 2b9313e..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,7 +53,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>
 
@@ -65,7 +66,7 @@ static int splash_video_logo_load(void)
        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;
@@ -162,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;