board/sandburst/common/flash.c: Fix GCC 4.6 build warning

[karo-tx-uboot.git] / board / pcippc2 / pcippc2.c

diff --git a/board/pcippc2/pcippc2.c b/board/pcippc2/pcippc2.c
index 80c2cb58e2d83a0e58f913ee59626c72649053c7..4a91458e8e6a6b2c008d5d095ed08c908579d8b7 100644 (file)
--- a/board/pcippc2/pcippc2.c
+++ b/board/pcippc2/pcippc2.c
@@ -69,7 +69,7 @@ phys_size_t initdram (int board_type)
        return cpc710_ram_init ();
 }
 
-int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        out32 (REG (CPC0, SPOR), 0);
        iobarrier_rw ();
@@ -147,10 +147,12 @@ void pci_init_board (void)
        cpc710_pci_enable_timeout ();
 }
 
+#ifdef CONFIG_CMD_DOC
 void doc_init (void)
 {
        doc_probe (pcippc2_fpga1_phys + HW_FPGA1_DOC);
 }
+#endif
 
 void pcippc2_cpci3264_init (void)
 {
@@ -204,7 +206,7 @@ void watchdog_reset (void)
 }
 
 #if defined(CONFIG_CMD_BSP)
-int do_wd (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_wd (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        switch (argc) {
        case 1:
@@ -230,8 +232,7 @@ int do_wd (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        default:
                break;
        }
-       cmd_usage(cmdtp);
-       return 1;
+       return cmd_usage(cmdtp);
 }
 
 U_BOOT_CMD(
@@ -239,7 +240,7 @@ U_BOOT_CMD(
        "check and set watchdog",
        "on   - switch watchDog on\n"
        "wd off  - switch watchdog off\n"
-       "wd      - print current status\n"
+       "wd      - print current status"
 );
 
 #endif