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
rename CFG_ macros to CONFIG_SYS
[platform/kernel/u-boot.git]
/
board
/
emk
/
top860
/
top860.c
diff --git
a/board/emk/top860/top860.c
b/board/emk/top860/top860.c
index
aca4991
..
76f7a0c
100644
(file)
--- a/
board/emk/top860/top860.c
+++ b/
board/emk/top860/top860.c
@@
-78,7
+78,7
@@
int checkboard (void)
*****************************************************************************/
phys_size_t initdram (int board_type)
{
*****************************************************************************/
phys_size_t initdram (int board_type)
{
- volatile immap_t *immap = (immap_t *) C
FG
_IMMR;
+ volatile immap_t *immap = (immap_t *) C
ONFIG_SYS
_IMMR;
volatile memctl8xx_t *memctl = &immap->im_memctl;
/*
volatile memctl8xx_t *memctl = &immap->im_memctl;
/*
@@
-93,8
+93,8
@@
phys_size_t initdram (int board_type)
sizeof (edo_60ns_25MHz_tbl) / sizeof (uint));
memctl->memc_mptpr = 0x0200;
memctl->memc_mamr = 0x0ca20330;
sizeof (edo_60ns_25MHz_tbl) / sizeof (uint));
memctl->memc_mptpr = 0x0200;
memctl->memc_mamr = 0x0ca20330;
- memctl->memc_or2 = -C
FG
_DRAM_MAX | OR_CSNT_SAM;
- memctl->memc_br2 = C
FG
_DRAM_BASE | BR_MS_UPMA | BR_V;
+ memctl->memc_or2 = -C
ONFIG_SYS
_DRAM_MAX | OR_CSNT_SAM;
+ memctl->memc_br2 = C
ONFIG_SYS
_DRAM_BASE | BR_MS_UPMA | BR_V;
/*
* Do 8 read accesses to DRAM
*/
/*
* Do 8 read accesses to DRAM
*/
@@
-112,7
+112,7
@@
phys_size_t initdram (int board_type)
addr2[1] = 0x47110815;
if (addr1[0] == 0xfeedc0de && addr1[1] == 0x47110815) {
/* only 4MB populated */
addr2[1] = 0x47110815;
if (addr1[0] == 0xfeedc0de && addr1[1] == 0x47110815) {
/* only 4MB populated */
- memctl->memc_or2 = -(C
FG
_DRAM_MAX / 4) | OR_CSNT_SAM;
+ memctl->memc_or2 = -(C
ONFIG_SYS
_DRAM_MAX / 4) | OR_CSNT_SAM;
}
}
}
}