* Code cleanup:
  - remove trailing white space, trailing empty lines, C++ comments, etc.
  - split cmd_boot.c (separate cmd_bdinfo.c and cmd_load.c)

* Patches by Kenneth Johansson, 25 Jun 2003:
  - major rework of command structure
    (work done mostly by Michal Cendrowski and Joakim Kristiansen)
diff --git a/board/pcippc2/pcippc2.c b/board/pcippc2/pcippc2.c
index bab3c20..fd3d479 100644
--- a/board/pcippc2/pcippc2.c
+++ b/board/pcippc2/pcippc2.c
@@ -66,11 +66,13 @@
 	return cpc710_ram_init ();
 }
 
-void do_reset (cmd_tbl_t *cmdtp, bd_t *bd, int flag, int argc, char *argv[])
+int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
 	out32 (REG (CPC0, SPOR), 0);
 	iobarrier_rw ();
 	while (1);
+	/* notreached */
+	return (-1);
 }
 
 int board_pre_init (void)
@@ -201,7 +203,7 @@
 }
 
 #if (CONFIG_COMMANDS & CFG_CMD_BSP)
-int do_wd (cmd_tbl_t *cmdtp, bd_t *bd, int flag, int argc, char *argv[])
+int do_wd (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
 	switch (argc) {
 	case 1:
@@ -231,5 +233,13 @@
 	return 1;
 }
 
+cmd_tbl_t U_BOOT_CMD(wd) = MK_CMD_ENTRY(
+	"wd",	2,	1,	do_wd,
+	"wd      - check and set watchdog\n",
+	"on   - switch watchDog on\n"
+	"wd off  - switch watchdog off\n"
+	"wd      - print current status\n"
+);
+
 #endif	/* CFG_CMD_BSP */
 #endif	/* CONFIG_WATCHDOG */