From: Anatolij Gustschin <agust@denx.de>
Date: Sat, 1 Dec 2018 14:30:08 +0000 (+0100)
Subject: video: use BMP_ALIGN_CENTER define from splash.h
X-Git-Tag: baikal/mips/sdk5.9~1233^2
X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=c1fe3ebb3d8a8c0a048b9687395dd6ee185d1138;p=uboot.git

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 74407a17e9..cd630405d4 100644
--- 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 1377e19081..2898b0b55d 100644
--- 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
  *