projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Timer: Remove reset_timer_masked()
[oweals/u-boot.git]
/
board
/
o2dnt
/
o2dnt.c
diff --git
a/board/o2dnt/o2dnt.c
b/board/o2dnt/o2dnt.c
index 8c6f5db9f0a21f39da819d972871e38d5143d6ac..c72a7414e4fb3227b0bb6925e1c78d3cd6776788 100644
(file)
--- a/
board/o2dnt/o2dnt.c
+++ b/
board/o2dnt/o2dnt.c
@@
-27,6
+27,7
@@
#include <common.h>
#include <mpc5xxx.h>
#include <pci.h>
#include <common.h>
#include <mpc5xxx.h>
#include <pci.h>
+#include <netdev.h>
#define SDRAM_MODE 0x00CD0000
#define SDRAM_CONTROL 0x504F0000
#define SDRAM_MODE 0x00CD0000
#define SDRAM_CONTROL 0x504F0000
@@
-64,10
+65,10
@@
static void sdram_start (int hi_addr)
/*
* ATTENTION: Although partially referenced initdram does NOT make real use
/*
* ATTENTION: Although partially referenced initdram does NOT make real use
- * use of C
FG_SDRAM_BASE. The code does not work if CFG
_SDRAM_BASE
+ * use of C
ONFIG_SYS_SDRAM_BASE. The code does not work if CONFIG_SYS
_SDRAM_BASE
* is something else than 0x00000000.
*/
* is something else than 0x00000000.
*/
-
long in
t initdram (int board_type)
+
phys_size_
t initdram (int board_type)
{
ulong dramsize = 0;
ulong dramsize2 = 0;
{
ulong dramsize = 0;
ulong dramsize2 = 0;
@@
-85,9
+86,9
@@
long int initdram (int board_type)
/* find RAM size using SDRAM CS0 only */
sdram_start(0);
/* find RAM size using SDRAM CS0 only */
sdram_start(0);
- test1 = get_ram_size((
ulong *)CFG
_SDRAM_BASE, 0x80000000);
+ test1 = get_ram_size((
long *)CONFIG_SYS
_SDRAM_BASE, 0x80000000);
sdram_start(1);
sdram_start(1);
- test2 = get_ram_size((
ulong *)CFG
_SDRAM_BASE, 0x80000000);
+ test2 = get_ram_size((
long *)CONFIG_SYS
_SDRAM_BASE, 0x80000000);
if (test1 > test2) {
sdram_start(0);
dramsize = test1;
if (test1 > test2) {
sdram_start(0);
dramsize = test1;
@@
-113,11
+114,11
@@
long int initdram (int board_type)
if (!dramsize)
sdram_start(0);
if (!dramsize)
sdram_start(0);
- test2 = test1 = get_ram_size((
ulong *)(CFG
_SDRAM_BASE + dramsize), 0x80000000);
+ test2 = test1 = get_ram_size((
long *)(CONFIG_SYS
_SDRAM_BASE + dramsize), 0x80000000);
if (!dramsize) {
sdram_start(1);
if (!dramsize) {
sdram_start(1);
- test2 = get_ram_size((
ulong *)(CFG
_SDRAM_BASE + dramsize), 0x80000000);
+ test2 = get_ram_size((
long *)(CONFIG_SYS
_SDRAM_BASE + dramsize), 0x80000000);
}
if (test1 > test2) {
}
if (test1 > test2) {
@@
-163,10
+164,10
@@
void flash_afterinit(ulong size)
{
if (size == 0x800000) { /* adjust mapping */
*(vu_long *)MPC5XXX_BOOTCS_START = *(vu_long *)MPC5XXX_CS0_START =
{
if (size == 0x800000) { /* adjust mapping */
*(vu_long *)MPC5XXX_BOOTCS_START = *(vu_long *)MPC5XXX_CS0_START =
- START_REG(C
FG
_BOOTCS_START | size);
+ START_REG(C
ONFIG_SYS
_BOOTCS_START | size);
*(vu_long *)MPC5XXX_BOOTCS_STOP = *(vu_long *)MPC5XXX_CS0_STOP =
*(vu_long *)MPC5XXX_BOOTCS_STOP = *(vu_long *)MPC5XXX_CS0_STOP =
- STOP_REG(C
FG
_BOOTCS_START | size, size);
+ STOP_REG(C
ONFIG_SYS
_BOOTCS_START | size, size);
}
}
}
}
@@
-180,3
+181,9
@@
void pci_init_board(void)
pci_mpc5xxx_init(&hose);
}
#endif
pci_mpc5xxx_init(&hose);
}
#endif
+
+int board_eth_init(bd_t *bis)
+{
+ cpu_eth_init(bis); /* Built in FEC comes first */
+ return pci_eth_init(bis);
+}