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
Merge branch 'master' of ../work into next
[platform/kernel/u-boot.git]
/
board
/
gen860t
/
gen860t.c
diff --git
a/board/gen860t/gen860t.c
b/board/gen860t/gen860t.c
index
d448f9f
..
b37a0f2
100644
(file)
--- a/
board/gen860t/gen860t.c
+++ b/
board/gen860t/gen860t.c
@@
-158,9
+158,9
@@
int checkboard (void)
/*
* Initialize SDRAM
*/
/*
* Initialize SDRAM
*/
-
long in
t initdram (int board_type)
+
phys_size_
t initdram (int board_type)
{
{
- volatile immap_t *immr = (immap_t *) C
FG
_IMMR;
+ volatile immap_t *immr = (immap_t *) C
ONFIG_SYS
_IMMR;
volatile memctl8xx_t *memctl = &immr->im_memctl;
upmconfig (UPMA,
volatile memctl8xx_t *memctl = &immr->im_memctl;
upmconfig (UPMA,
@@
-171,14
+171,14
@@
long int initdram (int board_type)
/*
* Setup MAMR register
*/
/*
* Setup MAMR register
*/
- memctl->memc_mptpr = C
FG
_MPTPR_1BK_8K;
- memctl->memc_mamr = C
FG_MAMR_8COL & (~(MAMR_PTAE));
/* no refresh yet */
+ memctl->memc_mptpr = C
ONFIG_SYS
_MPTPR_1BK_8K;
+ memctl->memc_mamr = C
ONFIG_SYS_MAMR_8COL & (~(MAMR_PTAE));
/* no refresh yet */
/*
* Map CS1* to SDRAM bank
*/
/*
* Map CS1* to SDRAM bank
*/
- memctl->memc_or1 = C
FG
_OR1;
- memctl->memc_br1 = C
FG
_BR1;
+ memctl->memc_or1 = C
ONFIG_SYS
_OR1;
+ memctl->memc_br1 = C
ONFIG_SYS
_BR1;
/*
* Perform SDRAM initialization sequence:
/*
* Perform SDRAM initialization sequence:
@@
-223,8
+223,6
@@
long int initdram (int board_type)
* The DOC lives in the CS2* space
*/
#if defined(CONFIG_CMD_DOC)
* The DOC lives in the CS2* space
*/
#if defined(CONFIG_CMD_DOC)
-extern void doc_probe (ulong physadr);
-
void doc_init (void)
{
printf ("Probing at 0x%.8x: ", DOC_BASE);
void doc_init (void)
{
printf ("Probing at 0x%.8x: ", DOC_BASE);
@@
-237,7
+235,7
@@
void doc_init (void)
*/
int misc_init_r (void)
{
*/
int misc_init_r (void)
{
- volatile immap_t *immr = (immap_t *) C
FG
_IMMR;
+ volatile immap_t *immr = (immap_t *) C
ONFIG_SYS
_IMMR;
volatile memctl8xx_t *memctl = &immr->im_memctl;
/*
volatile memctl8xx_t *memctl = &immr->im_memctl;
/*
@@
-254,7
+252,7
@@
int misc_init_r (void)
mii_init ();
#endif
mii_init ();
#endif
-#if (CONFIG_FPGA)
+#if
defined
(CONFIG_FPGA)
gen860t_init_fpga ();
#endif
return 0;
gen860t_init_fpga ();
#endif
return 0;
@@
-294,14
+292,3
@@
void board_poweroff (void)
puts ("### Please power off the board ###\n");
while (1);
}
puts ("### Please power off the board ###\n");
while (1);
}
-
-#ifdef CONFIG_POST
-/*
- * Returns 1 if keys pressed to start the power-on long-running tests
- * Called from board_init_f().
- */
-int post_hotkeys_pressed (void)
-{
- return 0; /* No hotkeys supported */
-}
-#endif