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 --- common/lcd.c | 1 - drivers/video/video_bmp.c | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/common/lcd.c b/common/lcd.c index 2e2bef3848..bd3e1c2846 100644 --- a/common/lcd.c +++ b/common/lcd.c @@ -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) 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 *