CFB: Fix font rendering on mx5 framebuffer

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

diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c
index 3a93b64dad473a47f95a54df5b94d7d85575b66a..480df64de5083f7d9431c4fd0a034f2ac3087d4c 100644 (file)
--- a/drivers/video/cfb_console.c
+++ b/drivers/video/cfb_console.c
@@ -101,6 +101,7 @@
 #include <common.h>
 #include <version.h>
 #include <malloc.h>
+#include <linux/compiler.h>
 
 /*
  * Console device defines with SMI graphic
@@ -160,6 +161,13 @@
 #endif
 #endif
 
+/*
+ * Defines for the i.MX31 driver (mx3fb.c)
+ */
+#if defined(CONFIG_VIDEO_MX3) || defined(CONFIG_VIDEO_MX5)
+#define VIDEO_FB_16BPP_WORD_SWAP
+#endif
+
 /*
  * Include video_fb.h after definitions of VIDEO_HW_RECTFILL etc.
  */
@@ -195,6 +203,7 @@
 #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>
@@ -278,6 +287,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
@@ -1145,7 +1155,7 @@ int video_display_bitmap(ulong bmp_image, int x, int y)
        colors = le32_to_cpu(bmp->header.colors_used);
        compression = le32_to_cpu(bmp->header.compression);
 
-       debug("Display-bmp: %d x %d  with %d colors\n",
+       debug("Display-bmp: %ld x %ld  with %d colors\n",
              width, height, colors);
 
        if (compression != BMP_BI_RGB
@@ -1553,7 +1563,8 @@ void logo_plot(void *screen, int width, int x, int y)
 static void *video_logo(void)
 {
        char info[128];
-       int space, len, y_off = 0;
+       int space, len;
+       __maybe_unused int y_off = 0;
 
 #ifdef CONFIG_SPLASH_SCREEN
        char *s;