* Patches by Yuli Barcohen, 13 Jul 2003:

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

diff --git a/board/lwmon/lwmon.c b/board/lwmon/lwmon.c
index 91aa58c..04721a3 100644 (file)
--- a/board/lwmon/lwmon.c
+++ b/board/lwmon/lwmon.c
@@ -184,7 +184,7 @@ V* Verification: dzu@denx.de
  ***********************************************************************/
 int checkboard (void)
 {
-       puts ("Board: Litronic Monitor IV\n");
+       puts ("Board: LICCON Konsole LCD2\n");
        return (0);
 }
 
@@ -851,8 +851,8 @@ int do_pic (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        printf ("Usage:\n%s\n", cmdtp->usage);
        return 1;
 }
-cmd_tbl_t U_BOOT_CMD(pic) = MK_CMD_ENTRY(
-       "pic",  4,      1,      do_pic,
+U_BOOT_CMD(
+       pic,    4,      1,      do_pic,
        "pic     - read and write PIC registers\n",
        "read  reg      - read PIC register `reg'\n"
        "pic write reg val  - write value `val' to PIC register `reg'\n"
@@ -910,8 +910,8 @@ int do_kbd (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        return 0;
 }
 
-cmd_tbl_t U_BOOT_CMD(kdb) = MK_CMD_ENTRY(
-       "kbd",  1,      1,      do_kbd,
+U_BOOT_CMD(
+       kbd,    1,      1,      do_kbd,
        "kbd     - read keyboard status\n",
        NULL
 );
@@ -982,8 +982,8 @@ int do_lsb (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        return 1;
 }
 
-cmd_tbl_t U_BOOT_CMD(lsb) = MK_CMD_ENTRY(
-       "lsb",  2,      1,      do_lsb,
+U_BOOT_CMD(
+       lsb,    2,      1,      do_lsb,
        "lsb     - check and set LSB switch\n",
        "on  - switch LSB on\n"
        "lsb off - switch LSB off\n"
@@ -1071,3 +1071,23 @@ static int key_pressed(void)
        return (compare_magic(kbd_data, CONFIG_MODEM_KEY_MAGIC) == 0);
 }
 #endif /* CONFIG_MODEM_SUPPORT */
+
+#ifdef CONFIG_POST
+/* 
+ * Returns 1 if keys pressed to start the power-on long-running tests
+ * Called from board_init_f().
+ */
+int post_hotkeys_pressed(gd_t *gd)
+{
+       uchar kbd_data[KEYBD_DATALEN];
+       uchar val;
+
+       /* Read keys */
+       val = KEYBD_CMD_READ_KEYS;
+       i2c_write (kbd_addr, 0, 0, &val, 1);
+       i2c_read (kbd_addr, 0, 0, kbd_data, KEYBD_DATALEN);
+
+       return (gd->post_hotkeys_latch = 
+                       (compare_magic(kbd_data, CONFIG_POST_KEY_MAGIC) == 0));
+}
+#endif