[U-Boot] [PATCH v4 19/29] video: Drop CONFIG_VIDEO_SW_CURSOR

[Simon Glass]

Since all boards enable this, we may as well drop the option.

This is a separate patch from the previous one, so it can be skipped if
someone identifies a need.

Signed-off-by: Simon Glass <sjg at chromium.org>
Reviewed-by: Tom Rini <trini at konsulko.com>
---

Changes in v4: None
Changes in v3: None
Changes in v2: None

 README                      |  1 -
 drivers/video/Kconfig       | 10 ----------
 drivers/video/cfb_console.c | 46 ++++++++++++---------------------------------
 3 files changed, 12 insertions(+), 45 deletions(-)

diff --git a/README b/README
index f585705..1140ccb 100644
--- a/README
+++ b/README
@@ -1623,7 +1623,6 @@ CBFS (Coreboot Filesystem) support
 			CONFIG_VIDEO
 			CONFIG_CMD_BMP
 			CONFIG_CFB_CONSOLE
-			CONFIG_VIDEO_SW_CURSOR
 			CONFIG_VGA_AS_SINGLE_DEVICE
 			CONFIG_VIDEO_LOGO
 			CONFIG_VIDEO_BMP_LOGO
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 7cb73a0..42db0ad 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -503,16 +503,6 @@ config VGA_AS_SINGLE_DEVICE
 	  may be used if you have no keyboard device, or more than one
 	  (USB Keyboard, AT Keyboard).
 
-config VIDEO_SW_CURSOR
-	bool "Enable a software cursor"
-	depends on CFB_CONSOLE
-	default y if CFB_CONSOLE
-	help
-	  This draws a cursor after the last character. No blinking is
-	  provided. This makes it possible to see the current cursor
-	  position when entering text on the console. It is recommended to
-	  enable this.
-
 config VIDEO_CT69000
 	bool "Enable Chips & Technologies 69000 video driver"
 	depends on VIDEO
diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c
index 56d3c15..c788651 100644
--- a/drivers/video/cfb_console.c
+++ b/drivers/video/cfb_console.c
@@ -58,11 +58,6 @@
  *					info);
  *				that fills a info buffer at i=row.
  *				s.a: board/eltec/bab7xx.
- *
- * CONFIG_VIDEO_SW_CURSOR:    - Draws a cursor after the last
- *				character. No blinking is provided.
- *				Uses the macros CURSOR_SET and
- *				CURSOR_OFF.
  */
 
 #include <common.h>
@@ -141,21 +136,6 @@
 #include <splash.h>
 #endif
 
-#if !defined(CONFIG_VIDEO_SW_CURSOR)
-/* no Cursor defined */
-#define CURSOR_ON
-#define CURSOR_OFF
-#define CURSOR_SET
-#endif
-
-#if defined(CONFIG_VIDEO_SW_CURSOR)
-void console_cursor(int state);
-
-#define CURSOR_ON  console_cursor(1)
-#define CURSOR_OFF console_cursor(0)
-#define CURSOR_SET video_set_cursor()
-#endif /* CONFIG_VIDEO_SW_CURSOR */
-
 #ifdef	CONFIG_VIDEO_LOGO
 #ifdef	CONFIG_VIDEO_BMP_LOGO
 #include <bmp_logo.h>
@@ -529,14 +509,6 @@ static void video_putchar(int xx, int yy, unsigned char c)
 	video_drawchars(xx, yy + video_logo_height, &c, 1);
 }
 
-#if defined(CONFIG_VIDEO_SW_CURSOR)
-static void video_set_cursor(void)
-{
-	if (cursor_state)
-		console_cursor(0);
-	console_cursor(1);
-}
-
 static void video_invertchar(int xx, int yy)
 {
 	int firstx = xx * VIDEO_PIXEL_SIZE;
@@ -552,7 +524,7 @@ static void video_invertchar(int xx, int yy)
 	}
 }
 
-void console_cursor(int state)
+static void console_cursor(int state)
 {
 	if (cursor_state != state) {
 		if (cursor_state) {
@@ -573,7 +545,13 @@ void console_cursor(int state)
 	if (cfb_do_flush_cache)
 		flush_cache(VIDEO_FB_ADRS, VIDEO_SIZE);
 }
-#endif
+
+static void video_set_cursor(void)
+{
+	if (cursor_state)
+		console_cursor(0);
+	console_cursor(1);
+}
 
 #ifndef VIDEO_HW_RECTFILL
 static void memsetl(int *p, int c, int v)
@@ -779,7 +757,7 @@ static void parse_putc(const char c)
 	static int nl = 1;
 
 	if (console_cursor_is_visible())
-		CURSOR_OFF;
+		console_cursor(0);
 
 	switch (c) {
 	case 13:		/* back to first column */
@@ -820,7 +798,7 @@ static void parse_putc(const char c)
 	}
 
 	if (console_cursor_is_visible())
-		CURSOR_SET;
+		video_set_cursor();
 }
 
 static void video_putc(struct stdio_dev *dev, const char c)
@@ -951,7 +929,7 @@ static void video_putc(struct stdio_dev *dev, const char c)
 
 		if (flush) {
 			if (!ansi_cursor_hidden)
-				CURSOR_OFF;
+				console_cursor(0);
 			ansi_buf_size = 0;
 			switch (cchar) {
 			case 'A':
@@ -1025,7 +1003,7 @@ static void video_putc(struct stdio_dev *dev, const char c)
 				break;
 			}
 			if (!ansi_cursor_hidden)
-				CURSOR_SET;
+				video_set_cursor();
 		}
 	} else {
 		parse_putc(c);
-- 
2.8.0.rc3.226.g39d4020