From: Anatolij Gustschin <agust@denx.de>
Date: Mon, 3 Nov 2008 14:30:34 +0000 (+0100)
Subject: lwmon, tqm8xx: Fix build errors
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=1450c4a6682378567030414a9f1198c39b7730c7;p=project%2Fbcm63xx%2Fu-boot.git

lwmon, tqm8xx: Fix build errors

Commit 6b59e03e0237a40a2305ea385defdfd92000978b
lcd: Let the board code show board-specific info

introduced some bugs which prevent U-Boot building
for lwmon board if CONFIG_LCD_INFO_BELOW_LOGO will
be defined in the board configuration.

Also "LCD enabled" building for TQM823L doesn't work
since this commit.

This patch fixes above-mentioned issues.

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

diff --git a/board/lwmon/lwmon.c b/board/lwmon/lwmon.c
index 9e572463d3..d062466c0f 100644
--- a/board/lwmon/lwmon.c
+++ b/board/lwmon/lwmon.c
@@ -773,8 +773,6 @@ void lcd_show_board_info(void)
 #ifdef CONFIG_LCD_INFO_BELOW_LOGO
 	lcd_printf ("MPC823 CPU at %s MHz\n",
 		strmhz(temp, gd->cpu_clk));
-	lcd_drawchars (LCD_INFO_X, LCD_INFO_Y + VIDEO_FONT_HEIGHT * 3,
-					info, strlen(info));
 	lcd_printf ("  %ld MB RAM, %ld MB Flash\n",
 		gd->ram_size >> 20,
 		gd->bd->bi_flashsize >> 20 );
diff --git a/board/tqc/tqm8xx/tqm8xx.c b/board/tqc/tqm8xx/tqm8xx.c
index 928afed661..d8a19a4ce0 100644
--- a/board/tqc/tqm8xx/tqm8xx.c
+++ b/board/tqc/tqm8xx/tqm8xx.c
@@ -570,17 +570,18 @@ void ide_led (uchar led, uchar status)
 
 #ifdef CONFIG_LCD_INFO
 #include <lcd.h>
+#include <version.h>
 
 void lcd_show_board_info(void)
 {
+	char temp[32];
+
 	lcd_printf ("%s (%s - %s)\n", U_BOOT_VERSION, __DATE__, __TIME__);
 	lcd_printf ("(C) 2008 DENX Software Engineering GmbH\n");
 	lcd_printf ("    Wolfgang DENK, wd@denx.de\n");
 #ifdef CONFIG_LCD_INFO_BELOW_LOGO
 	lcd_printf ("MPC823 CPU at %s MHz\n",
 		strmhz(temp, gd->cpu_clk));
-	lcd_drawchars (LCD_INFO_X, LCD_INFO_Y + VIDEO_FONT_HEIGHT * 3,
-					info, strlen(info));
 	lcd_printf ("  %ld MB RAM, %ld MB Flash\n",
 		gd->ram_size >> 20,
 		gd->bd->bi_flashsize >> 20 );