projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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[] = {
{
#if defined(CONFIG_PCI)
static struct pci_region pci_regions[] = {
{
- bus_start: C
FG
_PCI_MEM_BASE,
- phys_start: C
FG
_PCI_MEM_PHYS,
- size: C
FG
_PCI_MEM_SIZE,
+ bus_start: C
ONFIG_SYS
_PCI_MEM_BASE,
+ phys_start: C
ONFIG_SYS
_PCI_MEM_PHYS,
+ size: C
ONFIG_SYS
_PCI_MEM_SIZE,
flags: PCI_REGION_MEM | PCI_REGION_PREFETCH
},
{
flags: PCI_REGION_MEM | PCI_REGION_PREFETCH
},
{
- bus_start: C
FG
_PCI_MMIO_BASE,
- phys_start: C
FG
_PCI_MMIO_PHYS,
- size: C
FG
_PCI_MMIO_SIZE,
+ bus_start: C
ONFIG_SYS
_PCI_MMIO_BASE,
+ phys_start: C
ONFIG_SYS
_PCI_MMIO_PHYS,
+ size: C
ONFIG_SYS
_PCI_MMIO_SIZE,
flags: PCI_REGION_MEM
},
{
flags: PCI_REGION_MEM
},
{
- bus_start: C
FG
_PCI_IO_BASE,
- phys_start: C
FG
_PCI_IO_PHYS,
- size: C
FG
_PCI_IO_SIZE,
+ bus_start: C
ONFIG_SYS
_PCI_IO_BASE,
+ phys_start: C
ONFIG_SYS
_PCI_IO_PHYS,
+ size: C
ONFIG_SYS
_PCI_IO_SIZE,
flags: PCI_REGION_IO
}
};
void pci_init_board(void)
{
flags: PCI_REGION_IO
}
};
void pci_init_board(void)
{
- volatile immap_t *immr = (volatile immap_t *)C
FG
_IMMR;
+ volatile immap_t *immr = (volatile immap_t *)C
ONFIG_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 };
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 */
udelay(2000);
/* Configure PCI Local Access Windows */
- pci_law[0].bar = C
FG
_PCI_MEM_PHYS & LAWBAR_BAR;
+ pci_law[0].bar = C
ONFIG_SYS
_PCI_MEM_PHYS & LAWBAR_BAR;
pci_law[0].ar = LBLAWAR_EN | LBLAWAR_512MB;
pci_law[0].ar = LBLAWAR_EN | LBLAWAR_512MB;
- pci_law[1].bar = C
FG
_PCI_IO_PHYS & LAWBAR_BAR;
+ pci_law[1].bar = C
ONFIG_SYS
_PCI_IO_PHYS & LAWBAR_BAR;
pci_law[1].ar = LBLAWAR_EN | LBLAWAR_1MB;
mpc83xx_pci_init(1, reg, 0);
pci_law[1].ar = LBLAWAR_EN | LBLAWAR_1MB;
mpc83xx_pci_init(1, reg, 0);