summaryrefslogtreecommitdiff
path: root/tools/Makefile
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 /tools/Makefile
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 'tools/Makefile')
-rw-r--r--tools/Makefile8
1 files changed, 7 insertions, 1 deletions
diff --git a/tools/Makefile b/tools/Makefile
index df56a25..948ec19 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -111,8 +111,11 @@ LIBFDT_OBJ_FILES-y += fdt_wip.o
# Generated LCD/video logo
LOGO_H = $(OBJTREE)/include/bmp_logo.h
+LOGO_DATA_H = $(OBJTREE)/include/bmp_logo_data.h
LOGO-$(CONFIG_LCD_LOGO) += $(LOGO_H)
+LOGO-$(CONFIG_LCD_LOGO) += $(LOGO_DATA_H)
LOGO-$(CONFIG_VIDEO_LOGO) += $(LOGO_H)
+LOGO-$(CONFIG_VIDEO_LOGO) += $(LOGO_DATA_H)
ifeq ($(LOGO_BMP),)
LOGO_BMP= logos/denx.bmp
@@ -236,7 +239,10 @@ else
endif
$(LOGO_H): $(obj)bmp_logo $(LOGO_BMP)
- $(obj)./bmp_logo $(LOGO_BMP) >$@
+ $(obj)./bmp_logo --gen-info $(LOGO_BMP) > $@
+
+$(LOGO_DATA_H): $(obj)bmp_logo $(LOGO_BMP)
+ $(obj)./bmp_logo --gen-data $(LOGO_BMP) > $@
#########################################################################