diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-11-16 20:44:03 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-11-16 20:44:03 +0100 |
| commit | 9dfa8da709a1589d177d99c597d9b18d8c9a145d (patch) | |
| tree | e5f42ab6c6bcfffd17eb60306ffad2c0567dac6f /tools/Makefile | |
| parent | 0c2dd9a05bdcf3b2b4880509ec690116873fe158 (diff) | |
| parent | a2a5729fc1247bb45d794e9d731c0b03bf58096f (diff) | |
| download | blackbird-obmc-uboot-9dfa8da709a1589d177d99c597d9b18d8c9a145d.tar.gz blackbird-obmc-uboot-9dfa8da709a1589d177d99c597d9b18d8c9a145d.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-video
* 'master' of git://git.denx.de/u-boot-video:
api: export LCD device to external apps
font: split font data from video_font.h
tools: logo: split bmp arrays from bmp_logo.h
lcd: add clear and draw bitmap declaration
VIDEO: mx3fb: GCC4.6 fix build warnings
Powerpc/DIU: Fixed the 800x600 and 1024x768 resolution bug
Diffstat (limited to 'tools/Makefile')
| -rw-r--r-- | tools/Makefile | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tools/Makefile b/tools/Makefile index ca93156b2a..bd0e0ce0b2 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -113,8 +113,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 @@ -242,7 +245,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) > $@ ######################################################################### |
