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
/
sbc8349
/
pci.c
diff --git
a/board/sbc8349/pci.c
b/board/sbc8349/pci.c
index
527f7e4
..
9022c55
100644
(file)
--- a/
board/sbc8349/pci.c
+++ b/
board/sbc8349/pci.c
@@
-40,8
+40,8
@@
DECLARE_GLOBAL_DATA_PTR;
#ifdef CONFIG_PCI
/* System RAM mapped to PCI space */
#ifdef CONFIG_PCI
/* System RAM mapped to PCI space */
-#define CONFIG_PCI_SYS_MEM_BUS C
FG
_SDRAM_BASE
-#define CONFIG_PCI_SYS_MEM_PHYS C
FG
_SDRAM_BASE
+#define CONFIG_PCI_SYS_MEM_BUS C
ONFIG_SYS
_SDRAM_BASE
+#define CONFIG_PCI_SYS_MEM_PHYS C
ONFIG_SYS
_SDRAM_BASE
#ifndef CONFIG_PCI_PNP
static struct pci_config_table pci_mpc8349emds_config_table[] = {
#ifndef CONFIG_PCI_PNP
static struct pci_config_table pci_mpc8349emds_config_table[] = {
@@
-90,7
+90,7
@@
pci_init_board(void)
u32 dev;
struct pci_controller * hose;
u32 dev;
struct pci_controller * hose;
- immr = (immap_t *)C
FG
_IMMR;
+ immr = (immap_t *)C
ONFIG_SYS
_IMMR;
clk = (clk83xx_t *)&immr->clk;
pci_law = immr->sysconf.pcilaw;
pci_pot = immr->ios.pot;
clk = (clk83xx_t *)&immr->clk;
pci_law = immr->sysconf.pcilaw;
pci_pot = immr->ios.pot;
@@
-132,10
+132,10
@@
pci_init_board(void)
/*
* Configure PCI Local Access Windows
*/
/*
* Configure PCI Local Access Windows
*/
- pci_law[0].bar = C
FG
_PCI1_MEM_PHYS & LAWBAR_BAR;
+ pci_law[0].bar = C
ONFIG_SYS
_PCI1_MEM_PHYS & LAWBAR_BAR;
pci_law[0].ar = LAWAR_EN | LAWAR_SIZE_1G;
pci_law[0].ar = LAWAR_EN | LAWAR_SIZE_1G;
- pci_law[1].bar = C
FG
_PCI1_IO_PHYS & LAWBAR_BAR;
+ pci_law[1].bar = C
ONFIG_SYS
_PCI1_IO_PHYS & LAWBAR_BAR;
pci_law[1].ar = LAWAR_EN | LAWAR_SIZE_4M;
/*
pci_law[1].ar = LAWAR_EN | LAWAR_SIZE_4M;
/*
@@
-143,18
+143,18
@@
pci_init_board(void)
*/
/* PCI1 mem space - prefetch */
*/
/* PCI1 mem space - prefetch */
- pci_pot[0].potar = (C
FG
_PCI1_MEM_BASE >> 12) & POTAR_TA_MASK;
- pci_pot[0].pobar = (C
FG
_PCI1_MEM_PHYS >> 12) & POBAR_BA_MASK;
+ pci_pot[0].potar = (C
ONFIG_SYS
_PCI1_MEM_BASE >> 12) & POTAR_TA_MASK;
+ pci_pot[0].pobar = (C
ONFIG_SYS
_PCI1_MEM_PHYS >> 12) & POBAR_BA_MASK;
pci_pot[0].pocmr = POCMR_EN | POCMR_PREFETCH_EN | (POCMR_CM_256M & POCMR_CM_MASK);
/* PCI1 IO space */
pci_pot[0].pocmr = POCMR_EN | POCMR_PREFETCH_EN | (POCMR_CM_256M & POCMR_CM_MASK);
/* PCI1 IO space */
- pci_pot[1].potar = (C
FG
_PCI1_IO_BASE >> 12) & POTAR_TA_MASK;
- pci_pot[1].pobar = (C
FG
_PCI1_IO_PHYS >> 12) & POBAR_BA_MASK;
+ pci_pot[1].potar = (C
ONFIG_SYS
_PCI1_IO_BASE >> 12) & POTAR_TA_MASK;
+ pci_pot[1].pobar = (C
ONFIG_SYS
_PCI1_IO_PHYS >> 12) & POBAR_BA_MASK;
pci_pot[1].pocmr = POCMR_EN | POCMR_IO | (POCMR_CM_1M & POCMR_CM_MASK);
/* PCI1 mmio - non-prefetch mem space */
pci_pot[1].pocmr = POCMR_EN | POCMR_IO | (POCMR_CM_1M & POCMR_CM_MASK);
/* PCI1 mmio - non-prefetch mem space */
- pci_pot[2].potar = (C
FG
_PCI1_MMIO_BASE >> 12) & POTAR_TA_MASK;
- pci_pot[2].pobar = (C
FG
_PCI1_MMIO_PHYS >> 12) & POBAR_BA_MASK;
+ pci_pot[2].potar = (C
ONFIG_SYS
_PCI1_MMIO_BASE >> 12) & POTAR_TA_MASK;
+ pci_pot[2].pobar = (C
ONFIG_SYS
_PCI1_MMIO_PHYS >> 12) & POBAR_BA_MASK;
pci_pot[2].pocmr = POCMR_EN | (POCMR_CM_256M & POCMR_CM_MASK);
/*
pci_pot[2].pocmr = POCMR_EN | (POCMR_CM_256M & POCMR_CM_MASK);
/*
@@
-173,23
+173,23
@@
pci_init_board(void)
/* PCI memory prefetch space */
pci_set_region(hose->regions + 0,
/* PCI memory prefetch space */
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_REGION_PREFETCH);
/* PCI memory space */
pci_set_region(hose->regions + 1,
PCI_REGION_MEM|PCI_REGION_PREFETCH);
/* PCI memory space */
pci_set_region(hose->regions + 1,
- C
FG
_PCI1_MMIO_BASE,
- C
FG
_PCI1_MMIO_PHYS,
- C
FG
_PCI1_MMIO_SIZE,
+ C
ONFIG_SYS
_PCI1_MMIO_BASE,
+ C
ONFIG_SYS
_PCI1_MMIO_PHYS,
+ C
ONFIG_SYS
_PCI1_MMIO_SIZE,
PCI_REGION_MEM);
/* PCI IO space */
pci_set_region(hose->regions + 2,
PCI_REGION_MEM);
/* PCI IO space */
pci_set_region(hose->regions + 2,
- 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);
/* System memory space */
PCI_REGION_IO);
/* System memory space */
@@
-202,8
+202,8
@@
pci_init_board(void)
hose->region_count = 4;
pci_setup_indirect(hose,
hose->region_count = 4;
pci_setup_indirect(hose,
- (C
FG
_IMMR+0x8300),
- (C
FG
_IMMR+0x8304));
+ (C
ONFIG_SYS
_IMMR+0x8300),
+ (C
ONFIG_SYS
_IMMR+0x8304));
pci_register_hose(hose);
pci_register_hose(hose);
@@
-239,18
+239,18
@@
pci_init_board(void)
*/
/* PCI2 mem space - prefetch */
*/
/* PCI2 mem space - prefetch */
- pci_pot[3].potar = (C
FG
_PCI2_MEM_BASE >> 12) & POTAR_TA_MASK;
- pci_pot[3].pobar = (C
FG
_PCI2_MEM_PHYS >> 12) & POBAR_BA_MASK;
+ pci_pot[3].potar = (C
ONFIG_SYS
_PCI2_MEM_BASE >> 12) & POTAR_TA_MASK;
+ pci_pot[3].pobar = (C
ONFIG_SYS
_PCI2_MEM_PHYS >> 12) & POBAR_BA_MASK;
pci_pot[3].pocmr = POCMR_EN | POCMR_PCI2 | POCMR_PREFETCH_EN | (POCMR_CM_256M & POCMR_CM_MASK);
/* PCI2 IO space */
pci_pot[3].pocmr = POCMR_EN | POCMR_PCI2 | POCMR_PREFETCH_EN | (POCMR_CM_256M & POCMR_CM_MASK);
/* PCI2 IO space */
- pci_pot[4].potar = (C
FG
_PCI2_IO_BASE >> 12) & POTAR_TA_MASK;
- pci_pot[4].pobar = (C
FG
_PCI2_IO_PHYS >> 12) & POBAR_BA_MASK;
+ pci_pot[4].potar = (C
ONFIG_SYS
_PCI2_IO_BASE >> 12) & POTAR_TA_MASK;
+ pci_pot[4].pobar = (C
ONFIG_SYS
_PCI2_IO_PHYS >> 12) & POBAR_BA_MASK;
pci_pot[4].pocmr = POCMR_EN | POCMR_PCI2 | POCMR_IO | (POCMR_CM_1M & POCMR_CM_MASK);
/* PCI2 mmio - non-prefetch mem space */
pci_pot[4].pocmr = POCMR_EN | POCMR_PCI2 | POCMR_IO | (POCMR_CM_1M & POCMR_CM_MASK);
/* PCI2 mmio - non-prefetch mem space */
- pci_pot[5].potar = (C
FG
_PCI2_MMIO_BASE >> 12) & POTAR_TA_MASK;
- pci_pot[5].pobar = (C
FG
_PCI2_MMIO_PHYS >> 12) & POBAR_BA_MASK;
+ pci_pot[5].potar = (C
ONFIG_SYS
_PCI2_MMIO_BASE >> 12) & POTAR_TA_MASK;
+ pci_pot[5].pobar = (C
ONFIG_SYS
_PCI2_MMIO_PHYS >> 12) & POBAR_BA_MASK;
pci_pot[5].pocmr = POCMR_EN | POCMR_PCI2 | (POCMR_CM_256M & POCMR_CM_MASK);
/*
pci_pot[5].pocmr = POCMR_EN | POCMR_PCI2 | (POCMR_CM_256M & POCMR_CM_MASK);
/*
@@
-269,23
+269,23
@@
pci_init_board(void)
/* PCI memory prefetch space */
pci_set_region(hose->regions + 0,
/* PCI memory prefetch space */
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_REGION_PREFETCH);
/* PCI memory space */
pci_set_region(hose->regions + 1,
PCI_REGION_MEM|PCI_REGION_PREFETCH);
/* PCI memory space */
pci_set_region(hose->regions + 1,
- C
FG
_PCI2_MMIO_BASE,
- C
FG
_PCI2_MMIO_PHYS,
- C
FG
_PCI2_MMIO_SIZE,
+ C
ONFIG_SYS
_PCI2_MMIO_BASE,
+ C
ONFIG_SYS
_PCI2_MMIO_PHYS,
+ C
ONFIG_SYS
_PCI2_MMIO_SIZE,
PCI_REGION_MEM);
/* PCI IO space */
pci_set_region(hose->regions + 2,
PCI_REGION_MEM);
/* PCI IO space */
pci_set_region(hose->regions + 2,
- 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);
/* System memory space */
PCI_REGION_IO);
/* System memory space */
@@
-298,8
+298,8
@@
pci_init_board(void)
hose->region_count = 4;
pci_setup_indirect(hose,
hose->region_count = 4;
pci_setup_indirect(hose,
- (C
FG
_IMMR+0x8380),
- (C
FG
_IMMR+0x8384));
+ (C
ONFIG_SYS
_IMMR+0x8380),
+ (C
ONFIG_SYS
_IMMR+0x8384));
pci_register_hose(hose);
pci_register_hose(hose);