Merge branch 'master' of git://git.denx.de/u-boot-i2c

[u-boot] / board / esd / ocrtc / cmd_ocrtc.c

diff --git a/board/esd/ocrtc/cmd_ocrtc.c b/board/esd/ocrtc/cmd_ocrtc.c
index e113d5cab6aa75f8ff810e90bdf23f66836330da..b59689b0a5ef5ee87a679b73efdb82f08c456b2a 100644 (file)
--- a/board/esd/ocrtc/cmd_ocrtc.c
+++ b/board/esd/ocrtc/cmd_ocrtc.c
@@ -24,26 +24,23 @@
 #include <common.h>
 #include <command.h>
 #include <pci.h>
-#include <405gp_pci.h>
+#include <pci_ids.h>
+#include <asm/4xx_pci.h>
 
 
-#if (CONFIG_COMMANDS & CFG_CMD_BSP)
-
-#define AMCC_VENDOR_ID         0x1014
-#define PPC405_DEVICE_ID       0x0156
-
+#if defined(CONFIG_CMD_BSP)
 
 /*
  * Set device number on pci board
  */
-int do_setdevice(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_setdevice(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        int idx = 1;      /* start at 1 (skip device 0) */
        pci_dev_t bdf = 0;
        u32 addr;
 
        while (bdf >= 0) {
-               if ((bdf = pci_find_device(AMCC_VENDOR_ID, PPC405_DEVICE_ID, idx++)) < 0) {
+               if ((bdf = pci_find_device(PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_405GP, idx++)) < 0) {
                        break;
                }
                printf("Found device nr %d at %x!\n", idx-1, bdf);
@@ -57,15 +54,15 @@ int do_setdevice(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 }
 U_BOOT_CMD(
        setdevice,      1,      1,      do_setdevice,
-       "setdevice - Set device number on pci adapter boards\n",
-       NULL
+       "Set device number on pci adapter boards",
+       ""
 );
 
 
 /*
  * Get device number on pci board
  */
-int do_getdevice(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_getdevice(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        u32 device;
        char str[32];
@@ -80,8 +77,8 @@ int do_getdevice(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 }
 U_BOOT_CMD(
        getdevice,      1,      1,      do_getdevice,
-       "getdevice - Get device number and set slot env variable\n",
-       NULL
+       "Get device number and set slot env variable",
+       ""
 );
 
 #endif