rename CFG_ macros to CONFIG_SYS

[platform/kernel/u-boot.git] / board / freescale / mpc837xerdb / pci.c

diff --git a/board/freescale/mpc837xerdb/pci.c b/board/freescale/mpc837xerdb/pci.c
index 26e7320..8bb31fc 100644 (file)
--- a/board/freescale/mpc837xerdb/pci.c
+++ b/board/freescale/mpc837xerdb/pci.c
@@ -17,28 +17,28 @@
 #if defined(CONFIG_PCI)
 static struct pci_region pci_regions[] = {
        {
-               bus_start: CFG_PCI_MEM_BASE,
-               phys_start: CFG_PCI_MEM_PHYS,
-               size: CFG_PCI_MEM_SIZE,
+               bus_start: CONFIG_SYS_PCI_MEM_BASE,
+               phys_start: CONFIG_SYS_PCI_MEM_PHYS,
+               size: CONFIG_SYS_PCI_MEM_SIZE,
                flags: PCI_REGION_MEM | PCI_REGION_PREFETCH
        },
        {
-               bus_start: CFG_PCI_MMIO_BASE,
-               phys_start: CFG_PCI_MMIO_PHYS,
-               size: CFG_PCI_MMIO_SIZE,
+               bus_start: CONFIG_SYS_PCI_MMIO_BASE,
+               phys_start: CONFIG_SYS_PCI_MMIO_PHYS,
+               size: CONFIG_SYS_PCI_MMIO_SIZE,
                flags: PCI_REGION_MEM
        },
        {
-               bus_start: CFG_PCI_IO_BASE,
-               phys_start: CFG_PCI_IO_PHYS,
-               size: CFG_PCI_IO_SIZE,
+               bus_start: CONFIG_SYS_PCI_IO_BASE,
+               phys_start: CONFIG_SYS_PCI_IO_PHYS,
+               size: CONFIG_SYS_PCI_IO_SIZE,
                flags: PCI_REGION_IO
        }
 };
 
 void pci_init_board(void)
 {
-       volatile immap_t *immr = (volatile immap_t *)CFG_IMMR;
+       volatile immap_t *immr = (volatile immap_t *)CONFIG_SYS_IMMR;
        volatile clk83xx_t *clk = (volatile clk83xx_t *)&immr->clk;
        volatile law83xx_t *pci_law = immr->sysconf.pcilaw;
        struct pci_region *reg[] = { pci_regions };
@@ -48,10 +48,10 @@ void pci_init_board(void)
        udelay(2000);
 
        /* Configure PCI Local Access Windows */
-       pci_law[0].bar = CFG_PCI_MEM_PHYS & LAWBAR_BAR;
+       pci_law[0].bar = CONFIG_SYS_PCI_MEM_PHYS & LAWBAR_BAR;
        pci_law[0].ar = LBLAWAR_EN | LBLAWAR_512MB;
 
-       pci_law[1].bar = CFG_PCI_IO_PHYS & LAWBAR_BAR;
+       pci_law[1].bar = CONFIG_SYS_PCI_IO_PHYS & LAWBAR_BAR;
        pci_law[1].ar = LBLAWAR_EN | LBLAWAR_1MB;
 
        mpc83xx_pci_init(1, reg, 0);