leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bmp_logo: support CONFIG_DM_VIDEO

Browse Source 
in case of bmp_logo, the video_bmp driver is used for
drawing a bmp logo. This driver supports only "full"
bmp data. Adding a logo with the bmp_logo tool to
u-boot binary adds currently only real data and drops
the bmp header.

This patch adds now the full bmp data to the u-boot
binary, so video_bmp driver works with the logo embedded
into u-boot.

Fixed also some checkpatch error poping up with this
patch.

Signed-off-by: Heiko Schocher <hs@denx.de>
This commit is contained in:
Heiko Schocher 2019-06-13 05:12:38 +02:00 committed by Anatolij Gustschin
parent 85288ffee6
commit 245b1029e1
2 changed files with 37 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/Makefile
View File

@ -269,8 +269,14 @@ __build: $(LOGO-y)
$(LOGO_H): $(obj)/bmp_logo $(LOGO_BMP) $(LOGO_H): $(obj)/bmp_logo $(LOGO_BMP)
$(obj)/bmp_logo --gen-info $(LOGO_BMP) > $@ $(obj)/bmp_logo --gen-info $(LOGO_BMP) > $@
ifeq ($(CONFIG_DM_VIDEO),y)
$(LOGO_DATA_H): $(obj)/bmp_logo $(LOGO_BMP)
$(obj)/bmp_logo --gen-bmp $(LOGO_BMP) > $@
else
$(LOGO_DATA_H): $(obj)/bmp_logo $(LOGO_BMP) $(LOGO_DATA_H): $(obj)/bmp_logo $(LOGO_BMP)
$(obj)/bmp_logo --gen-data $(LOGO_BMP) > $@ $(obj)/bmp_logo --gen-data $(LOGO_BMP) > $@
#endif
endif
# Let clean descend into subdirs # Let clean descend into subdirs
subdir- += env subdir- += env

34
tools/bmp_logo.c
View File

@ -2,7 +2,8 @@
enum { enum {
MODE_GEN_INFO, MODE_GEN_INFO,
MODE_GEN_DATA MODE_GEN_DATA,
MODE_GEN_BMP
}; };
typedef struct bitmap_s { /* bitmap description */ typedef struct bitmap_s { /* bitmap description */
@ -16,7 +17,8 @@ typedef struct bitmap_s { /* bitmap description */
void usage(const char *prog) void usage(const char *prog)
{ {
fprintf(stderr, "Usage: %s [--gen-info|--gen-data] file\n", prog); fprintf(stderr, "Usage: %s [--gen-info|--gen-data|--gen-bmp] file\n",
prog);
} }
/* /*
@ -73,6 +75,7 @@ void gen_info(bitmap_t *b, uint16_t n_colors)
int main (int argc, char *argv[]) int main (int argc, char *argv[])
{ {
int mode, i, x; int mode, i, x;
int size;
FILE *fp; FILE *fp;
bitmap_t bmp; bitmap_t bmp;
bitmap_t *b = &bmp; bitmap_t *b = &bmp;
@ -87,6 +90,8 @@ int main (int argc, char *argv[])
mode = MODE_GEN_INFO; mode = MODE_GEN_INFO;
else if (!strcmp(argv[1], "--gen-data")) else if (!strcmp(argv[1], "--gen-data"))
mode = MODE_GEN_DATA; mode = MODE_GEN_DATA;
else if (!strcmp(argv[1], "--gen-bmp"))
mode = MODE_GEN_BMP;
else { else {
usage(argv[0]); usage(argv[0]);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
@ -131,6 +136,7 @@ int main (int argc, char *argv[])
b->width = le_short(b->width); b->width = le_short(b->width);
b->height = le_short(b->height); b->height = le_short(b->height);
n_colors = le_short(n_colors); n_colors = le_short(n_colors);
size = b->width * b->height;
/* assume we are working with an 8-bit file */ /* assume we are working with an 8-bit file */
if ((n_colors == 0) || (n_colors > 256 - DEFAULT_CMAP_SIZE)) { if ((n_colors == 0) || (n_colors > 256 - DEFAULT_CMAP_SIZE)) {
@ -152,10 +158,6 @@ int main (int argc, char *argv[])
"#ifndef __BMP_LOGO_DATA_H__\n" "#ifndef __BMP_LOGO_DATA_H__\n"
"#define __BMP_LOGO_DATA_H__\n\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 */ /* read and print the palette information */
printf("unsigned short bmp_logo_palette[] = {\n"); printf("unsigned short bmp_logo_palette[] = {\n");
@ -175,21 +177,39 @@ int main (int argc, char *argv[])
} }
/* seek to offset indicated by file header */ /* seek to offset indicated by file header */
if (mode == MODE_GEN_BMP) {
/* copy full bmp file */
fseek(fp, 0L, SEEK_END);
size = ftell(fp);
fseek(fp, 0L, SEEK_SET);
} else {
fseek(fp, (long)data_offset, SEEK_SET); fseek(fp, (long)data_offset, SEEK_SET);
}
/* allocate memory */
b->data = (uint8_t *)malloc(size);
if (!b->data)
error("Error allocating memory for file", fp);
/* read the bitmap; leave room for default color map */ /* read the bitmap; leave room for default color map */
printf ("\n"); printf ("\n");
printf ("};\n"); printf ("};\n");
printf ("\n"); printf ("\n");
printf("unsigned char bmp_logo_bitmap[] = {\n"); printf("unsigned char bmp_logo_bitmap[] = {\n");
if (mode == MODE_GEN_BMP) {
/* write full bmp */
for (i = 0; i < size; i++)
b->data[i] = (uint8_t)fgetc(fp);
} else {
for (i = (b->height - 1) * b->width; i >= 0; i -= b->width) { for (i = (b->height - 1) * b->width; i >= 0; i -= b->width) {
for (x = 0; x < b->width; x++) { for (x = 0; x < b->width; x++) {
b->data[i + x] = (uint8_t)fgetc(fp) b->data[i + x] = (uint8_t)fgetc(fp)
+ DEFAULT_CMAP_SIZE; + DEFAULT_CMAP_SIZE;
} }
} }
}
for (i=0; i<(b->height*b->width); ++i) { for (i = 0; i < size; ++i) {
if ((i%8) == 0) if ((i%8) == 0)
putchar ('\t'); putchar ('\t');
printf ("0x%02X,%c", printf ("0x%02X,%c",