Drop CONFIG_LCD_LOGO

This relies on the old LCD implementation which is to be removed. Drop it.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/common/lcd.c b/common/lcd.c
index 36c97df..b6fba2e 100644 (file)
--- a/common/lcd.c
+++ b/common/lcd.c
@@ -27,14 +27,6 @@
 #include <asm/unaligned.h>
 #include <video_font.h>
 
-#ifdef CONFIG_LCD_LOGO
-#include <bmp_logo.h>
-#include <bmp_logo_data.h>
-#if (CONSOLE_COLOR_WHITE >= BMP_LOGO_OFFSET) && (LCD_BPP != LCD_COLOR16)
-#error Default Color Map overlaps with Logo Color Map
-#endif
-#endif
-
 #if (LCD_BPP != LCD_COLOR8) && (LCD_BPP != LCD_COLOR16) && \
        (LCD_BPP != LCD_COLOR32)
 #error Unsupported LCD BPP.
@@ -178,11 +170,6 @@ void lcd_clear(void)
        }
 
        lcd_logo();
-#if defined(CONFIG_LCD_LOGO)
-       addr = (ulong)lcd_base + BMP_LOGO_HEIGHT * lcd_line_length;
-       lcd_init_console((void *)addr, panel_info.vl_col,
-                        panel_info.vl_row, panel_info.vl_rot);
-#endif
        lcd_sync();
 }
 
@@ -260,60 +247,7 @@ int lcd_getbgcolor(void)
        return lcd_color_bg;
 }
 
-#ifdef CONFIG_LCD_LOGO
-__weak void lcd_logo_set_cmap(void)
-{
-       int i;
-       ushort *cmap = configuration_get_cmap();
-
-       for (i = 0; i < ARRAY_SIZE(bmp_logo_palette); ++i)
-               *cmap++ = bmp_logo_palette[i];
-}
-
-void lcd_logo_plot(int x, int y)
-{
-       ushort i, j;
-       uchar *bmap = &bmp_logo_bitmap[0];
-       unsigned bpix = NBITS(panel_info.vl_bpix);
-       uchar *fb = (uchar *)(lcd_base + y * lcd_line_length + x * bpix / 8);
-       ushort *fb16;
-
-       debug("Logo: width %d  height %d  colors %d\n",
-             BMP_LOGO_WIDTH, BMP_LOGO_HEIGHT, BMP_LOGO_COLORS);
-
-       if (bpix < 12) {
-               schedule();
-               lcd_logo_set_cmap();
-               schedule();
-
-               for (i = 0; i < BMP_LOGO_HEIGHT; ++i) {
-                       memcpy(fb, bmap, BMP_LOGO_WIDTH);
-                       bmap += BMP_LOGO_WIDTH;
-                       fb += panel_info.vl_col;
-               }
-       }
-       else { /* true color mode */
-               u16 col16;
-               fb16 = (ushort *)fb;
-               for (i = 0; i < BMP_LOGO_HEIGHT; ++i) {
-                       for (j = 0; j < BMP_LOGO_WIDTH; j++) {
-                               col16 = bmp_logo_palette[(bmap[j]-16)];
-                               fb16[j] =
-                                       ((col16 & 0x000F) << 1) |
-                                       ((col16 & 0x00F0) << 3) |
-                                       ((col16 & 0x0F00) << 4);
-                               }
-                       bmap += BMP_LOGO_WIDTH;
-                       fb16 += panel_info.vl_col;
-               }
-       }
-
-       schedule();
-       lcd_sync();
-}
-#else
 static inline void lcd_logo_plot(int x, int y) {}
-#endif /* CONFIG_LCD_LOGO */
 
 #if defined(CONFIG_CMD_BMP) || defined(CONFIG_SPLASH_SCREEN)
 #ifdef CONFIG_SPLASH_SCREEN_ALIGN

diff --git a/common/lcd_console.c b/common/lcd_console.c
index cde96de..82befae 100644 (file)
--- a/common/lcd_console.c
+++ b/common/lcd_console.c
@@ -12,9 +12,6 @@
 #include <log.h>
 #include <serial.h>
 #include <video_font.h>                /* Get font data, width and height */
-#if defined(CONFIG_LCD_LOGO)
-#include <bmp_logo.h>
-#endif
 
 static struct console_t cons;
 
@@ -125,12 +122,7 @@ static inline void console_newline(void)
 void console_calc_rowcol(struct console_t *pcons, u32 sizex, u32 sizey)
 {
        pcons->cols = sizex / VIDEO_FONT_WIDTH;
-#if defined(CONFIG_LCD_LOGO)
-       pcons->rows = (pcons->lcdsizey - BMP_LOGO_HEIGHT);
-       pcons->rows /= VIDEO_FONT_HEIGHT;
-#else
        pcons->rows = sizey / VIDEO_FONT_HEIGHT;
-#endif
 }
 
 void __weak lcd_init_console_rot(struct console_t *pcons)

diff --git a/configs/pm9261_defconfig b/configs/pm9261_defconfig
index ddb8173..79e0dce 100644 (file)
--- a/configs/pm9261_defconfig
+++ b/configs/pm9261_defconfig
@@ -68,5 +68,4 @@ CONFIG_DM_VIDEO=y
 CONFIG_ATMEL_LCD=y
 CONFIG_ATMEL_LCD_BGR555=y
 CONFIG_LCD=y
