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 2067fedfcaea172ece4ff136f229a491e787a917..9c7bad52f3dd5d07d8346f313868a22d5fbfdaa6 100644
(file)
--- a/
board/v37/v37.c
+++ b/
board/v37/v37.c
@@
-92,7
+92,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;
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
@@
phys_size_t 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
@@
phys_size_t 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;