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>

diff --git a/Makefile b/Makefile
index 294c76201f808aa45c1b13f35e991497251908a3..938df4e23baea2d718bd6893890bc4b1f2dfd99b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -763,6 +763,7 @@ clean:
               $(obj)arch/blackfin/cpu/bootrom-asm-offsets.[chs]          \
               $(obj)arch/blackfin/cpu/init.{lds,elf}
        @rm -f $(obj)include/bmp_logo.h
+       @rm -f $(obj)include/bmp_logo_data.h
        @rm -f $(obj)lib/asm-offsets.s
        @rm -f $(obj)include/generated/asm-offsets.h
        @rm -f $(obj)$(CPUDIR)/$(SOC)/asm-offsets.s

diff --git a/common/lcd.c b/common/lcd.c
index 20e97b9d250847f87e88934380c35f6d1d453850..504b8f6684ef0e4d80233426b6675a86c4a2aad9 100644 (file)
--- 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

diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c
index 561883a1fc2f8e78450333c7c77b926214b253ce..4b9346aa5462fc2bd6d6cbe3ff45c7a426195a45 100644 (file)
--- 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

diff --git a/include/.gitignore b/include/.gitignore
index ec224c545c5d0924c4ed71579f3c8dc4557fbea3..7cd3e907002a5c909ce91bb8605619a986f628d7 100644 (file)
--- a/include/.gitignore
+++ b/include/.gitignore
@@ -1,5 +1,6 @@
 /autoconf.mk*
 /asm
 /bmp_logo.h
+/bmp_logo_data.h
 /config.h
 /config.mk

diff --git a/tools/Makefile b/tools/Makefile
index df56a250b3e6c84f2fc93650573c867056f6062e..948ec190c672b619411f3c62c7c6b7940a112015 100644 (file)
--- 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) > $@
 
 #########################################################################
 

diff --git a/tools/bmp_logo.c b/tools/bmp_logo.c
index 47228d255b344a755790f7cfdcbe6e27246cea86..b2ad3d592768747ae0eed5bda884272a58bc47b7 100644 (file)
--- a/tools/bmp_logo.c
+++ b/tools/bmp_logo.c
@@ -1,5 +1,10 @@
 #include "compiler.h"
 
+enum {
+       MODE_GEN_INFO,
+       MODE_GEN_DATA
+};
+
 typedef struct bitmap_s {              /* bitmap description */
        uint16_t width;
        uint16_t height;
@@ -9,6 +14,11 @@ typedef struct bitmap_s {             /* bitmap description */
 
 #define DEFAULT_CMAP_SIZE      16      /* size of default color map    */
 
+void usage(const char *prog)
+{
+       fprintf(stderr, "Usage: %s [--gen-info|--gen-data] file\n", prog);
+}
+
 /*
  * Neutralize little endians.
  */
@@ -39,21 +49,52 @@ int error (char * msg, FILE *fp)
        exit (EXIT_FAILURE);
 }
 
+void gen_info(bitmap_t *b, uint16_t n_colors)
+{
+       printf("/*\n"
+               " * Automatically generated by \"tools/bmp_logo\"\n"
+               " *\n"
+               " * DO NOT EDIT\n"
+               " *\n"
+               " */\n\n\n"
+               "#ifndef __BMP_LOGO_H__\n"
+               "#define __BMP_LOGO_H__\n\n"
+               "#define BMP_LOGO_WIDTH\t\t%d\n"
+               "#define BMP_LOGO_HEIGHT\t\t%d\n"
+               "#define BMP_LOGO_COLORS\t\t%d\n"
+               "#define BMP_LOGO_OFFSET\t\t%d\n\n"
+               "extern unsigned short bmp_logo_palette[];\n"
+               "extern unsigned char bmp_logo_bitmap[];\n\n"
+               "#endif /* __BMP_LOGO_H__ */\n",
+               b->width, b->height, n_colors,
+               DEFAULT_CMAP_SIZE);
+}
+
 int main (int argc, char *argv[])
 {
-       int     i, x;
+       int     mode, i, x;
        FILE    *fp;
        bitmap_t bmp;
        bitmap_t *b = &bmp;
        uint16_t data_offset, n_colors;
 
-       if (argc < 2) {
-               fprintf (stderr, "Usage: %s file\n", argv[0]);
+       if (argc < 3) {
+               usage(argv[0]);
                exit (EXIT_FAILURE);
        }
 
-       if ((fp = fopen (argv[1], "rb")) == NULL) {
-               perror (argv[1]);
+       if (!strcmp(argv[1], "--gen-info"))
+               mode = MODE_GEN_INFO;
+       else if (!strcmp(argv[1], "--gen-data"))
+               mode = MODE_GEN_DATA;
+       else {
+               usage(argv[0]);
+               exit(EXIT_FAILURE);
+       }
+
+       fp = fopen(argv[2], "rb");
+       if (!fp) {
+               perror(argv[2]);
                exit (EXIT_FAILURE);
        }
 
@@ -92,28 +133,26 @@ int main (int argc, char *argv[])
                n_colors = 256 - DEFAULT_CMAP_SIZE;
        }
 
-       printf ("/*\n"
+       if (mode == MODE_GEN_INFO) {
+               gen_info(b, n_colors);
+               goto out;
+       }
+
+       printf("/*\n"
                " * Automatically generated by \"tools/bmp_logo\"\n"
                " *\n"
                " * DO NOT EDIT\n"
                " *\n"
                " */\n\n\n"
-               "#ifndef __BMP_LOGO_H__\n"
-               "#define __BMP_LOGO_H__\n\n"
-               "#define BMP_LOGO_WIDTH\t\t%d\n"
-               "#define BMP_LOGO_HEIGHT\t\t%d\n"
-               "#define BMP_LOGO_COLORS\t\t%d\n"
-               "#define BMP_LOGO_OFFSET\t\t%d\n"
-               "\n",
-               b->width, b->height, n_colors,
-               DEFAULT_CMAP_SIZE);
+               "#ifndef __BMP_LOGO_DATA_H__\n"
+               "#define __BMP_LOGO_DATA_H__\n\n");
 
        /* allocate memory */
        if ((b->data = (uint8_t *)malloc(b->width * b->height)) == NULL)
                error ("Error allocating memory for file", fp);
 
        /* read and print the palette information */
-       printf ("unsigned short bmp_logo_palette[] = {\n");
+       printf("unsigned short bmp_logo_palette[] = {\n");
 
        for (i=0; i<n_colors; ++i) {
                b->palette[(int)(i*3+2)] = fgetc(fp);
@@ -137,14 +176,13 @@ int main (int argc, char *argv[])
        printf ("\n");
        printf ("};\n");
        printf ("\n");
-       printf ("unsigned char bmp_logo_bitmap[] = {\n");
+       printf("unsigned char bmp_logo_bitmap[] = {\n");
        for (i=(b->height-1)*b->width; i>=0; i-=b->width) {
                for (x = 0; x < b->width; x++) {
                        b->data[(uint16_t) i + x] = (uint8_t) fgetc (fp) \
                                                + DEFAULT_CMAP_SIZE;
                }
        }
-       fclose (fp);
 
        for (i=0; i<(b->height*b->width); ++i) {
                if ((i%8) == 0)
@@ -156,8 +194,10 @@ int main (int argc, char *argv[])
        }
        printf ("\n"
                "};\n\n"
-               "#endif /* __BMP_LOGO_H__ */\n"
+               "#endif /* __BMP_LOGO_DATA_H__ */\n"
        );
 
-       return (0);
+out:
+       fclose(fp);
+       return 0;
 }