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]
/
cpu
/
mpc85xx
/
pci.c
diff --git
a/cpu/mpc85xx/pci.c
b/cpu/mpc85xx/pci.c
index
fdc4c83
..
112f18c
100644
(file)
--- a/
cpu/mpc85xx/pci.c
+++ b/
cpu/mpc85xx/pci.c
@@
-39,11
+39,11
@@
pci_mpc85xx_init(struct pci_controller *board_hose)
u16 reg16;
u32 dev;
u16 reg16;
u32 dev;
- volatile ccsr_pcix_t *pcix = (void *)(C
FG
_MPC85xx_PCIX_ADDR);
+ volatile ccsr_pcix_t *pcix = (void *)(C
ONFIG_SYS
_MPC85xx_PCIX_ADDR);
#ifdef CONFIG_MPC85XX_PCI2
#ifdef CONFIG_MPC85XX_PCI2
- volatile ccsr_pcix_t *pcix2 = (void *)(C
FG
_MPC85xx_PCIX2_ADDR);
+ volatile ccsr_pcix_t *pcix2 = (void *)(C
ONFIG_SYS
_MPC85xx_PCIX2_ADDR);
#endif
#endif
- volatile ccsr_gur_t *gur = (void *)(C
FG
_MPC85xx_GUTS_ADDR);
+ volatile ccsr_gur_t *gur = (void *)(C
ONFIG_SYS
_MPC85xx_GUTS_ADDR);
struct pci_controller * hose;
pci_hose = board_hose;
struct pci_controller * hose;
pci_hose = board_hose;
@@
-54,8
+54,8
@@
pci_mpc85xx_init(struct pci_controller *board_hose)
hose->last_busno = 0xff;
pci_setup_indirect(hose,
hose->last_busno = 0xff;
pci_setup_indirect(hose,
- (C
FG
_IMMR+0x8000),
- (C
FG
_IMMR+0x8004));
+ (C
ONFIG_SYS
_IMMR+0x8000),
+ (C
ONFIG_SYS
_IMMR+0x8004));
/*
* Hose scan.
/*
* Hose scan.
@@
-80,19
+80,19
@@
pci_mpc85xx_init(struct pci_controller *board_hose)
pci_hose_write_config_word(hose, dev, PCIX_COMMAND, reg16);
}
pci_hose_write_config_word(hose, dev, PCIX_COMMAND, reg16);
}
- pcix->potar1 = (C
FG
_PCI1_MEM_BASE >> 12) & 0x000fffff;
+ pcix->potar1 = (C
ONFIG_SYS
_PCI1_MEM_BASE >> 12) & 0x000fffff;
pcix->potear1 = 0x00000000;
pcix->potear1 = 0x00000000;
- pcix->powbar1 = (C
FG
_PCI1_MEM_PHYS >> 12) & 0x000fffff;
+ pcix->powbar1 = (C
ONFIG_SYS
_PCI1_MEM_PHYS >> 12) & 0x000fffff;
pcix->powbear1 = 0x00000000;
pcix->powar1 = (POWAR_EN | POWAR_MEM_READ |
pcix->powbear1 = 0x00000000;
pcix->powar1 = (POWAR_EN | POWAR_MEM_READ |
- POWAR_MEM_WRITE | (__ilog2(C
FG
_PCI1_MEM_SIZE) - 1));
+ POWAR_MEM_WRITE | (__ilog2(C
ONFIG_SYS
_PCI1_MEM_SIZE) - 1));
- pcix->potar2 = (C
FG
_PCI1_IO_BASE >> 12) & 0x000fffff;
+ pcix->potar2 = (C
ONFIG_SYS
_PCI1_IO_BASE >> 12) & 0x000fffff;
pcix->potear2 = 0x00000000;
pcix->potear2 = 0x00000000;
- pcix->powbar2 = (C
FG
_PCI1_IO_PHYS >> 12) & 0x000fffff;
+ pcix->powbar2 = (C
ONFIG_SYS
_PCI1_IO_PHYS >> 12) & 0x000fffff;
pcix->powbear2 = 0x00000000;
pcix->powar2 = (POWAR_EN | POWAR_IO_READ |
pcix->powbear2 = 0x00000000;
pcix->powar2 = (POWAR_EN | POWAR_IO_READ |
- POWAR_IO_WRITE | (__ilog2(C
FG
_PCI1_IO_SIZE) - 1));
+ POWAR_IO_WRITE | (__ilog2(C
ONFIG_SYS
_PCI1_IO_SIZE) - 1));
pcix->pitar1 = 0x00000000;
pcix->piwbar1 = 0x00000000;
pcix->pitar1 = 0x00000000;
pcix->piwbar1 = 0x00000000;
@@
-105,15
+105,15
@@
pci_mpc85xx_init(struct pci_controller *board_hose)
pcix->piwar3 = 0;
pci_set_region(hose->regions + 0,
pcix->piwar3 = 0;
pci_set_region(hose->regions + 0,
- C
FG
_PCI1_MEM_BASE,
- C
FG
_PCI1_MEM_PHYS,
- C
FG
_PCI1_MEM_SIZE,
+ C
ONFIG_SYS
_PCI1_MEM_BASE,
+ C
ONFIG_SYS
_PCI1_MEM_PHYS,
+ C
ONFIG_SYS
_PCI1_MEM_SIZE,
PCI_REGION_MEM);
pci_set_region(hose->regions + 1,
PCI_REGION_MEM);
pci_set_region(hose->regions + 1,
- C
FG
_PCI1_IO_BASE,
- C
FG
_PCI1_IO_PHYS,
- C
FG
_PCI1_IO_SIZE,
+ C
ONFIG_SYS
_PCI1_IO_BASE,
+ C
ONFIG_SYS
_PCI1_IO_PHYS,
+ C
ONFIG_SYS
_PCI1_IO_SIZE,
PCI_REGION_IO);
hose->region_count = 2;
PCI_REGION_IO);
hose->region_count = 2;
@@
-152,8
+152,8
@@
pci_mpc85xx_init(struct pci_controller *board_hose)
hose->last_busno = 0xff;
pci_setup_indirect(hose,
hose->last_busno = 0xff;
pci_setup_indirect(hose,
- (C
FG
_IMMR+0x9000),
- (C
FG
_IMMR+0x9004));
+ (C
ONFIG_SYS
_IMMR+0x9000),
+ (C
ONFIG_SYS
_IMMR+0x9004));
dev = PCI_BDF(hose->first_busno, 0, 0);
pci_hose_read_config_word (hose, dev, PCI_COMMAND, ®16);
dev = PCI_BDF(hose->first_busno, 0, 0);
pci_hose_read_config_word (hose, dev, PCI_COMMAND, ®16);
@@
-165,19
+165,19
@@
pci_mpc85xx_init(struct pci_controller *board_hose)
*/
pci_hose_write_config_word(hose, dev, PCI_STATUS, 0xffff);
*/
pci_hose_write_config_word(hose, dev, PCI_STATUS, 0xffff);
- pcix2->potar1 = (C
FG
_PCI2_MEM_BASE >> 12) & 0x000fffff;
+ pcix2->potar1 = (C
ONFIG_SYS
_PCI2_MEM_BASE >> 12) & 0x000fffff;
pcix2->potear1 = 0x00000000;
pcix2->potear1 = 0x00000000;
- pcix2->powbar1 = (C
FG
_PCI2_MEM_PHYS >> 12) & 0x000fffff;
+ pcix2->powbar1 = (C
ONFIG_SYS
_PCI2_MEM_PHYS >> 12) & 0x000fffff;
pcix2->powbear1 = 0x00000000;
pcix2->powar1 = (POWAR_EN | POWAR_MEM_READ |
pcix2->powbear1 = 0x00000000;
pcix2->powar1 = (POWAR_EN | POWAR_MEM_READ |
- POWAR_MEM_WRITE | (__ilog2(C
FG
_PCI2_MEM_SIZE) - 1));
+ POWAR_MEM_WRITE | (__ilog2(C
ONFIG_SYS
_PCI2_MEM_SIZE) - 1));
- pcix2->potar2 = (C
FG
_PCI2_IO_BASE >> 12) & 0x000fffff;
+ pcix2->potar2 = (C
ONFIG_SYS
_PCI2_IO_BASE >> 12) & 0x000fffff;
pcix2->potear2 = 0x00000000;
pcix2->potear2 = 0x00000000;
- pcix2->powbar2 = (C
FG
_PCI2_IO_PHYS >> 12) & 0x000fffff;
+ pcix2->powbar2 = (C
ONFIG_SYS
_PCI2_IO_PHYS >> 12) & 0x000fffff;
pcix2->powbear2 = 0x00000000;
pcix2->powar2 = (POWAR_EN | POWAR_IO_READ |
pcix2->powbear2 = 0x00000000;
pcix2->powar2 = (POWAR_EN | POWAR_IO_READ |
- POWAR_IO_WRITE | (__ilog2(C
FG
_PCI2_IO_SIZE) - 1));
+ POWAR_IO_WRITE | (__ilog2(C
ONFIG_SYS
_PCI2_IO_SIZE) - 1));
pcix2->pitar1 = 0x00000000;
pcix2->piwbar1 = 0x00000000;
pcix2->pitar1 = 0x00000000;
pcix2->piwbar1 = 0x00000000;
@@
-190,15
+190,15
@@
pci_mpc85xx_init(struct pci_controller *board_hose)
pcix2->piwar3 = 0;
pci_set_region(hose->regions + 0,
pcix2->piwar3 = 0;
pci_set_region(hose->regions + 0,
- C
FG
_PCI2_MEM_BASE,
- C
FG
_PCI2_MEM_PHYS,
- C
FG
_PCI2_MEM_SIZE,
+ C
ONFIG_SYS
_PCI2_MEM_BASE,
+ C
ONFIG_SYS
_PCI2_MEM_PHYS,
+ C
ONFIG_SYS
_PCI2_MEM_SIZE,
PCI_REGION_MEM);
pci_set_region(hose->regions + 1,
PCI_REGION_MEM);
pci_set_region(hose->regions + 1,
- C
FG
_PCI2_IO_BASE,
- C
FG
_PCI2_IO_PHYS,
- C
FG
_PCI2_IO_SIZE,
+ C
ONFIG_SYS
_PCI2_IO_BASE,
+ C
ONFIG_SYS
_PCI2_IO_PHYS,
+ C
ONFIG_SYS
_PCI2_IO_SIZE,
PCI_REGION_IO);
hose->region_count = 2;
PCI_REGION_IO);
hose->region_count = 2;