Merge branch 'next' of git://git.denx.de/u-boot into next

[karo-tx-uboot.git] / board / esd / dasa_sim / cmd_dasa_sim.c

diff --git a/board/esd/dasa_sim/cmd_dasa_sim.c b/board/esd/dasa_sim/cmd_dasa_sim.c
index 97a39c9d7a5cb0b845c9a7c5b526d20a70d66c54..4946538f4bbcf31f13468f12867864cbb4c2f7e3 100644 (file)
--- a/board/esd/dasa_sim/cmd_dasa_sim.c
+++ b/board/esd/dasa_sim/cmd_dasa_sim.c
@@ -25,6 +25,7 @@
 #include <common.h>
 #include <command.h>
 #include <pci.h>
+#include <asm/io.h>
 
 #define OK 0
 #define ERROR (-1)
@@ -136,8 +137,8 @@ static void updatePci9054 (void)
        /*
         * Set EEPROM write-protect register to 0
         */
-       out32 (pci9054_iobase + 0x0c,
-                  in32 (pci9054_iobase + 0x0c) & 0xffff00ff);
+       out_be32 ((void *)(pci9054_iobase + 0x0c),
+                 in_be32 ((void *)(pci9054_iobase + 0x0c)) & 0xffff00ff);
 
        /* Long Serial EEPROM Load Registers... */
        val = PciEepromWriteLongVPD (0x00, 0x905410b5);
@@ -190,8 +191,8 @@ static void clearPci9054 (void)
        /*
         * Set EEPROM write-protect register to 0
         */
-       out32 (pci9054_iobase + 0x0c,
-               in32 (pci9054_iobase + 0x0c) & 0xffff00ff);
+       out_be32 ((void *)(pci9054_iobase + 0x0c),
+                 in_be32 ((void *)(pci9054_iobase + 0x0c)) & 0xffff00ff);
 
        /* Long Serial EEPROM Load Registers... */
        val = PciEepromWriteLongVPD (0x00, 0xffffffff);
@@ -203,7 +204,7 @@ static void clearPci9054 (void)
 
 /* ------------------------------------------------------------------------- */
 int do_pci9054 (cmd_tbl_t * cmdtp, int flag, int argc,
-                               char *argv[])
+                               char * const argv[])
 {
        if (strcmp (argv[1], "info") == 0) {
                showPci9054 ();
@@ -220,16 +221,14 @@ int do_pci9054 (cmd_tbl_t * cmdtp, int flag, int argc,
                return 0;
        }
 
-       cmd_usage(cmdtp);
-       return 1;
-
+       return cmd_usage(cmdtp);
 }
 
 U_BOOT_CMD(
        pci9054, 3, 1, do_pci9054,
-       "pci9054 - PLX PCI9054 EEPROM access\n",
+       "PLX PCI9054 EEPROM access",
        "pci9054 info - print EEPROM values\n"
-       "pci9054 update - updates EEPROM with default values\n"
+       "pci9054 update - updates EEPROM with default values"
 );
 
 /* ------------------------------------------------------------------------- */