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
/
ids8247
/
ids8247.c
diff --git
a/board/ids8247/ids8247.c
b/board/ids8247/ids8247.c
index
065014a
..
68b7070
100644
(file)
--- a/
board/ids8247/ids8247.c
+++ b/
board/ids8247/ids8247.c
@@
-254,7
+254,7
@@
static long int try_init (volatile memctl8260_t * memctl, ulong sdmr,
* accessing the SDRAM with a single-byte transaction."
*
* The appropriate BRx/ORx registers have already been set when we
* accessing the SDRAM with a single-byte transaction."
*
* The appropriate BRx/ORx registers have already been set when we
- * get here. The SDRAM can be accessed at the address C
FG
_SDRAM_BASE.
+ * get here. The SDRAM can be accessed at the address C
ONFIG_SYS
_SDRAM_BASE.
*/
*sdmr_ptr = sdmr | PSDMR_OP_PREA;
*/
*sdmr_ptr = sdmr | PSDMR_OP_PREA;
@@
-265,7
+265,7
@@
static long int try_init (volatile memctl8260_t * memctl, ulong sdmr,
*base = c;
*sdmr_ptr = sdmr | PSDMR_OP_MRW;
*base = c;
*sdmr_ptr = sdmr | PSDMR_OP_MRW;
- *(base + C
FG_MRS_OFFS) = c;
/* setting MR on address lines */
+ *(base + C
ONFIG_SYS_MRS_OFFS) = c;
/* setting MR on address lines */
*sdmr_ptr = sdmr | PSDMR_OP_NORM | PSDMR_RFEN;
*base = c;
*sdmr_ptr = sdmr | PSDMR_OP_NORM | PSDMR_RFEN;
*base = c;
@@
-278,7
+278,7
@@
static long int try_init (volatile memctl8260_t * memctl, ulong sdmr,
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 memctl8260_t *memctl = &immap->im_memctl;
long psize, lsize;
volatile memctl8260_t *memctl = &immap->im_memctl;
long psize, lsize;
@@
-286,15
+286,15
@@
phys_size_t initdram (int board_type)
psize = 16 * 1024 * 1024;
lsize = 0;
psize = 16 * 1024 * 1024;
lsize = 0;
- memctl->memc_psrt = C
FG
_PSRT;
- memctl->memc_mptpr = C
FG
_MPTPR;
+ memctl->memc_psrt = C
ONFIG_SYS
_PSRT;
+ memctl->memc_mptpr = C
ONFIG_SYS
_MPTPR;
-#ifndef C
FG
_RAMBOOT
+#ifndef C
ONFIG_SYS
_RAMBOOT
/* 60x SDRAM setup:
*/
/* 60x SDRAM setup:
*/
- psize = try_init (memctl, C
FG_PSDMR, CFG
_OR2,
- (uchar *) C
FG
_SDRAM_BASE);
-#endif /* C
FG
_RAMBOOT */
+ psize = try_init (memctl, C
ONFIG_SYS_PSDMR, CONFIG_SYS
_OR2,
+ (uchar *) C
ONFIG_SYS
_SDRAM_BASE);
+#endif /* C
ONFIG_SYS
_RAMBOOT */
icache_enable ();
icache_enable ();
@@
-315,8
+315,8
@@
nand_init (void)
{
ulong totlen = 0;
{
ulong totlen = 0;
- debug ("Probing at 0x%.8x\n", C
FG
_NAND0_BASE);
- totlen += nand_probe (C
FG
_NAND0_BASE);
+ debug ("Probing at 0x%.8x\n", C
ONFIG_SYS
_NAND0_BASE);
+ totlen += nand_probe (C
ONFIG_SYS
_NAND0_BASE);
printf ("%4lu MB\n", totlen >>20);
}
printf ("%4lu MB\n", totlen >>20);
}