projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
da850: provide davinci_enable_uart0
[oweals/u-boot.git]
/
board
/
ip860
/
ip860.c
diff --git
a/board/ip860/ip860.c
b/board/ip860/ip860.c
index 9dd809b67823784a80df0c171ae6b91e26f106b6..adff2b22f734ceb93a5d1e99616571e06baa7ec3 100644
(file)
--- a/
board/ip860/ip860.c
+++ b/
board/ip860/ip860.c
@@
-87,12
+87,12
@@
const uint sdram_table[] = {
/* ------------------------------------------------------------------------- */
int board_early_init_f(void)
{
/* ------------------------------------------------------------------------- */
int board_early_init_f(void)
{
- 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;
/* init BCSR chipselect line for ip860_get_clk_freq() and ip860_get_dram_size() */
volatile memctl8xx_t *memctl = &immap->im_memctl;
/* init BCSR chipselect line for ip860_get_clk_freq() and ip860_get_dram_size() */
- memctl->memc_or4 = C
FG
_OR4;
- memctl->memc_br4 = C
FG
_BR4;
+ memctl->memc_or4 = C
ONFIG_SYS
_OR4;
+ memctl->memc_br4 = C
ONFIG_SYS
_BR4;
return 0;
}
return 0;
}
@@
-114,7
+114,7
@@
int checkboard (void)
puts ("Board: ");
puts ("Board: ");
- i = getenv_
r
("serial#", (char *)buf, sizeof (buf));
+ i = getenv_
f
("serial#", (char *)buf, sizeof (buf));
s = (i > 0) ? buf : NULL;
if (!s || strncmp ((char *)s, "IP860", 5)) {
s = (i > 0) ? buf : NULL;
if (!s || strncmp ((char *)s, "IP860", 5)) {
@@
-137,9
+137,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;
long int size;
ulong refresh_val;
volatile memctl8xx_t *memctl = &immap->im_memctl;
long int size;
ulong refresh_val;
@@
-167,8
+167,8
@@
long int initdram (int board_type)
/*
* Map controller banks 2 to the SDRAM address
*/
/*
* Map controller banks 2 to the SDRAM address
*/
- memctl->memc_or2 = C
FG
_OR2;
- memctl->memc_br2 = C
FG
_BR2;
+ memctl->memc_or2 = C
ONFIG_SYS
_OR2;
+ memctl->memc_br2 = C
ONFIG_SYS
_BR2;
/* IP860 boards have only one bank SDRAM */
/* IP860 boards have only one bank SDRAM */
@@
-197,7
+197,7
@@
long int initdram (int board_type)
udelay (1000);
memctl->memc_or2 = ((-size) & 0xFFFF0000) | SDRAM_TIMING;
udelay (1000);
memctl->memc_or2 = ((-size) & 0xFFFF0000) | SDRAM_TIMING;
- memctl->memc_br2 = (C
FG
_SDRAM_BASE & BR_BA_MSK) | BR_MS_UPMA | BR_V;
+ memctl->memc_br2 = (C
ONFIG_SYS
_SDRAM_BASE & BR_BA_MSK) | BR_MS_UPMA | BR_V;
udelay (10000);
udelay (10000);
@@
-205,34
+205,34
@@
long int initdram (int board_type)
* Also, map other memory to correct position
*/
* Also, map other memory to correct position
*/
-#if (defined(C
FG_OR1) && defined(CFG
_BR1_PRELIM))
- memctl->memc_or1 = C
FG
_OR1;
- memctl->memc_br1 = C
FG
_BR1;
+#if (defined(C
ONFIG_SYS_OR1) && defined(CONFIG_SYS
_BR1_PRELIM))
+ memctl->memc_or1 = C
ONFIG_SYS
_OR1;
+ memctl->memc_br1 = C
ONFIG_SYS
_BR1;
#endif
#endif
-#if defined(C
FG_OR3) && defined(CFG
_BR3)
- memctl->memc_or3 = C
FG
_OR3;
- memctl->memc_br3 = C
FG
_BR3;
+#if defined(C
ONFIG_SYS_OR3) && defined(CONFIG_SYS
_BR3)
+ memctl->memc_or3 = C
ONFIG_SYS
_OR3;
+ memctl->memc_br3 = C
ONFIG_SYS
_BR3;
#endif
#endif
-#if defined(C
FG_OR4) && defined(CFG
_BR4)
- memctl->memc_or4 = C
FG
_OR4;
- memctl->memc_br4 = C
FG
_BR4;
+#if defined(C
ONFIG_SYS_OR4) && defined(CONFIG_SYS
_BR4)
+ memctl->memc_or4 = C
ONFIG_SYS
_OR4;
+ memctl->memc_br4 = C
ONFIG_SYS
_BR4;
#endif
#endif
-#if defined(C
FG_OR5) && defined(CFG
_BR5)
- memctl->memc_or5 = C
FG
_OR5;
- memctl->memc_br5 = C
FG
_BR5;
+#if defined(C
ONFIG_SYS_OR5) && defined(CONFIG_SYS
_BR5)
+ memctl->memc_or5 = C
ONFIG_SYS
_OR5;
+ memctl->memc_br5 = C
ONFIG_SYS
_BR5;
#endif
#endif
-#if defined(C
FG_OR6) && defined(CFG
_BR6)
- memctl->memc_or6 = C
FG
_OR6;
- memctl->memc_br6 = C
FG
_BR6;
+#if defined(C
ONFIG_SYS_OR6) && defined(CONFIG_SYS
_BR6)
+ memctl->memc_or6 = C
ONFIG_SYS
_OR6;
+ memctl->memc_br6 = C
ONFIG_SYS
_BR6;
#endif
#endif
-#if defined(C
FG_OR7) && defined(CFG
_BR7)
- memctl->memc_or7 = C
FG
_OR7;
- memctl->memc_br7 = C
FG
_BR7;
+#if defined(C
ONFIG_SYS_OR7) && defined(CONFIG_SYS
_BR7)
+ memctl->memc_or7 = C
ONFIG_SYS
_OR7;
+ memctl->memc_br7 = C
ONFIG_SYS
_BR7;
#endif
return (size);
#endif
return (size);
@@
-251,7
+251,7
@@
long int initdram (int board_type)
static long int dram_size (long int mamr_value, long int *base,
long int maxsize)
{
static long int dram_size (long int mamr_value, long int *base,
long int maxsize)
{
- 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;
memctl->memc_mamr = mamr_value;
volatile memctl8xx_t *memctl = &immap->im_memctl;
memctl->memc_mamr = mamr_value;
@@
-263,7
+263,7
@@
static long int dram_size (long int mamr_value, long int *base,
void reset_phy (void)
{
void reset_phy (void)
{
- volatile immap_t *immr = (immap_t *) C
FG
_IMMR;
+ volatile immap_t *immr = (immap_t *) C
ONFIG_SYS
_IMMR;
ulong mask = PB_ENET_RESET | PB_ENET_JABD;
ulong reg;
ulong mask = PB_ENET_RESET | PB_ENET_JABD;
ulong reg;