diff --git a/common/splash.c b/common/splash.c
index 6820db683b..2e4c3fa070 100644
--- a/common/splash.c
+++ b/common/splash.c
@@ -164,15 +164,15 @@ int splash_display(void)
 	int x = 0, y = 0, ret;
 	if (!CONFIG_IS_ENABLED(SPLASH_SCREEN))
 		return -ENOSYS;
+	ret = splash_screen_prepare();
+	if (ret)
+		return ret;
+
 	s = env_get("splashimage");
 	if (!s)
 		return -EINVAL;
 
 	addr = hextoul(s, NULL);
-	ret = splash_screen_prepare();
-	if (ret)
-		return ret;
-
 	splash_get_pos(&x, &y);
 
 	if (CONFIG_IS_ENABLED(BMP))
diff --git a/common/stdio.c b/common/stdio.c
index e3354f092d..19b99b2e6f 100644
--- a/common/stdio.c
+++ b/common/stdio.c
@@ -352,7 +352,7 @@ int stdio_add_devices(void)
 			}
 		}
 		if (IS_ENABLED(CONFIG_SPLASH_SCREEN) &&
-		    IS_ENABLED(CONFIG_CMD_BMP))
+		    IS_ENABLED(CONFIG_BMP))
 			splash_display();
 	}