projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-i2c
[oweals/u-boot.git]
/
board
/
esd
/
cpci2dp
/
flash.c
diff --git
a/board/esd/cpci2dp/flash.c
b/board/esd/cpci2dp/flash.c
index 56c822ec97f981a36bef309988f5b4b43ae7c182..b210281fc4da04935f3a72a87430b9d18b2d150c 100644
(file)
--- a/
board/esd/cpci2dp/flash.c
+++ b/
board/esd/cpci2dp/flash.c
@@
-22,7
+22,7
@@
*/
#include <common.h>
*/
#include <common.h>
-#include <ppc4xx.h>
+#include <
asm/
ppc4xx.h>
#include <asm/processor.h>
/*
#include <asm/processor.h>
/*
@@
-64,13
+64,13
@@
unsigned long flash_init (void)
flash_get_offsets (-size_b0, &flash_info[0]);
/* Re-do sizing to get full correct info */
flash_get_offsets (-size_b0, &flash_info[0]);
/* 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_b0 = -size_b0;
pbcr = (pbcr & 0x0001ffff) | base_b0 | (((size_b0/1024/1024)-1)<<17);
base_b0 = -size_b0;
pbcr = (pbcr & 0x0001ffff) | base_b0 | (((size_b0/1024/1024)-1)<<17);
- mtdcr(
ebccfgd
, pbcr);
- /* printf("
pb1cr
= %x\n", pbcr); */
+ mtdcr(
EBC0_CFGDATA
, pbcr);
+ /* printf("
PB1CR
= %x\n", pbcr); */
/* Monitor protection ON by default */
(void)flash_protect(FLAG_PROTECT_SET,
/* Monitor protection ON by default */
(void)flash_protect(FLAG_PROTECT_SET,