public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
* [U-Boot] [PATCH] lcd: fix console address is not initialized
@ 2015-01-28  1:13 Bo Shen
  2015-01-29  8:51 ` Anatolij Gustschin
  2015-01-29 14:00 ` [U-Boot] " Tom Rini
  0 siblings, 2 replies; 10+ messages in thread
From: Bo Shen @ 2015-01-28  1:13 UTC (permalink / raw)
  To: u-boot

This commit 904672e (lcd: refactor lcd console stuff into its
own file), which cause lcd console address is not initialized.

This patch initialize the lcd console use the default value,
will be update when splash screen is enabled.

Signed-off-by: Bo Shen <voice.shen@atmel.com>
---
Hi Tom,
  If no objection of this patch, can you apply it as soon as possible. 
Or else most Atmel SoC based boards (which enable lcd info) will be
broken.
  Thanks.

 common/lcd.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/lcd.c b/common/lcd.c
index cc34b8a..1195a54 100644
--- a/common/lcd.c
+++ b/common/lcd.c
@@ -268,6 +268,7 @@ void lcd_clear(void)
 	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);
 	lcd_init_console(lcd_logo(), console_rows, console_cols);
 	lcd_sync();
 }
-- 
2.3.0.rc0

^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [U-Boot] [PATCH] lcd: fix console address is not initialized
@ 2015-01-21  4:37 Bo Shen
  2015-01-22 13:10 ` Nikita Kiryanov
  0 siblings, 1 reply; 10+ messages in thread
From: Bo Shen @ 2015-01-21  4:37 UTC (permalink / raw)
  To: u-boot

This commit 904672e (lcd: refactor lcd console stuff into its
own file), which cause lcd console address is not initialized.

This patch split lcd console address initialize and lcd logo
display into two functions.

Signed-off-by: Bo Shen <voice.shen@atmel.com>
---

 common/lcd.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/common/lcd.c b/common/lcd.c
index cc34b8a..f435e2a 100644
--- a/common/lcd.c
+++ b/common/lcd.c
@@ -82,7 +82,8 @@ DECLARE_GLOBAL_DATA_PTR;
 
 static int lcd_init(void *lcdbase);
 
-static void *lcd_logo(void);
+static void lcd_logo(void);
+static void *lcd_console_address(void);
 
 static void lcd_setfgcolor(int color);
 static void lcd_setbgcolor(int color);
@@ -268,7 +269,8 @@ void lcd_clear(void)
 	console_rows = panel_info.vl_row / VIDEO_FONT_HEIGHT;
 #endif
 	console_cols = panel_info.vl_col / VIDEO_FONT_WIDTH;
-	lcd_init_console(lcd_logo(), console_rows, console_cols);
+	lcd_init_console(lcd_console_address(), console_rows, console_cols);
+	lcd_logo();
 	lcd_sync();
 }
 
@@ -849,7 +851,7 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y)
 }
 #endif
 
-static void *lcd_logo(void)
+static void lcd_logo(void)
 {
 #ifdef CONFIG_SPLASH_SCREEN
 	char *s;
@@ -879,7 +881,10 @@ static void *lcd_logo(void)
 	lcd_set_row(LCD_INFO_Y / VIDEO_FONT_HEIGHT);
 	lcd_show_board_info();
 #endif /* CONFIG_LCD_INFO */
+}
 
+static void *lcd_console_address(void)
+{
 #if defined(CONFIG_LCD_LOGO) && !defined(CONFIG_LCD_INFO_BELOW_LOGO)
 	return (void *)((ulong)lcd_base + BMP_LOGO_HEIGHT * lcd_line_length);
 #else
-- 
2.3.0.rc0

^ permalink raw reply related	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2015-01-29 14:00 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-01-28  1:13 [U-Boot] [PATCH] lcd: fix console address is not initialized Bo Shen
2015-01-29  8:51 ` Anatolij Gustschin
2015-01-29  8:55   ` Bo Shen
2015-01-29 14:00 ` [U-Boot] " Tom Rini
  -- strict thread matches above, loose matches on Subject: below --
2015-01-21  4:37 [U-Boot] [PATCH] " Bo Shen
2015-01-22 13:10 ` Nikita Kiryanov
2015-01-23  1:20   ` Bo Shen
2015-01-26  5:55     ` Bo Shen
2015-01-27 14:45       ` Nikita Kiryanov
2015-01-28  1:08         ` Bo Shen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox