summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-11-30 07:10:18 -0500
committerTom Rini <trini@konsulko.com>2015-11-30 07:10:18 -0500
commitc1924d85af4a07dc70aef1ef95c48b54a136733f (patch)
tree78b34b2dd76db0a975cd3008dca3cd10362389da /common
parentf1df81c4008c8e0edbc1a2738cf2490b2f7be661 (diff)
parent3dbdb4dd4f8e5847b8f7d6dbd849e0b9a0907a5b (diff)
Merge branch 'master' of git://git.denx.de/u-boot-video
Diffstat (limited to 'common')
-rw-r--r--common/lcd.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/common/lcd.c b/common/lcd.c
index d29308aeb6..ed68be9325 100644
--- a/common/lcd.c
+++ b/common/lcd.c
@@ -143,6 +143,16 @@ __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;
@@ -152,6 +162,9 @@ int drv_lcd_init(void)
lcd_init(lcd_base);
+ if (board_lcd_console_skip())
+ return 0;
+
/* Device initialization */
memset(&lcddev, 0, sizeof(lcddev));