karo: cleanup after merge of v2015.10-rc2

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

diff --git a/common/lcd.c b/common/lcd.c
index 5dd6e8ecfe71c1de36d7cd2103dd51f9f7d6c058..23c502106cba1cea78c9feb156c84741350ec4fc 100644 (file)
--- a/common/lcd.c
+++ b/common/lcd.c
@@ -26,7 +26,7 @@
 #ifdef CONFIG_LCD_LOGO
 #include <bmp_logo.h>
 #include <bmp_logo_data.h>
-#if (CONSOLE_COLOR_WHITE >= BMP_LOGO_OFFSET) && (LCD_BPP != LCD_COLOR16)
+#if (CONSOLE_COLOR_WHITE >= BMP_LOGO_OFFSET) && (LCD_BPP < LCD_COLOR16)
 #error Default Color Map overlaps with Logo Color Map
 #endif
 #endif
@@ -243,8 +243,8 @@ void lcd_clear(void)
        lcd_logo();
 #if defined(CONFIG_LCD_LOGO) && !defined(CONFIG_LCD_INFO_BELOW_LOGO)
        addr = (ulong)lcd_base + BMP_LOGO_HEIGHT * lcd_line_length;
-       lcd_init_console((void *)addr, panel_info.vl_row,
-                        panel_info.vl_col, panel_info.vl_rot);
+       lcd_init_console((void *)addr, panel_info.vl_col,
+                        panel_info.vl_row, panel_info.vl_rot);
 #endif
        lcd_sync();
 }
@@ -706,8 +706,6 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y)
                                        *(uint16_t *)fb = val;
                                        bmap++;
                                        fb += sizeof(uint16_t) / sizeof(*fb);
-                               } else {
-                                       FB_PUT_BYTE(fb, bmap);
                                }
                        }
                        if (bpix > 8) {