summaryrefslogtreecommitdiff
path: root/board/dave
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2009-09-15 21:43:25 +0200
committerWolfgang Denk <wd@denx.de>2009-09-15 21:43:25 +0200
commitcae26e2fdd9934644086fda9f7cbc336a1fe5ce8 (patch)
tree5f9ae145135d5583fadff9564196fbf5f10e34ea /board/dave
parent6c7bc91fb3dba186d3398a1653f6db236510ffa7 (diff)
parent4c1883670acbf1cc83c04df1876235c3aedde128 (diff)
downloadu-boot-imx-cae26e2fdd9934644086fda9f7cbc336a1fe5ce8.zip
u-boot-imx-cae26e2fdd9934644086fda9f7cbc336a1fe5ce8.tar.gz
u-boot-imx-cae26e2fdd9934644086fda9f7cbc336a1fe5ce8.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
Diffstat (limited to 'board/dave')
-rw-r--r--board/dave/PPChameleonEVB/PPChameleonEVB.c6
-rw-r--r--board/dave/PPChameleonEVB/flash.c8
2 files changed, 7 insertions, 7 deletions
diff --git a/board/dave/PPChameleonEVB/PPChameleonEVB.c b/board/dave/PPChameleonEVB/PPChameleonEVB.c
index a6aa655..56751e1 100644
--- a/board/dave/PPChameleonEVB/PPChameleonEVB.c
+++ b/board/dave/PPChameleonEVB/PPChameleonEVB.c
@@ -65,9 +65,9 @@ int board_early_init_f (void)
* EBC Configuration Register: set ready timeout to 512 ebc-clks -> ca. 15 us
*/
#if 1 /* test-only */
- mtebc (epcr, 0xa8400000); /* ebc always driven */
+ mtebc (EBC0_CFG, 0xa8400000); /* ebc always driven */
#else
- mtebc (epcr, 0x28400000); /* ebc in high-z */
+ mtebc (EBC0_CFG, 0x28400000); /* ebc in high-z */
#endif
return 0;
}
@@ -101,7 +101,7 @@ int misc_init_r (void)
int status;
int index;
int i;
- unsigned long cntrl0Reg;
+ unsigned long CPC0_CR0Reg;
dst = malloc(CONFIG_SYS_FPGA_MAX_SIZE);
if (gunzip (dst, CONFIG_SYS_FPGA_MAX_SIZE, (uchar *)fpgadata, &len) != 0) {
diff --git a/board/dave/PPChameleonEVB/flash.c b/board/dave/PPChameleonEVB/flash.c
index e5a0d3d..237c807 100644
--- a/board/dave/PPChameleonEVB/flash.c
+++ b/board/dave/PPChameleonEVB/flash.c
@@ -75,9 +75,9 @@ unsigned long flash_init (void)
debug("[%s, %d] Test point ...\n", __FUNCTION__, __LINE__);
/* Re-do sizing to get full correct info */
- mtdcr(ebccfga, pb0cr);
- pbcr = mfdcr(ebccfgd);
- mtdcr(ebccfga, pb0cr);
+ mtdcr(EBC0_CFGADDR, PB0CR);
+ pbcr = mfdcr(EBC0_CFGDATA);
+ mtdcr(EBC0_CFGADDR, PB0CR);
base = -size;
switch (size) {
case 1 << 20:
@@ -97,7 +97,7 @@ unsigned long flash_init (void)
break;
}
pbcr = (pbcr & 0x0001ffff) | base | (size_val << 17);
- mtdcr(ebccfgd, pbcr);
+ mtdcr(EBC0_CFGDATA, pbcr);
debug("[%s, %d] Test point ...\n", __FUNCTION__, __LINE__);
/* Monitor protection ON by default */