summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorAnatolij Gustschin <agust@denx.de>2008-11-03 15:30:34 +0100
committerWolfgang Denk <wd@denx.de>2008-12-06 00:32:58 +0100
commit1450c4a6682378567030414a9f1198c39b7730c7 (patch)
treec6bdeabcf944746b0acb6b574636c33b69459925 /board
parentbfa0af6b22ff25b0719a8910f9b6d1f975aa6fb0 (diff)
downloadu-boot-imx-1450c4a6682378567030414a9f1198c39b7730c7.zip
u-boot-imx-1450c4a6682378567030414a9f1198c39b7730c7.tar.gz
u-boot-imx-1450c4a6682378567030414a9f1198c39b7730c7.tar.bz2
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>
Diffstat (limited to 'board')
-rw-r--r--board/lwmon/lwmon.c2
-rw-r--r--board/tqc/tqm8xx/tqm8xx.c5
2 files changed, 3 insertions, 4 deletions
diff --git a/board/lwmon/lwmon.c b/board/lwmon/lwmon.c
index 9e57246..d062466 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 928afed..d8a19a4 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 );