projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ppc4xx: Move ppc4xx headers to powerpc include directory
[oweals/u-boot.git]
/
board
/
esd
/
ocrtc
/
flash.c
diff --git
a/board/esd/ocrtc/flash.c
b/board/esd/ocrtc/flash.c
index c3d8bec91378863aefcb481325827374f7ae3c18..c83e594e49edc75c9f13178dc302c8cbf5e48856 100644
(file)
--- a/
board/esd/ocrtc/flash.c
+++ b/
board/esd/ocrtc/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>
/*
@@
-48,7
+48,7
@@
unsigned long flash_init (void)
int size_val = 0;
/* Init: no FLASHes known */
int size_val = 0;
/* Init: no FLASHes known */
- for (i = 0; i < C
FG
_MAX_FLASH_BANKS; ++i) {
+ for (i = 0; i < C
ONFIG_SYS
_MAX_FLASH_BANKS; ++i) {
flash_info[i].flash_id = FLASH_UNKNOWN;
}
flash_info[i].flash_id = FLASH_UNKNOWN;
}
@@
-68,9
+68,9
@@
unsigned long flash_init (void)
/* Re-do sizing to get full correct info */
if (size_b1) {
/* Re-do sizing to get full correct info */
if (size_b1) {
- mtdcr (
ebccfga, pb0cr
);
- pbcr = mfdcr (
ebccfgd
);
- mtdcr (
ebccfga, pb0cr
);
+ mtdcr (
EBC0_CFGADDR, PB0CR
);
+ pbcr = mfdcr (
EBC0_CFGDATA
);
+ mtdcr (
EBC0_CFGADDR, PB0CR
);
base_b1 = -size_b1;
switch (size_b1) {
case 1 << 20:
base_b1 = -size_b1;
switch (size_b1) {
case 1 << 20:
@@
-90,14
+90,14
@@
unsigned long flash_init (void)
break;
}
pbcr = (pbcr & 0x0001ffff) | base_b1 | (size_val << 17);
break;
}
pbcr = (pbcr & 0x0001ffff) | base_b1 | (size_val << 17);
- mtdcr (
ebccfgd
, pbcr);
- /* printf("
pb1cr
= %x\n", pbcr); */
+ mtdcr (
EBC0_CFGDATA
, pbcr);
+ /* printf("
PB1CR
= %x\n", pbcr); */
}
if (size_b0) {
}
if (size_b0) {
- mtdcr (
ebccfga, pb1cr
);
- pbcr = mfdcr (
ebccfgd
);
- mtdcr (
ebccfga, pb1cr
);
+ mtdcr (
EBC0_CFGADDR, PB1CR
);
+ pbcr = mfdcr (
EBC0_CFGDATA
);
+ mtdcr (
EBC0_CFGADDR, PB1CR
);
base_b0 = base_b1 - size_b0;
switch (size_b1) {
case 1 << 20:
base_b0 = base_b1 - size_b0;
switch (size_b1) {
case 1 << 20:
@@
-117,8
+117,8
@@
unsigned long flash_init (void)
break;
}
pbcr = (pbcr & 0x0001ffff) | base_b0 | (size_val << 17);
break;
}
pbcr = (pbcr & 0x0001ffff) | base_b0 | (size_val << 17);
- mtdcr (
ebccfgd
, pbcr);
- /* printf("
pb0cr
= %x\n", pbcr); */
+ mtdcr (
EBC0_CFGDATA
, pbcr);
+ /* printf("
PB0CR
= %x\n", pbcr); */
}
size_b0 = flash_get_size ((vu_long *) base_b0, &flash_info[0]);
}
size_b0 = flash_get_size ((vu_long *) base_b0, &flash_info[0]);