2 files changed, 2 insertions, 14 deletions

diff --git a/payloads/libpayload/drivers/video/corebootfb.c b/payloads/libpayload/drivers/video/corebootfb.c
index d661466f14..f0f1007312 100644
--- a/payloads/libpayload/drivers/video/corebootfb.c
+++ b/payloads/libpayload/drivers/video/corebootfb.c
@@ -247,10 +247,6 @@ static int corebootfb_init(void)
 
 	// clear boot splash screen if there is one.
 	corebootfb_clear();
-
-	corebootfb_set_cursor(0, 0);
-	corebootfb_enable_cursor(1);
-
 	return 0;
 }
 
diff --git a/payloads/libpayload/drivers/video/video.c b/payloads/libpayload/drivers/video/video.c
index ce0374d6a3..318548ba3a 100644
--- a/payloads/libpayload/drivers/video/video.c
+++ b/payloads/libpayload/drivers/video/video.c
@@ -60,7 +60,6 @@ static struct video_console *console;
 
 static int cursorx;
 static int cursory;
-static unsigned int cursor_enabled = 1;
 
 void video_get_rows_cols(unsigned int *rows, unsigned int *cols)
 {
@@ -74,9 +73,6 @@ void video_get_rows_cols(unsigned int *rows, unsigned int *cols)
 
 static void video_console_fixup_cursor(void)
 {
-	if (!cursor_enabled)
-		return;
-
 	if (cursorx < 0)
 		cursorx = 0;
 
@@ -101,11 +97,6 @@ void video_console_cursor_enable(int state)
 {
 	if (console && console->enable_cursor)
 		console->enable_cursor(state);
-
-	cursor_enabled = state;
-
-	if (cursor_enabled)
-		video_console_fixup_cursor();
 }
 
 void video_console_clear(void)
@@ -197,6 +188,7 @@ static struct console_output_driver cons = {
 int video_init(void)
 {
 	int i;
+	unsigned int dummy_cursor_enabled;
 
 	for (i = 0; i < ARRAY_SIZE(console_list); i++) {
 		if (console_list[i]->init())
@@ -207,7 +199,7 @@ int video_init(void)
 		if (console->get_cursor)
 			console->get_cursor((unsigned int*)&cursorx,
 					    (unsigned int*)&cursory,
-					    &cursor_enabled);
+					    &dummy_cursor_enabled);
 
 		if (cursorx) {
 			cursorx = 0;