From c270730f580e85ddab82e981abf8a518f78ae803 Mon Sep 17 00:00:00 2001 From: Che-Liang Chiou Date: Thu, 20 Oct 2011 23:04:20 +0000 Subject: 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 Acked-by: Mike Frysinger Signed-off-by: Anatolij Gustschin --- common/lcd.c | 1 + 1 file changed, 1 insertion(+) (limited to 'common/lcd.c') diff --git a/common/lcd.c b/common/lcd.c index 20e97b9d25..504b8f6684 100644 --- a/common/lcd.c +++ b/common/lcd.c @@ -63,6 +63,7 @@ /************************************************************************/ #ifdef CONFIG_LCD_LOGO # include /* Get logo data, width and height */ +# include # if (CONSOLE_COLOR_WHITE >= BMP_LOGO_OFFSET) && (LCD_BPP != LCD_COLOR16) # error Default Color Map overlaps with Logo Color Map # endif -- cgit v1.2.1