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
/
mpc8313erdb
/
mpc8313erdb.c
diff --git
a/board/freescale/mpc8313erdb/mpc8313erdb.c
b/board/freescale/mpc8313erdb/mpc8313erdb.c
index
ebb703d
..
9ffd4bf
100644
(file)
--- a/
board/freescale/mpc8313erdb/mpc8313erdb.c
+++ b/
board/freescale/mpc8313erdb/mpc8313erdb.c
@@
-36,8
+36,8
@@
DECLARE_GLOBAL_DATA_PTR;
int board_early_init_f(void)
{
int board_early_init_f(void)
{
-#ifndef C
FG
_8313ERDB_BROKEN_PMC
- volatile immap_t *im = (immap_t *)C
FG
_IMMR;
+#ifndef C
ONFIG_SYS
_8313ERDB_BROKEN_PMC
+ volatile immap_t *im = (immap_t *)C
ONFIG_SYS
_IMMR;
if (im->pmc.pmccr1 & PMCCR1_POWER_OFF)
gd->flags |= GD_FLG_SILENT;
if (im->pmc.pmccr1 & PMCCR1_POWER_OFF)
gd->flags |= GD_FLG_SILENT;
@@
-55,28
+55,28
@@
int checkboard(void)
#ifndef CONFIG_NAND_SPL
static struct pci_region pci_regions[] = {
{
#ifndef CONFIG_NAND_SPL
static struct pci_region pci_regions[] = {
{
- bus_start: C
FG
_PCI1_MEM_BASE,
- phys_start: C
FG
_PCI1_MEM_PHYS,
- size: C
FG
_PCI1_MEM_SIZE,
+ bus_start: C
ONFIG_SYS
_PCI1_MEM_BASE,
+ phys_start: C
ONFIG_SYS
_PCI1_MEM_PHYS,
+ size: C
ONFIG_SYS
_PCI1_MEM_SIZE,
flags: PCI_REGION_MEM | PCI_REGION_PREFETCH
},
{
flags: PCI_REGION_MEM | PCI_REGION_PREFETCH
},
{
- bus_start: C
FG
_PCI1_MMIO_BASE,
- phys_start: C
FG
_PCI1_MMIO_PHYS,
- size: C
FG
_PCI1_MMIO_SIZE,
+ bus_start: C
ONFIG_SYS
_PCI1_MMIO_BASE,
+ phys_start: C
ONFIG_SYS
_PCI1_MMIO_PHYS,
+ size: C
ONFIG_SYS
_PCI1_MMIO_SIZE,
flags: PCI_REGION_MEM
},
{
flags: PCI_REGION_MEM
},
{
- bus_start: C
FG
_PCI1_IO_BASE,
- phys_start: C
FG
_PCI1_IO_PHYS,
- size: C
FG
_PCI1_IO_SIZE,
+ bus_start: C
ONFIG_SYS
_PCI1_IO_BASE,
+ phys_start: C
ONFIG_SYS
_PCI1_IO_PHYS,
+ size: C
ONFIG_SYS
_PCI1_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 };
@@
-88,14
+88,14
@@
void 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 = LBLAWAR_EN | LBLAWAR_512MB;
pci_law[0].ar = LBLAWAR_EN | LBLAWAR_512MB;
- 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 = LBLAWAR_EN | LBLAWAR_1MB;
warmboot = gd->bd->bi_bootflags & BOOTFLAG_WARM;
pci_law[1].ar = LBLAWAR_EN | LBLAWAR_1MB;
warmboot = gd->bd->bi_bootflags & BOOTFLAG_WARM;
-#ifndef C
FG
_8313ERDB_BROKEN_PMC
+#ifndef C
ONFIG_SYS
_8313ERDB_BROKEN_PMC
warmboot |= immr->pmc.pmccr1 & PMCCR1_POWER_OFF;
#endif
warmboot |= immr->pmc.pmccr1 & PMCCR1_POWER_OFF;
#endif
@@
-135,13
+135,13
@@
void ft_board_setup(void *blob, bd_t *bd)
void board_init_f(ulong bootflag)
{
board_early_init_f();
void board_init_f(ulong bootflag)
{
board_early_init_f();
- NS16550_init((NS16550_t)(C
FG
_IMMR + 0x4500),
- C
FG
_NS16550_CLK / 16 / CONFIG_BAUDRATE);
+ NS16550_init((NS16550_t)(C
ONFIG_SYS
_IMMR + 0x4500),
+ C
ONFIG_SYS
_NS16550_CLK / 16 / CONFIG_BAUDRATE);
puts("NAND boot... ");
init_timebase();
initdram(0);
puts("NAND boot... ");
init_timebase();
initdram(0);
- relocate_code(C
FG
_NAND_U_BOOT_RELOC + 0x10000, (gd_t *)gd,
- C
FG
_NAND_U_BOOT_RELOC);
+ relocate_code(C
ONFIG_SYS
_NAND_U_BOOT_RELOC + 0x10000, (gd_t *)gd,
+ C
ONFIG_SYS
_NAND_U_BOOT_RELOC);
}
void board_init_r(gd_t *gd, ulong dest_addr)
}
void board_init_r(gd_t *gd, ulong dest_addr)
@@
-155,8
+155,8
@@
void putc(char c)
return;
if (c == '\n')
return;
if (c == '\n')
- NS16550_putc((NS16550_t)(C
FG
_IMMR + 0x4500), '\r');
+ NS16550_putc((NS16550_t)(C
ONFIG_SYS
_IMMR + 0x4500), '\r');
- NS16550_putc((NS16550_t)(C
FG
_IMMR + 0x4500), c);
+ NS16550_putc((NS16550_t)(C
ONFIG_SYS
_IMMR + 0x4500), c);
}
#endif
}
#endif