From: Anatolij Gustschin <agust@denx.de>
Date: Wed, 2 Dec 2015 14:38:00 +0000 (+0100)
Subject: Revert "LCD: Add an option to skip registration as an stdio output"
X-Git-Tag: v2016.01-rc2~43
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f5bcfe151e61558572b9f9036c67d51bd831a436;p=u-boot

Revert "LCD: Add an option to skip registration as an stdio output"

This reverts commit 05bfe1321024e2ae0039dc16f17d2165610fb4fd.

As discussed on the list, we already have the needed functionality by
defining CONFIG_SYS_CONSOLE_IS_IN_ENV, CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE
and adding custom overwrite_console() in the board code.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
---

diff --git a/common/lcd.c b/common/lcd.c
index ed68be9325..d29308aeb6 100644
--- a/common/lcd.c
+++ b/common/lcd.c
@@ -143,16 +143,6 @@ __weak int lcd_get_size(int *line_length)
 	return *line_length * panel_info.vl_row;
 }
 
-/*
- * Implement a weak default function for boards that optionally
- * need to skip the lcd console initialization.
- */
-__weak int board_lcd_console_skip(void)
-{
-	/* As default, don't skip cfb init */
-	return 0;
-}
-
 int drv_lcd_init(void)
 {
 	struct stdio_dev lcddev;
@@ -162,9 +152,6 @@ int drv_lcd_init(void)
 
 	lcd_init(lcd_base);
 
-	if (board_lcd_console_skip())
-		return 0;
-
 	/* Device initialization */
 	memset(&lcddev, 0, sizeof(lcddev));