Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

[u-boot] / board / mpl / pati / cmd_pati.c

diff --git a/board/mpl/pati/cmd_pati.c b/board/mpl/pati/cmd_pati.c
index 91683a38d175ea09f364317c22994233e155ba79..aba11d5a7568beea4d860b4224c0170fdfaa95cb 100644 (file)
--- a/board/mpl/pati/cmd_pati.c
+++ b/board/mpl/pati/cmd_pati.c
@@ -31,13 +31,13 @@
 #include "pci_eeprom.h"
 
 extern void show_pld_regs(void);
-extern int do_mplcommon(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);
+extern int do_mplcommon(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
 
 extern void user_led0(int led_on);
 extern void user_led1(int led_on);
 
 /* ------------------------------------------------------------------------- */
-#if defined(CFG_PCI_CON_DEVICE)
+#if defined(CONFIG_SYS_PCI_CON_DEVICE)
 extern void pci_con_disc(void);
 extern void pci_con_connect(void);
 #endif
@@ -276,7 +276,7 @@ static int pati_pci_eeprom_write(unsigned short offset, unsigned long addr, unsi
 static int pati_pci_eeprom_read(unsigned short offset, unsigned long addr, unsigned short size)
 {
        int i;
-       unsigned short value;
+       unsigned short value = 0;
        unsigned short *buffer =(unsigned short *)addr;
        if((offset + size) > PATI_EEPROM_LAST_OFFSET) {
                size = PATI_EEPROM_LAST_OFFSET - offset;
@@ -355,7 +355,7 @@ static void display_pci_regs(void)
 }
 
 
-int do_pati(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_pati(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        if (strcmp(argv[1], "info") == 0)
        {
@@ -378,7 +378,7 @@ int do_pati(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                        user_led1(led_on);
                return 0;
        }
-#if defined(CFG_PCI_CON_DEVICE)
+#if defined(CONFIG_SYS_PCI_CON_DEVICE)
        if (strcmp(argv[1], "con") == 0) {
                pci_con_connect();
                return 0;
@@ -427,7 +427,7 @@ int do_pati(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 U_BOOT_CMD(
        pati,   8,      1,      do_pati,
-       "pati    - PATI specific Cmds\n",
+       "PATI specific Cmds",
        "info - displays board information\n"
        "pati pci  - displays PCI registers\n"
        "pati led <nr> <on> \n"
@@ -443,7 +443,7 @@ U_BOOT_CMD(
        "    era   - erase PCI EEPROM (write all word to 0xffff)\n"
        "    reload- Reload PCI Bridge with EEPROM Values\n"
        "    NOTE: <addr> must start on word boundary\n"
-       "          <offset> and <size> must be even byte values\n"
+       "          <offset> and <size> must be even byte values"
 );
 
 /* ------------------------------------------------------------------------- */