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
/
esd
/
pmc405
/
pmc405.c
diff --git
a/board/esd/pmc405/pmc405.c
b/board/esd/pmc405/pmc405.c
index
90a212b
..
c0781dc
100644
(file)
--- a/
board/esd/pmc405/pmc405.c
+++ b/
board/esd/pmc405/pmc405.c
@@
-72,23
+72,23
@@
int board_early_init_f (void)
* Setup GPIO pins
*/
* Setup GPIO pins
*/
- mtdcr(cntrl0, mfdcr(cntrl0) | ((C
FG
_FPGA_INIT | \
- C
FG
_FPGA_DONE | \
- C
FG
_XEREADY | \
- C
FG
_NONMONARCH | \
- C
FG
_REV1_2) << 5));
+ mtdcr(cntrl0, mfdcr(cntrl0) | ((C
ONFIG_SYS
_FPGA_INIT | \
+ C
ONFIG_SYS
_FPGA_DONE | \
+ C
ONFIG_SYS
_XEREADY | \
+ C
ONFIG_SYS
_NONMONARCH | \
+ C
ONFIG_SYS
_REV1_2) << 5));
- if (!(in32(GPIO0_IR) & C
FG
_REV1_2)) {
+ if (!(in32(GPIO0_IR) & C
ONFIG_SYS
_REV1_2)) {
/* rev 1.2 boards */
/* rev 1.2 boards */
- mtdcr(cntrl0, mfdcr(cntrl0) | ((C
FG
_INTA_FAKE | \
- C
FG
_SELF_RST) << 5));
+ mtdcr(cntrl0, mfdcr(cntrl0) | ((C
ONFIG_SYS
_INTA_FAKE | \
+ C
ONFIG_SYS
_SELF_RST) << 5));
}
out32(GPIO0_OR, 0);
}
out32(GPIO0_OR, 0);
- out32(GPIO0_TCR, C
FG_FPGA_PRG | CFG_FPGA_CLK | CFG_FPGA_DATA | CFG
_XEREADY); /* setup for output */
+ out32(GPIO0_TCR, C
ONFIG_SYS_FPGA_PRG | CONFIG_SYS_FPGA_CLK | CONFIG_SYS_FPGA_DATA | CONFIG_SYS
_XEREADY); /* setup for output */
/* - check if rev1_2 is low, then:
/* - check if rev1_2 is low, then:
- * - set/reset C
FG_INTA_FAKE/CFG
_SELF_RST in TCR to assert INTA# or SELFRST#
+ * - set/reset C
ONFIG_SYS_INTA_FAKE/CONFIG_SYS
_SELF_RST in TCR to assert INTA# or SELFRST#
*/
return 0;
*/
return 0;
@@
-104,7
+104,7
@@
int misc_init_r (void)
gd->bd->bi_flashstart = 0 - gd->bd->bi_flashsize;
gd->bd->bi_flashoffset = 0;
gd->bd->bi_flashstart = 0 - gd->bd->bi_flashsize;
gd->bd->bi_flashoffset = 0;
- out32(GPIO0_OR, in32(GPIO0_OR) | C
FG
_XEREADY); /* deassert EREADY# */
+ out32(GPIO0_OR, in32(GPIO0_OR) | C
ONFIG_SYS
_XEREADY); /* deassert EREADY# */
return (0);
}
return (0);
}
@@
-112,13
+112,13
@@
ushort pmc405_pci_subsys_deviceid(void)
{
ulong val;
val = in32(GPIO0_IR);
{
ulong val;
val = in32(GPIO0_IR);
- if (!(val & C
FG
_REV1_2)) { /* low=rev1.2 */
- if (val & C
FG
_NONMONARCH) { /* monarch# signal */
- return C
FG
_PCI_SUBSYS_DEVICEID_NONMONARCH;
+ if (!(val & C
ONFIG_SYS
_REV1_2)) { /* low=rev1.2 */
+ if (val & C
ONFIG_SYS
_NONMONARCH) { /* monarch# signal */
+ return C
ONFIG_SYS
_PCI_SUBSYS_DEVICEID_NONMONARCH;
}
}
- return C
FG
_PCI_SUBSYS_DEVICEID_MONARCH;
+ return C
ONFIG_SYS
_PCI_SUBSYS_DEVICEID_MONARCH;
}
}
- return C
FG
_PCI_SUBSYS_DEVICEID_NONMONARCH;
+ return C
ONFIG_SYS
_PCI_SUBSYS_DEVICEID_NONMONARCH;
}
/*
}
/*
@@
-140,9
+140,9
@@
int checkboard (void)
}
val = in32(GPIO0_IR);
}
val = in32(GPIO0_IR);
- if (!(val & C
FG
_REV1_2)) { /* low=rev1.2 */
+ if (!(val & C
ONFIG_SYS
_REV1_2)) { /* low=rev1.2 */
puts(" rev1.2 (");
puts(" rev1.2 (");
- if (val & C
FG
_NONMONARCH) { /* monarch# signal */
+ if (val & C
ONFIG_SYS
_NONMONARCH) { /* monarch# signal */
puts("non-");
}
puts("monarch)");
puts("non-");
}
puts("monarch)");