Browse Source

Merge branch 'CR_4094_evb_515_uboot_logo_keith.zhao' into 'jh7110-master'

CR_4094 display: update uboot logo display function:

See merge request sdk/u-boot!42
andy.hu 1 year ago
parent
commit
6be2d0ba53

+ 2 - 1
board/starfive/evb/starfive_evb.c

@@ -18,6 +18,7 @@
 #include <asm/arch/gpio.h>
 #include <bmp_logo.h>
 #include <video.h>
+#include <splash.h>
 
 enum chip_type_t {
 	CHIP_A = 0,
@@ -318,7 +319,7 @@ int board_late_init(void)
 	if (ret)
 		return ret;
 
-	ret = video_bmp_display(dev, (ulong)&bmp_logo_bitmap[0], 0, 0, false);
+	ret = video_bmp_display(dev, (ulong)&bmp_logo_bitmap[0], BMP_ALIGN_CENTER, BMP_ALIGN_CENTER, true);
 	if (ret)
 		goto err;
 

+ 4 - 0
include/configs/starfive-evb.h

@@ -202,5 +202,9 @@
 
 #define CONFIG_VIDEO_BMP_LOGO
 #define CONFIG_VIDEO_LOGO
+#define CONFIG_BMP_16BPP
+#define CONFIG_BMP_24BPP
+#define CONFIG_BMP_32BPP
+
 #endif /* _STARFIVE_EVB_H */
 

+ 7 - 1
include/configs/starfive-visionfive.h

@@ -141,5 +141,11 @@
 #define memcpy_fromio(a, c, l)	memcpy((a), (c), (l))
 #define memcpy_toio(c, a, l)	memcpy((c), (a), (l))
 
-#endif /* _STARFIVE_VISIONFIVE_H */
+#define CONFIG_VIDEO_BMP_LOGO
+#define CONFIG_VIDEO_LOGO
+#define CONFIG_BMP_16BPP
+#define CONFIG_BMP_24BPP
+#define CONFIG_BMP_32BPP
+
+#endif /* _STARFIVE_EVB_H */
 

BIN
tools/logos/starfive.bmp