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
ppc4xx: Big cleanup of PPC4xx defines
[platform/kernel/u-boot.git]
/
board
/
esd
/
cpci2dp
/
cpci2dp.c
diff --git
a/board/esd/cpci2dp/cpci2dp.c
b/board/esd/cpci2dp/cpci2dp.c
index
cd57ed4
..
00c7024
100644
(file)
--- a/
board/esd/cpci2dp/cpci2dp.c
+++ b/
board/esd/cpci2dp/cpci2dp.c
@@
-31,13
+31,13
@@
DECLARE_GLOBAL_DATA_PTR;
int board_early_init_f (void)
{
int board_early_init_f (void)
{
- unsigned long
cntrl
0Reg;
+ unsigned long
CPC0_CR
0Reg;
/*
* Setup GPIO pins
*/
/*
* Setup GPIO pins
*/
-
cntrl0Reg = mfdcr(cntrl
0);
- mtdcr(
cntrl0, cntrl
0Reg |
+
CPC0_CR0Reg = mfdcr(CPC0_CR
0);
+ mtdcr(
CPC0_CR0, CPC0_CR
0Reg |
((CONFIG_SYS_EEPROM_WP | CONFIG_SYS_PB_LED |
CONFIG_SYS_SELF_RST | CONFIG_SYS_INTA_FAKE) << 5));
((CONFIG_SYS_EEPROM_WP | CONFIG_SYS_PB_LED |
CONFIG_SYS_SELF_RST | CONFIG_SYS_INTA_FAKE) << 5));
@@
-72,7
+72,7
@@
int board_early_init_f (void)
int misc_init_r (void)
{
int misc_init_r (void)
{
- unsigned long
cntrl
0Reg;
+ unsigned long
CPC0_CR
0Reg;
/* adjust flash start and offset */
gd->bd->bi_flashstart = 0 - gd->bd->bi_flashsize;
/* adjust flash start and offset */
gd->bd->bi_flashstart = 0 - gd->bd->bi_flashsize;
@@
-81,8
+81,8
@@
int misc_init_r (void)
/*
* Select cts (and not dsr) on uart1
*/
/*
* Select cts (and not dsr) on uart1
*/
-
cntrl0Reg = mfdcr(cntrl
0);
- mtdcr(
cntrl0, cntrl
0Reg | 0x00001000);
+
CPC0_CR0Reg = mfdcr(CPC0_CR
0);
+ mtdcr(
CPC0_CR0, CPC0_CR
0Reg | 0x00001000);
return (0);
}
return (0);
}