diff options
| author | Tom Rini <trini@konsulko.com> | 2015-04-20 09:13:52 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-04-20 09:13:52 -0400 |
| commit | 1733259d25015c28c47990ec11af99b3f62f811c (patch) | |
| tree | 654c376440e5b01603e88dc22047d657f635def7 /common/lcd.c | |
| parent | 791a9f67f4f8db512cf59b40f47544fb335cd8db (diff) | |
| parent | fc1a79d95e9038e9cf53f99c1825005b4dfaf7f4 (diff) | |
| download | talos-obmc-uboot-1733259d25015c28c47990ec11af99b3f62f811c.tar.gz talos-obmc-uboot-1733259d25015c28c47990ec11af99b3f62f811c.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-video
Diffstat (limited to 'common/lcd.c')
| -rw-r--r-- | common/lcd.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/common/lcd.c b/common/lcd.c index 6982759e9e..055c366b19 100644 --- a/common/lcd.c +++ b/common/lcd.c @@ -168,7 +168,6 @@ int drv_lcd_init(void) void lcd_clear(void) { - short console_rows, console_cols; int bg_color; char *s; ulong addr; @@ -212,16 +211,14 @@ void lcd_clear(void) } #endif #endif + /* setup text-console */ + debug("[LCD] setting up console...\n"); + lcd_init_console(lcd_base, + panel_info.vl_col, + panel_info.vl_row, + panel_info.vl_rot); /* Paint the logo and retrieve LCD base address */ debug("[LCD] Drawing the logo...\n"); -#if defined(CONFIG_LCD_LOGO) && !defined(CONFIG_LCD_INFO_BELOW_LOGO) - console_rows = (panel_info.vl_row - BMP_LOGO_HEIGHT); - console_rows /= VIDEO_FONT_HEIGHT; -#else - console_rows = panel_info.vl_row / VIDEO_FONT_HEIGHT; -#endif - console_cols = panel_info.vl_col / VIDEO_FONT_WIDTH; - lcd_init_console(lcd_base, console_rows, console_cols); if (do_splash) { s = getenv("splashimage"); if (s) { @@ -237,7 +234,8 @@ void lcd_clear(void) lcd_logo(); #if defined(CONFIG_LCD_LOGO) && !defined(CONFIG_LCD_INFO_BELOW_LOGO) addr = (ulong)lcd_base + BMP_LOGO_HEIGHT * lcd_line_length; - lcd_init_console((void *)addr, console_rows, console_cols); + lcd_init_console((void *)addr, panel_info.vl_row, + panel_info.vl_col, panel_info.vl_rot); #endif lcd_sync(); } |
