summaryrefslogtreecommitdiff
path: root/common/lcd.c
diff options
context:
space:
mode:
authorChe-Liang Chiou <clchiou@chromium.org>2011-10-20 23:04:20 +0000
committerAnatolij Gustschin <agust@denx.de>2011-11-15 23:58:26 +0100
commitc270730f580e85ddab82e981abf8a518f78ae803 (patch)
tree7f21f57ea70f8629a7c3339a8690dc04645b109b /common/lcd.c
parent02110903a83539da35cf6b1bbd853ce0351f7c95 (diff)
downloadu-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 'common/lcd.c')
-rw-r--r--common/lcd.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/common/lcd.c b/common/lcd.c
index 20e97b9..504b8f6 100644
--- a/common/lcd.c
+++ b/common/lcd.c
@@ -63,6 +63,7 @@
/************************************************************************/
#ifdef CONFIG_LCD_LOGO
# include <bmp_logo.h> /* Get logo data, width and height */
+# include <bmp_logo_data.h>
# if (CONSOLE_COLOR_WHITE >= BMP_LOGO_OFFSET) && (LCD_BPP != LCD_COLOR16)
# error Default Color Map overlaps with Logo Color Map
# endif