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-ppc4xx
[oweals/u-boot.git]
/
board
/
v37
/
v37.c
diff --git
a/board/v37/v37.c
b/board/v37/v37.c
index 1ef879d5f12da141078dc5a708435600d75d4fde..9c7bad52f3dd5d07d8346f313868a22d5fbfdaa6 100644
(file)
--- a/
board/v37/v37.c
+++ b/
board/v37/v37.c
@@
-38,8
+38,8
@@
static long int dram_size (void);
/* ------------------------------------------------------------------------- */
/* ------------------------------------------------------------------------- */
-#define MBYTE (1024*1024)
-#define DRAM_DELAY 0x00000379 /* DRAM delay count */
+#define MBYTE (1024*1024)
+#define DRAM_DELAY 0x00000379 /* DRAM delay count */
#define _NOT_USED_ 0xFFFFCC25
const uint sdram_table[] =
#define _NOT_USED_ 0xFFFFCC25
const uint sdram_table[] =
@@
-90,9
+90,9
@@
int checkboard (void)
/* ------------------------------------------------------------------------- */
/* ------------------------------------------------------------------------- */
-
long in
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;
unsigned long temp;
volatile int delay_cnt;
volatile memctl8xx_t *memctl = &immap->im_memctl;
unsigned long temp;
volatile int delay_cnt;
@@
-136,8
+136,8
@@
long int initdram (int board_type)
#ifdef CONFIG_CAN_DRIVER
/* Initialize OR3 / BR3 */
#ifdef CONFIG_CAN_DRIVER
/* Initialize OR3 / BR3 */
- memctl->memc_or3 = C
FG
_OR3_CAN;
- memctl->memc_br3 = C
FG
_BR3_CAN;
+ memctl->memc_or3 = C
ONFIG_SYS
_OR3_CAN;
+ memctl->memc_br3 = C
ONFIG_SYS
_BR3_CAN;
/* Initialize MBMR */
memctl->memc_mamr = MAMR_GPL_A4DIS; /* GPL_A4 ouput line Disable */
/* Initialize MBMR */
memctl->memc_mamr = MAMR_GPL_A4DIS; /* GPL_A4 ouput line Disable */
@@
-191,7
+191,7
@@
long int initdram (int board_type)
static long int dram_size ()
{
static long int dram_size ()
{
- volatile immap_t *immap = (immap_t *)C
FG
_IMMR;
+ volatile immap_t *immap = (immap_t *)C
ONFIG_SYS
_IMMR;
volatile sysconf8xx_t *siu = &immap->im_siu_conf;
volatile pcmconf8xx_t *pcm = &immap->im_pcmcia;
long int i, memory=1;
volatile sysconf8xx_t *siu = &immap->im_siu_conf;
volatile pcmconf8xx_t *pcm = &immap->im_pcmcia;
long int i, memory=1;