This patch unifies the use of config options in v2 to all start with CONFIG_

[coreboot.git] / src / arch / ppc / lib / pci_dev.c

diff --git a/src/arch/ppc/lib/pci_dev.c b/src/arch/ppc/lib/pci_dev.c
index adb047e3fe6ce43f58c21d92bf5160e43eb6b3e8..d821f17c77a325b6900193b7bb792b4f9bf57a9f 100644 (file)
--- a/src/arch/ppc/lib/pci_dev.c
+++ b/src/arch/ppc/lib/pci_dev.c
@@ -9,8 +9,8 @@ uint8_t pci_ppc_read_config8(unsigned char bus, int devfn, int where)
 {
        uint8_t res;
 
-       out_le32((unsigned *)PCIC0_CFGADDR, CONFIG_CMD(bus, devfn, where));
-       res = in_8((unsigned char *)PCIC0_CFGDATA + (where & 3));
+       out_le32((unsigned *)CONFIG_PCIC0_CFGADDR, CONFIG_CMD(bus, devfn, where));
+       res = in_8((unsigned char *)CONFIG_PCIC0_CFGDATA + (where & 3));
        return res;
 }
 
@@ -18,8 +18,8 @@ uint16_t pci_ppc_read_config16(unsigned char bus, int devfn, int where)
 {
        uint16_t res;
 
-       out_le32((unsigned *)PCIC0_CFGADDR, CONFIG_CMD(bus, devfn, where));
-       res = in_le16((unsigned short *)PCIC0_CFGDATA + (where & 2));
+       out_le32((unsigned *)CONFIG_PCIC0_CFGADDR, CONFIG_CMD(bus, devfn, where));
+       res = in_le16((unsigned short *)CONFIG_PCIC0_CFGDATA + (where & 2));
        return res;
 }
 
@@ -27,28 +27,28 @@ uint32_t pci_ppc_read_config32(unsigned char bus, int devfn, int where)
 {
        uint32_t res;
 
-       out_le32((unsigned *)PCIC0_CFGADDR, CONFIG_CMD(bus, devfn, where));
-       res = in_le32((unsigned *)PCIC0_CFGDATA);
+       out_le32((unsigned *)CONFIG_PCIC0_CFGADDR, CONFIG_CMD(bus, devfn, where));
+       res = in_le32((unsigned *)CONFIG_PCIC0_CFGDATA);
        return res;
 }
 
 int pci_ppc_write_config8(unsigned char bus, int devfn, int where, uint8_t data)
 {
-       out_le32((unsigned *)PCIC0_CFGADDR, CONFIG_CMD(bus, devfn, where));
-       out_8((unsigned char *)PCIC0_CFGDATA + (where & 3), data);
+       out_le32((unsigned *)CONFIG_PCIC0_CFGADDR, CONFIG_CMD(bus, devfn, where));
+       out_8((unsigned char *)CONFIG_PCIC0_CFGDATA + (where & 3), data);
        return 0;
 }
 
 int pci_ppc_write_config16(unsigned char bus, int devfn, int where, uint16_t data)
 {
-       out_le32((unsigned *)PCIC0_CFGADDR, CONFIG_CMD(bus, devfn, where));
-       out_le16((unsigned short *)PCIC0_CFGDATA + (where & 2), data);
+       out_le32((unsigned *)CONFIG_PCIC0_CFGADDR, CONFIG_CMD(bus, devfn, where));
+       out_le16((unsigned short *)CONFIG_PCIC0_CFGDATA + (where & 2), data);
        return 0;
 }
 
 int pci_ppc_write_config32(unsigned char bus, int devfn, int where, uint32_t data)
 {
-       out_le32((unsigned *)PCIC0_CFGADDR, CONFIG_CMD(bus, devfn, where));
-       out_le32((unsigned *)PCIC0_CFGDATA, data);
+       out_le32((unsigned *)CONFIG_PCIC0_CFGADDR, CONFIG_CMD(bus, devfn, where));
+       out_le32((unsigned *)CONFIG_PCIC0_CFGDATA, data);
        return 0;
 }