SPEAr : emi controller initialization for CFI driver support

[oweals/u-boot.git] / board / lwmon / lwmon.c

diff --git a/board/lwmon/lwmon.c b/board/lwmon/lwmon.c
index aadd2540e84b186c563201f4fc4d16a0a1de7901..8e277789396e2c2d6107924be3937be123950e60 100644 (file)
--- a/board/lwmon/lwmon.c
+++ b/board/lwmon/lwmon.c
@@ -7,7 +7,6 @@ M* Content:       LWMON specific U-Boot commands.
  * (C) Copyright 2001, 2002
  * DENX Software Engineering
  * Wolfgang Denk, wd@denx.de
- * All rights reserved.
  *
 D* Design:        wd@denx.de
 C* Coding:        wd@denx.de
@@ -759,6 +758,34 @@ static uchar *key_match (uchar *kbd_data)
 }
 #endif /* CONFIG_PREBOOT */
 
+#ifdef CONFIG_LCD_INFO
+#include <lcd.h>
+#include <version.h>
+#include <timestamp.h>
+
+void lcd_show_board_info(void)
+{
+       char temp[32];
+
+       lcd_printf ("%s (%s - %s)\n", U_BOOT_VERSION, U_BOOT_DATE, U_BOOT_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_printf ("  %ld MB RAM, %ld MB Flash\n",
+               gd->ram_size >> 20,
+               gd->bd->bi_flashsize >> 20 );
+#else
+       /* leave one blank line */
+       lcd_printf ("\nMPC823 CPU at %s MHz, %ld MB RAM, %ld MB Flash\n",
+               strmhz(temp, gd->cpu_clk),
+               gd->ram_size >> 20,
+               gd->bd->bi_flashsize >> 20 );
+#endif /* CONFIG_LCD_INFO_BELOW_LOGO */
+}
+#endif /* CONFIG_LCD_INFO */
+
 /*---------------Board Special Commands: PIC read/write ---------------*/
 
 #if defined(CONFIG_CMD_BSP)
@@ -818,14 +845,14 @@ int do_pic (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        default:
                break;
        }
-       printf ("Usage:\n%s\n", cmdtp->usage);
+       cmd_usage(cmdtp);
        return 1;
 }
 U_BOOT_CMD(
        pic,    4,      1,      do_pic,
-       "pic     - read and write PIC registers\n",
+       "read and write PIC registers",
        "read  reg      - read PIC register `reg'\n"
-       "pic write reg val  - write value `val' to PIC register `reg'\n"
+       "pic write reg val  - write value `val' to PIC register `reg'"
 );
 
 /***********************************************************************
@@ -882,8 +909,8 @@ int do_kbd (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 U_BOOT_CMD(
        kbd,    1,      1,      do_kbd,
-       "kbd     - read keyboard status\n",
-       NULL
+       "read keyboard status",
+       ""
 );
 
 /* Read and set LSB switch */
@@ -948,16 +975,16 @@ int do_lsb (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        default:
                break;
        }
-       printf ("Usage:\n%s\n", cmdtp->usage);
+       cmd_usage(cmdtp);
        return 1;
 }
 
 U_BOOT_CMD(
        lsb,    2,      1,      do_lsb,
-       "lsb     - check and set LSB switch\n",
+       "check and set LSB switch",
        "on  - switch LSB on\n"
        "lsb off - switch LSB off\n"
-       "lsb     - print current setting\n"
+       "lsb     - print current setting"
 );
 
 #endif