cfb_console: align fields in gzipped .bmp files

[karo-tx-uboot.git] / drivers / video / cfb_console.c

diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c
index e384b71401f8c144bd80e647460ea394a59971a2..b52e9edd25277c4b79acc7c7754ca1881530ada1 100644 (file)
--- a/drivers/video/cfb_console.c
+++ b/drivers/video/cfb_console.c
@@ -2,23 +2,7 @@
  * (C) Copyright 2002 ELTEC Elektronik AG
  * Frank Gottschling <fgottschling@eltec.de>
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /*
@@ -213,7 +197,6 @@
 #include <linux/types.h>
 #include <stdio_dev.h>
 #include <video_font.h>
-#include <video_font_data.h>
 
 #if defined(CONFIG_CMD_DATE)
 #include <rtc.h>
@@ -447,6 +430,16 @@ static const int video_font_draw_table32[16][4] = {
        {0x00ffffff, 0x00ffffff, 0x00ffffff, 0x00ffffff}
 };
 
+/*
+ * Implement a weak default function for boards that optionally
+ * need to skip the cfb initialization.
+ */
+__weak int board_cfb_skip(void)
+{
+       /* As default, don't skip cfb init */
+       return 0;
+}
+
 static void video_drawchars(int xx, int yy, unsigned char *s, int count)
 {
        u8 *cdat, *dest, *dest0;
@@ -468,6 +461,10 @@ static void video_drawchars(int xx, int yy, unsigned char *s, int count)
                                ((u32 *) dest)[0] =
                                        (video_font_draw_table8[bits >> 4] &
                                         eorx) ^ bgx;
+
+                               if (VIDEO_FONT_WIDTH == 4)
+                                       continue;
+
                                ((u32 *) dest)[1] =
                                        (video_font_draw_table8[bits & 15] &
                                         eorx) ^ bgx;
@@ -493,6 +490,10 @@ static void video_drawchars(int xx, int yy, unsigned char *s, int count)
                                        SHORTSWAP32((video_font_draw_table15
                                                     [bits >> 4 & 3] & eorx) ^
                                                    bgx);
+
+                               if (VIDEO_FONT_WIDTH == 4)
+                                       continue;
+
                                ((u32 *) dest)[2] =
                                        SHORTSWAP32((video_font_draw_table15
                                                     [bits >> 2 & 3] & eorx) ^
@@ -523,6 +524,10 @@ static void video_drawchars(int xx, int yy, unsigned char *s, int count)
                                        SHORTSWAP32((video_font_draw_table16
                                                     [bits >> 4 & 3] & eorx) ^
                                                    bgx);
+
+                               if (VIDEO_FONT_WIDTH == 4)
+                                       continue;
+
                                ((u32 *) dest)[2] =
                                        SHORTSWAP32((video_font_draw_table16
                                                     [bits >> 2 & 3] & eorx) ^
@@ -557,6 +562,11 @@ static void video_drawchars(int xx, int yy, unsigned char *s, int count)
                                ((u32 *) dest)[3] =
                                        SWAP32((video_font_draw_table32
                                                [bits >> 4][3] & eorx) ^ bgx);
+
+
+                               if (VIDEO_FONT_WIDTH == 4)
+                                       continue;
+
                                ((u32 *) dest)[4] =
                                        SWAP32((video_font_draw_table32
                                                [bits & 15][0] & eorx) ^ bgx);
@@ -592,6 +602,10 @@ static void video_drawchars(int xx, int yy, unsigned char *s, int count)
                                ((u32 *) dest)[2] =
                                        (video_font_draw_table24[bits >> 4][2]
                                         & eorx) ^ bgx;
+
+                               if (VIDEO_FONT_WIDTH == 4)
+                                       continue;
+
                                ((u32 *) dest)[3] =
                                        (video_font_draw_table24[bits & 15][0]
                                         & eorx) ^ bgx;
@@ -1459,7 +1473,11 @@ int video_display_bitmap(ulong bmp_image, int x, int y)
                        printf("Error: malloc in gunzip failed!\n");
                        return 1;
                }
-               if (gunzip(dst, CONFIG_SYS_VIDEO_LOGO_MAX_SIZE,
+               /*
+                * NB: we need to force offset of +2
+                * See doc/README.displaying-bmps
+                */
+               if (gunzip(dst+2, CONFIG_SYS_VIDEO_LOGO_MAX_SIZE-2,
                           (uchar *) bmp_image,
                           &len) != 0) {
                        printf("Error: no valid bmp or bmp.gz image at %lx\n",
@@ -1475,7 +1493,7 @@ int video_display_bitmap(ulong bmp_image, int x, int y)
                /*
                 * Set addr to decompressed image
                 */
-               bmp = (bmp_image_t *) dst;
+               bmp = (bmp_image_t *)(dst+2);
 
                if (!((bmp->header.signature[0] == 'B') &&
                      (bmp->header.signature[1] == 'M'))) {
@@ -2012,6 +2030,8 @@ static void *video_logo(void)
                return video_fb_address + video_logo_height * VIDEO_LINE_LEN;
        }
 #endif
+       if (board_cfb_skip())
+               return 0;
 
        sprintf(info, " %s", version_string);
 
@@ -2092,6 +2112,24 @@ defined(CONFIG_SANDBOX) || defined(CONFIG_X86)
        return 0;
 }
 
+void video_clear(void)
+{
+       if (!video_fb_address)
+               return;
+#ifdef VIDEO_HW_RECTFILL
+       video_hw_rectfill(VIDEO_PIXEL_SIZE,     /* bytes per pixel */
+                         0,                    /* dest pos x */
+                         0,                    /* dest pos y */
+                         VIDEO_VISIBLE_COLS,   /* frame width */
+                         VIDEO_VISIBLE_ROWS,   /* frame height */
+                         bgx                   /* fill color */
+       );
+#else
+       memsetl(video_fb_address,
+               (VIDEO_VISIBLE_ROWS * VIDEO_LINE_LEN) / sizeof(int), bgx);
+#endif
+}
+
 static int video_init(void)
 {
        unsigned char color8;
@@ -2178,6 +2216,8 @@ static int video_init(void)
        }
        eorx = fgx ^ bgx;
 
+       video_clear();
+
 #ifdef CONFIG_VIDEO_LOGO
        /* Plot the logo and get start point of console */
        debug("Video: Drawing the logo ...\n");
@@ -2221,6 +2261,9 @@ int drv_video_init(void)
        /* Init video chip - returns with framebuffer cleared */
        skip_dev_init = (video_init() == -1);
 
+       if (board_cfb_skip())
+               return 0;
+
 #if !defined(CONFIG_VGA_AS_SINGLE_DEVICE)
        debug("KBD: Keyboard init ...\n");
        skip_dev_init |= (VIDEO_KBD_INIT_FCT == -1);
@@ -2278,21 +2321,3 @@ int video_get_screen_columns(void)
 {
        return CONSOLE_COLS;
 }
-
-void video_clear(void)
-{
-       if (!video_fb_address)
-               return;
-#ifdef VIDEO_HW_RECTFILL
-       video_hw_rectfill(VIDEO_PIXEL_SIZE,     /* bytes per pixel */
-                         0,                    /* dest pos x */
-                         0,                    /* dest pos y */
-                         VIDEO_VISIBLE_COLS,   /* frame width */
-                         VIDEO_VISIBLE_ROWS,   /* frame height */
-                         bgx                   /* fill color */
-       );
-#else
-       memsetl(video_fb_address,
-               (VIDEO_VISIBLE_ROWS * VIDEO_LINE_LEN) / sizeof(int), bgx);
-#endif
-}