diff options
| author | Che-Liang Chiou <clchiou@chromium.org> | 2011-10-20 23:04:20 +0000 |
|---|---|---|
| committer | Anatolij Gustschin <agust@denx.de> | 2011-11-15 23:58:26 +0100 |
| commit | c270730f580e85ddab82e981abf8a518f78ae803 (patch) | |
| tree | 7f21f57ea70f8629a7c3339a8690dc04645b109b /drivers/video/cfb_console.c | |
| parent | 02110903a83539da35cf6b1bbd853ce0351f7c95 (diff) | |
| download | u-boot-imx-c270730f580e85ddab82e981abf8a518f78ae803.zip u-boot-imx-c270730f580e85ddab82e981abf8a518f78ae803.tar.gz u-boot-imx-c270730f580e85ddab82e981abf8a518f78ae803.tar.bz2 | |
tools: logo: split bmp arrays from bmp_logo.h
The generated header bmp_logo.h is useful even outside common/lcd.c for
the logo dimension. However, the problem is, the generated bmp_logo.h
cannot be included multiple times because bmp_logo_palette[] and
bmp_logo_bitmap[] are defined in the bmp_logo.h.
This patch fixes this by defining these arrays in another header
bmp_logo_data.h and in bmp_logo.h only declaring these arrays.
Signed-off-by: Che-Liang Chiou <clchiou@chromium.org>
Acked-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Anatolij Gustschin <agust@denx.de>
Diffstat (limited to 'drivers/video/cfb_console.c')
| -rw-r--r-- | drivers/video/cfb_console.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c index 561883a..4b9346a 100644 --- a/drivers/video/cfb_console.c +++ b/drivers/video/cfb_console.c @@ -286,6 +286,7 @@ void console_cursor(int state); #ifdef CONFIG_VIDEO_LOGO #ifdef CONFIG_VIDEO_BMP_LOGO #include <bmp_logo.h> +#include <bmp_logo_data.h> #define VIDEO_LOGO_WIDTH BMP_LOGO_WIDTH #define VIDEO_LOGO_HEIGHT BMP_LOGO_HEIGHT #define VIDEO_LOGO_LUT_OFFSET BMP_LOGO_OFFSET |