-CONFIG_LCD_LOGO=y
 CONFIG_REGEX=y

diff --git a/configs/pm9263_defconfig b/configs/pm9263_defconfig
index 9515c4c..124ed01 100644 (file)
--- a/configs/pm9263_defconfig
+++ b/configs/pm9263_defconfig
@@ -71,5 +71,4 @@ CONFIG_DM_VIDEO=y
 CONFIG_ATMEL_LCD=y
 CONFIG_ATMEL_LCD_BGR555=y
 CONFIG_LCD=y
-CONFIG_LCD_LOGO=y
 CONFIG_JFFS2_NAND=y

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 7213d9c..2d25a64 100644 (file)
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -728,10 +728,6 @@ config LCD
          CONFIG option. See the README for details. Drives which have been
          converted to driver model will instead used CONFIG_DM_VIDEO.
 
-config LCD_LOGO
-       bool "Show a logo on screen"
-       depends on LCD
-
 config VIDEO_DW_HDMI
        bool
        help

diff --git a/drivers/video/atmel_hlcdfb.c b/drivers/video/atmel_hlcdfb.c
index c7b59b7..caf6574 100644 (file)
--- a/drivers/video/atmel_hlcdfb.c
+++ b/drivers/video/atmel_hlcdfb.c
@@ -23,10 +23,6 @@
 #include <atmel_hlcdc.h>
 #include <linux/bug.h>
 
-#if defined(CONFIG_LCD_LOGO)
-#include <bmp_logo.h>
-#endif
-
 DECLARE_GLOBAL_DATA_PTR;
 
 #ifndef CONFIG_DM_VIDEO
@@ -52,15 +48,6 @@ void lcd_setcolreg(ushort regno, ushort red, ushort green, ushort blue)
               | ((blue << LCDC_BASECLUT_BCLUT_Pos) & LCDC_BASECLUT_BCLUT_Msk));
 }
 
-ushort *configuration_get_cmap(void)
-{
-#if defined(CONFIG_LCD_LOGO)
-       return bmp_logo_palette;
-#else
-       return NULL;
-#endif
-}
-
 void lcd_ctrl_init(void *lcdbase)
 {
        unsigned long value;

diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c
index c38cac1..7ac3c7c 100644 (file)
--- a/drivers/video/atmel_lcdfb.c
+++ b/drivers/video/atmel_lcdfb.c
@@ -67,32 +67,6 @@ void fb_put_word(uchar **fb, uchar **from)
 }
 #endif
 
-#ifdef CONFIG_LCD_LOGO
-#include <bmp_logo.h>
-void lcd_logo_set_cmap(void)
-{
-       int i;
-       uint lut_entry;
-       ushort colreg;
-       uint *cmap = (uint *)configuration_get_cmap();
-
-       for (i = 0; i < BMP_LOGO_COLORS; ++i) {
-               colreg = bmp_logo_palette[i];
-#ifdef CONFIG_ATMEL_LCD_BGR555
-               lut_entry = ((colreg & 0x000F) << 11) |
-                               ((colreg & 0x00F0) <<  2) |
-                               ((colreg & 0x0F00) >>  7);
-#else
-               lut_entry = ((colreg & 0x000F) << 1) |
-                               ((colreg & 0x00F0) << 3) |
-                               ((colreg & 0x0F00) << 4);
-#endif
-               *(cmap + BMP_LOGO_OFFSET) = lut_entry;
-               cmap++;
-       }
-}
-#endif
-
 void lcd_setcolreg(ushort regno, ushort red, ushort green, ushort blue)
 {
 #if defined(CONFIG_ATMEL_LCD_BGR555)

diff --git a/tools/Makefile b/tools/Makefile
index 34a1aa7..e8e1d27 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -25,7 +25,6 @@
 # Enable all the config-independent tools
 ifneq ($(HOST_TOOLS_ALL),)
 CONFIG_ARCH_KIRKWOOD = y
-CONFIG_LCD_LOGO = y
 CONFIG_CMD_LOADS = y
 CONFIG_CMD_NET = y
 CONFIG_XWAY_SWAP_BYTES = y
@@ -48,7 +47,6 @@ CONFIG_BUILD_ENVCRC ?= $(ENVCRC-y)
 
 hostprogs-$(CONFIG_SPL_GENERATE_ATMEL_PMECC_HEADER) += atmel_pmecc_params
 
-hostprogs-$(CONFIG_LCD_LOGO) += bmp_logo
 hostprogs-$(CONFIG_VIDEO_LOGO) += bmp_logo
 HOSTCFLAGS_bmp_logo.o := -pedantic
 
@@ -278,8 +276,6 @@ always := $(hostprogs-y)
 # Generated LCD/video logo
 LOGO_H = $(objtree)/include/bmp_logo.h
 LOGO_DATA_H = $(objtree)/include/bmp_logo_data.h
-LOGO-$(CONFIG_LCD_LOGO) += $(LOGO_H)
-LOGO-$(CONFIG_LCD_LOGO) += $(LOGO_DATA_H)
 LOGO-$(CONFIG_VIDEO_LOGO) += $(LOGO_H)
 LOGO-$(CONFIG_VIDEO_LOGO) += $(LOGO_DATA_H)