mx6qarm2: Remove unused SOBJS

[karo-tx-uboot.git] / common / lcd.c

diff --git a/common/lcd.c b/common/lcd.c
index bf1a6a9e67759a061fcafe7d6b85d355876876ec..85c6cf4374f61e10bcdcbba4487855fdff79332c 100644 (file)
--- a/common/lcd.c
+++ b/common/lcd.c
@@ -216,6 +216,10 @@ static void lcd_drawchars (ushort x, ushort y, uchar *str, int count)
        uchar *dest;
        ushort row;
 
+#if defined(CONFIG_LCD_LOGO) && !defined(CONFIG_LCD_INFO_BELOW_LOGO)
+       y += BMP_LOGO_HEIGHT;
+#endif
+
 #if LCD_BPP == LCD_MONOCHROME
        ushort off  = x * (1 << LCD_BPP) % 8;
 #endif
@@ -271,22 +275,14 @@ static void lcd_drawchars (ushort x, ushort y, uchar *str, int count)
 
 static inline void lcd_puts_xy (ushort x, ushort y, uchar *s)
 {
-#if defined(CONFIG_LCD_LOGO) && !defined(CONFIG_LCD_INFO_BELOW_LOGO)
-       lcd_drawchars (x, y+BMP_LOGO_HEIGHT, s, strlen ((char *)s));
-#else
-       lcd_drawchars (x, y, s, strlen ((char *)s));
-#endif
+       lcd_drawchars(x, y, s, strlen((char *)s));
 }
 
 /*----------------------------------------------------------------------*/
 
 static inline void lcd_putc_xy (ushort x, ushort y, uchar c)
 {
-#if defined(CONFIG_LCD_LOGO) && !defined(CONFIG_LCD_INFO_BELOW_LOGO)
-       lcd_drawchars (x, y+BMP_LOGO_HEIGHT, &c, 1);
-#else
-       lcd_drawchars (x, y, &c, 1);
-#endif
+       lcd_drawchars(x, y, &c, 1);
 }
 
 /************************************************************************/
@@ -523,7 +519,7 @@ void bitmap_plot (int x, int y)
 
        debug ("Logo: width %d  height %d  colors %d  cmap %d\n",
                BMP_LOGO_WIDTH, BMP_LOGO_HEIGHT, BMP_LOGO_COLORS,
-               (int)(sizeof(bmp_logo_palette)/(sizeof(ushort))));
+               ARRAY_SIZE(bmp_logo_palette));
 
        bmap = &bmp_logo_bitmap[0];
        fb   = (uchar *)(lcd_base + y * lcd_line_length + x);
@@ -548,7 +544,7 @@ void bitmap_plot (int x, int y)
                WATCHDOG_RESET();
 
                /* Set color map */
-               for (i=0; i<(sizeof(bmp_logo_palette)/(sizeof(ushort))); ++i) {
+               for (i = 0; i < ARRAY_SIZE(bmp_logo_palette); ++i) {
                        ushort colreg = bmp_logo_palette[i];
 #ifdef CONFIG_ATMEL_LCD
                        uint lut_entry;
@@ -598,6 +594,8 @@ void bitmap_plot (int x, int y)
 
        WATCHDOG_RESET();
 }
+#else
+static inline void bitmap_plot(int x, int y) {}
 #endif /* CONFIG_LCD_LOGO */
 
 /*----------------------------------------------------------------------*/
@@ -645,14 +643,14 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y)
 
        bpix = NBITS(panel_info.vl_bpix);
 
-       if ((bpix != 1) && (bpix != 8) && (bpix != 16)) {
+       if ((bpix != 1) && (bpix != 8) && (bpix != 16) && (bpix != 32)) {
                printf ("Error: %d bit/pixel mode, but BMP has %d bit/pixel\n",
                        bpix, bmp_bpix);
                return 1;
        }
 
        /* We support displaying 8bpp BMPs on 16bpp LCDs */
-       if (bpix != bmp_bpix && (bmp_bpix != 8 || bpix != 16)) {
+       if (bpix != bmp_bpix && (bmp_bpix != 8 || bpix != 16 || bpix != 32)) {
                printf ("Error: %d bit/pixel mode, but BMP has %d bit/pixel\n",
                        bpix,
                        le16_to_cpu(bmp->header.bit_count));
@@ -669,7 +667,7 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y)
                cmap = (ushort *)fbi->palette;
 #elif defined(CONFIG_MPC823)
                cmap = (ushort *)&(cp->lcd_cmap[255*sizeof(ushort)]);
-#elif !defined(CONFIG_ATMEL_LCD)
+#elif !defined(CONFIG_ATMEL_LCD) && !defined(CONFIG_EXYNOS_FB)
                cmap = panel_info.cmap;
 #endif
 
@@ -791,6 +789,19 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y)
                break;
 #endif /* CONFIG_BMP_16BPP */
 
+#if defined(CONFIG_BMP_32BPP)
+       case 32:
+               for (i = 0; i < height; ++i) {
+                       for (j = 0; j < width; j++) {
+                               *(fb++) = *(bmap++);
+                               *(fb++) = *(bmap++);
+                               *(fb++) = *(bmap++);
+                               *(fb++) = *(bmap++);
+                       }
+                       fb  -= (lcd_line_length + width * (bpix / 8));
+               }
+               break;
+#endif /* CONFIG_BMP_32BPP */
        default:
                break;
        };
@@ -843,9 +854,7 @@ static void *lcd_logo (void)
        }
 #endif /* CONFIG_SPLASH_SCREEN */
 
-#ifdef CONFIG_LCD_LOGO
-       bitmap_plot (0, 0);
-#endif /* CONFIG_LCD_LOGO */
+       bitmap_plot(0, 0);
 
 #ifdef CONFIG_LCD_INFO
        console_col = LCD_INFO_X / VIDEO_FONT_WIDTH;