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 <agust@denx.de>

diff --git a/common/lcd.c b/common/lcd.c
index 74407a17e97793a5e54f23d5991f94f72793bb19..cd630405d44a3345438e88787b602d7a7e822b26 100644 (file)
--- a/common/lcd.c
+++ b/common/lcd.c
@@ -381,7 +381,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)

diff --git a/drivers/video/video_bmp.c b/drivers/video/video_bmp.c
index 1377e190817dfb95bb03f450e60337daaf9f2feb..2898b0b55d759492d5b3a6379d357acdf615dbb0 100644 (file)
--- a/drivers/video/video_bmp.c
+++ b/drivers/video/video_bmp.c
@@ -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
  *