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

[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 881d1799f09fdde651922fdeffb8f8bbda9ddfe0..f83dfe870bc969ad7ff934ffa7b9168383a5ec0f 100644 (file)
--- a/board/esd/ocrtc/cmd_ocrtc.c
+++ b/board/esd/ocrtc/cmd_ocrtc.c
@@ -24,14 +24,11 @@
 #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 IBM_VENDOR_ID    0x1014
-#define PPC405_DEVICE_ID 0x0156
-
+#if defined(CONFIG_CMD_BSP)
 
 /*
  * Set device number on pci board
@@ -43,7 +40,7 @@ int do_setdevice(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        u32 addr;
 
        while (bdf >= 0) {
-               if ((bdf = pci_find_device(IBM_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);