diff options
| author | Simon Glass <sjg@chromium.org> | 2022-10-16 15:19:04 -0600 |
|---|---|---|
| committer | Anatolij Gustschin <agust@denx.de> | 2022-10-30 20:07:16 +0100 |
| commit | 1dc6517649f294ca5b3ae71b98209cee55753b7c (patch) | |
| tree | 604ec6d944dd38492f2aa5a9a89c5b82d15af910 /drivers/video | |
| parent | 3c4d848085f7fcf782b9ce821c6f217369a456c9 (diff) | |
| download | u-boot-1dc6517649f294ca5b3ae71b98209cee55753b7c.tar.gz | |
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>
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/Kconfig | 4 | ||||
| -rw-r--r-- | drivers/video/atmel_hlcdfb.c | 13 | ||||
| -rw-r--r-- | drivers/video/atmel_lcdfb.c | 26 |
3 files changed, 0 insertions, 43 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 7213d9ccc5..2d25a64c8c 100644 --- 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 c7b59b71e1..caf65741f2 100644 --- 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 c38cac174a..7ac3c7cff4 100644 --- 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) |