video: use BMP_ALIGN_CENTER define from splash.h

PATCH New Anatolij Gustschin 1 participant 2 messages Dec 1, 2018 – Dec 4, 2018 Framebuffer layer

Share & tools

Anatolij Gustschin

author

2018-12-01 14:30 UTC #0 lore raw

PATCH 1/1 video: use BMP_ALIGN_CENTER define from splash.h

Drop BMP_ALIGN_CENTER define in lcd.c and video_bmp.c as it is already defined by splash.h. Include splash.h in bmp code.

Signed-off-by Anatolij Gustschin <[email protected]>

---
 common/lcd.c              | 1 -
 drivers/video/video_bmp.c | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

common/lcd.c +0 -1

index 2e2bef3848..bd3e1c2846 100644
@@ -389,7 +389,6 @@ static inline void lcd_logo_plot(int x, int y) {}
 
 #if defined(CONFIG_CMD_BMP) || defined(CONFIG_SPLASH_SCREEN)
 #ifdef CONFIG_SPLASH_SCREEN_ALIGN
-#define BMP_ALIGN_CENTER	0x7FFF
 
 static void splash_align_axis(int *axis, unsigned long panel_size,
 					unsigned long picture_size)

drivers/video/video_bmp.c +1 -2

index 1377e19081..2898b0b55d 100644
@@ -7,6 +7,7 @@
 #include <bmp_layout.h>
 #include <dm.h>
 #include <mapmem.h>
+#include <splash.h>
 #include <video.h>
 #include <watchdog.h>
 #include <asm/unaligned.h>

@@ -140,8 +141,6 @@ __weak void fb_put_word(uchar **fb, uchar **from)
 }
 #endif /* CONFIG_BMP_16BPP */
 
-#define BMP_ALIGN_CENTER	0x7fff
-
 /**
  * video_splash_align_axis() - Align a single coordinate
  *

Signature · 1 line

2.17.1

Anatolij Gustschin

author

2018-12-04 18:55 UTC #1 lore raw

PATCH 1/1 video: use BMP_ALIGN_CENTER define from splash.h

Quoted 8 lines · On Sat, 1 Dec 2018 15:30:08 +0100 Anatolij Gustschin agust at denx.de wrote:

Drop BMP_ALIGN_CENTER define in lcd.c and video_bmp.c as it is already defined by splash.h. Include splash.h in bmp code.
Signed-off-by Anatolij Gustschin <[email protected]>
---
 common/lcd.c              | 1 -
 drivers/video/video_bmp.c | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

Applied to u-boot-video/master, thanks!

--
Anatolij