diff options
| author | Anatolij Gustschin <agust@denx.de> | 2018-12-01 15:30:08 +0100 |
|---|---|---|
| committer | Anatolij Gustschin <agust@denx.de> | 2018-12-04 19:47:20 +0100 |
| commit | 96d82f6c860e3f7ce5c301a3d4fc5541b2ce713e (patch) | |
| tree | 0c9ab61dc0bf22d78f52380b1ec35da0d325696b | |
| parent | b0fcedb7ad5ccdb7e56ffebecd054059e9e1123e (diff) | |
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>
| -rw-r--r-- | common/lcd.c | 1 | ||||
| -rw-r--r-- | drivers/video/video_bmp.c | 3 |
2 files changed, 1 insertions, 3 deletions
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 * |