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 'warning-cleanup'
[oweals/u-boot.git]
/
board
/
exbitgen
/
exbitgen.c
diff --git
a/board/exbitgen/exbitgen.c
b/board/exbitgen/exbitgen.c
index 8460893114788c1b33c4e981cb9082a1eb65d528..0f8412776b6739b4b301a9a3d0676368f1d2ba46 100644
(file)
--- a/
board/exbitgen/exbitgen.c
+++ b/
board/exbitgen/exbitgen.c
@@
-1,7
+1,6
@@
-#include <
asm/types
.h>
+#include <
common
.h>
#include <asm/u-boot.h>
#include <asm/processor.h>
#include <asm/u-boot.h>
#include <asm/processor.h>
-#include <common.h>
#include "exbitgen.h"
void sdram_init(void);
#include "exbitgen.h"
void sdram_init(void);
@@
-95,29
+94,29
@@
phys_size_t initdram (int board_type)
tot_size = 0;
tot_size = 0;
- mtdcr (
memcfga
, mem_mb0cf);
- tmp = mfdcr (
memcfgd
);
+ mtdcr (
SDRAM0_CFGADDR
, mem_mb0cf);
+ tmp = mfdcr (
SDRAM0_CFGDATA
);
if (tmp & 0x00000001) {
bank_size = 0x00400000 << ((tmp >> 17) & 0x7);
tot_size += bank_size;
}
if (tmp & 0x00000001) {
bank_size = 0x00400000 << ((tmp >> 17) & 0x7);
tot_size += bank_size;
}
- mtdcr (
memcfga
, mem_mb1cf);
- tmp = mfdcr (
memcfgd
);
+ mtdcr (
SDRAM0_CFGADDR
, mem_mb1cf);
+ tmp = mfdcr (
SDRAM0_CFGDATA
);
if (tmp & 0x00000001) {
bank_size = 0x00400000 << ((tmp >> 17) & 0x7);
tot_size += bank_size;
}
if (tmp & 0x00000001) {
bank_size = 0x00400000 << ((tmp >> 17) & 0x7);
tot_size += bank_size;
}
- mtdcr (
memcfga
, mem_mb2cf);
- tmp = mfdcr (
memcfgd
);
+ mtdcr (
SDRAM0_CFGADDR
, mem_mb2cf);
+ tmp = mfdcr (
SDRAM0_CFGDATA
);
if (tmp & 0x00000001) {
bank_size = 0x00400000 << ((tmp >> 17) & 0x7);
tot_size += bank_size;
}
if (tmp & 0x00000001) {
bank_size = 0x00400000 << ((tmp >> 17) & 0x7);
tot_size += bank_size;
}
- mtdcr (
memcfga
, mem_mb3cf);
- tmp = mfdcr (
memcfgd
);
+ mtdcr (
SDRAM0_CFGADDR
, mem_mb3cf);
+ tmp = mfdcr (
SDRAM0_CFGDATA
);
if (tmp & 0x00000001) {
bank_size = 0x00400000 << ((tmp >> 17) & 0x7);
tot_size += bank_size;
if (tmp & 0x00000001) {
bank_size = 0x00400000 << ((tmp >> 17) & 0x7);
tot_size += bank_size;