board/esd/cpci5200/strataflash.c: Fix GCC 4.6 build warning

[u-boot] / board / w7o / cmd_vpd.c

diff --git a/board/w7o/cmd_vpd.c b/board/w7o/cmd_vpd.c
index 58c4a0b319953e7508ccf1ea33289347964d714f..cab9881ad8c83f811c9f3ff2ac499b1a42fba08e 100644 (file)
--- a/board/w7o/cmd_vpd.c
+++ b/board/w7o/cmd_vpd.c
@@ -24,7 +24,7 @@
 #include <common.h>
 #include <command.h>
 
-#if (CONFIG_COMMANDS & CFG_CMD_BSP) || defined(CONFIG_CMD_BSP)
+#if defined(CONFIG_CMD_BSP)
 
 #include "vpd.h"
 
@@ -32,16 +32,14 @@
  * Interpreter command to retrieve board specific Vital Product Data, "VPD"
  * ======================================================================
  */
-int do_vpd (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
+int do_vpd (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
 {
        VPD vpd;                        /* Board specific data struct */
-       uchar dev_addr = CFG_DEF_EEPROM_ADDR;
+       uchar dev_addr = CONFIG_SYS_DEF_EEPROM_ADDR;
 
        /* Validate usage */
-       if (argc > 2) {
-               printf ("Usage:\n%s\n", cmdtp->usage);
-               return 1;
-       }
+       if (argc > 2)
+               return cmd_usage(cmdtp);
 
        /* Passed in EEPROM address */
        if (argc == 2)
@@ -58,9 +56,9 @@ int do_vpd (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 
 U_BOOT_CMD(
          vpd,  2,      1,      do_vpd,
-         "vpd     - Read Vital Product Data\n",
+         "Read Vital Product Data",
          "[dev_addr]\n"
-         "        - Read VPD Data from default address, or device address 'dev_addr'.\n"
+         "        - Read VPD Data from default address, or device address 'dev_addr'."
 );
 
-#endif /* (CONFIG_COMMANDS & CFG_CMD_BSP) */
+#endif