Fix sunxi uboot redefined warnings on "CONFIG_VIDEO_*"

- wrap CONFIG_VIDEO definitions with if !defined pattern
This commit is contained in:
Markus Hoffrogge
2023-03-21 21:52:43 +01:00
committed by Igor Pečovnik
parent 07f4f48727
commit 4271d7a17f

View File

@@ -45,19 +45,33 @@ diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index 958b850d..c4f34dbf 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -223,6 +223,16 @@ extern int soft_i2c_gpio_scl;
@@ -223,6 +223,30 @@ extern int soft_i2c_gpio_scl;
#define CONFIG_VIDEO_LCD_I2C_BUS -1 /* NA, but necessary to compile */
#endif
+#if defined CONFIG_VIDEO || defined CONFIG_DM_VIDEO
+#if !defined CONFIG_VIDEO_LOGO
+#define CONFIG_VIDEO_LOGO
+#endif
+#if !defined CONFIG_SPLASH_SCREEN
+#define CONFIG_SPLASH_SCREEN
+#endif
+#if !defined CONFIG_SPLASH_SCREEN_ALIGN
+#define CONFIG_SPLASH_SCREEN_ALIGN
+#endif
+#if !defined CONFIG_BMP_16BPP
+#define CONFIG_BMP_16BPP
+#endif
+#if !defined CONFIG_BMP_24BPP
+#define CONFIG_BMP_24BPP
+#endif
+#if !defined CONFIG_BMP_32BPP
+#define CONFIG_BMP_32BPP
+#endif
+#if !defined CONFIG_VIDEO_BMP_RLE8
+#define CONFIG_VIDEO_BMP_RLE8
+#endif
+#endif
+
/* Ethernet support */