video: Drop CONFIG_LCD_INFO_BELOW_LOGO

This option is not used anymore since the LCD implementation is being
removed. Drop it.

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

api/api_display.c

@@ -10,7 +10,7 @@
 #include <video_font.h> /* Get font width and height */
 
 /* lcd.h needs BMP_LOGO_HEIGHT to calculate CONSOLE_ROWS */
-#if defined(CONFIG_LCD_LOGO) && !defined(CONFIG_LCD_INFO_BELOW_LOGO)
+#if defined(CONFIG_LCD_LOGO)
 #include <bmp_logo.h>
 #endif
 

common/lcd.c

@@ -178,7 +178,7 @@ void lcd_clear(void)
 	}
 
 	lcd_logo();
-#if defined(CONFIG_LCD_LOGO) && !defined(CONFIG_LCD_INFO_BELOW_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);
@@ -209,11 +209,7 @@ static int lcd_init(void *lcdbase)
 
 	/* Initialize the console */
 	lcd_set_col(0);
-#ifdef CONFIG_LCD_INFO_BELOW_LOGO
-	lcd_set_row(7 + BMP_LOGO_HEIGHT / VIDEO_FONT_HEIGHT);
-#else
 	lcd_set_row(1);	/* leave 1 blank line below logo */
-#endif
 
 	return 0;
 }

common/lcd_console.c

@@ -125,7 +125,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) && !defined(CONFIG_LCD_INFO_BELOW_LOGO)
+#if defined(CONFIG_LCD_LOGO)
 	pcons->rows = (pcons->lcdsizey - BMP_LOGO_HEIGHT);
 	pcons->rows /= VIDEO_FONT_HEIGHT;
 #else

drivers/video/Kconfig

@@ -736,10 +736,6 @@ config LCD_LOGO
 	bool "Show a logo on screen"
 	depends on LCD
 
-config LCD_INFO_BELOW_LOGO
-	bool "Show LCD info below the on-screen logo"
-	depends on LCD_INFO && LCD_LOGO
-
 config VIDEO_DW_HDMI
 	bool
 	help

include/lcd.h

@@ -144,10 +144,7 @@ void lcd_sync(void);
 #define LCD_COLOR16	4
 #define LCD_COLOR32	5
 
-#if defined(CONFIG_LCD_INFO_BELOW_LOGO)
-#define LCD_INFO_X		0
-#define LCD_INFO_Y		(BMP_LOGO_HEIGHT + VIDEO_FONT_HEIGHT)
-#elif defined(CONFIG_LCD_LOGO)
+#if defined(CONFIG_LCD_LOGO)
 #define LCD_INFO_X		(BMP_LOGO_WIDTH + 4 * VIDEO_FONT_WIDTH)
 #define LCD_INFO_Y		VIDEO_FONT_HEIGHT
 #else