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-nand-flash
[oweals/u-boot.git]
/
board
/
esd
/
mecp5200
/
mecp5200.c
diff --git
a/board/esd/mecp5200/mecp5200.c
b/board/esd/mecp5200/mecp5200.c
index ea49f264ab866e531df16f7e391dc585a85b9459..31924502e41e29265831693bf29ec2af7f1b602e 100644
(file)
--- a/
board/esd/mecp5200/mecp5200.c
+++ b/
board/esd/mecp5200/mecp5200.c
@@
-32,6
+32,7
@@
#include <mpc5xxx.h>
#include <pci.h>
#include <command.h>
#include <mpc5xxx.h>
#include <pci.h>
#include <command.h>
+#include <netdev.h>
#include "mt46v16m16-75.h"
#include "mt46v16m16-75.h"
@@
-80,11
+81,11
@@
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 test1, test2;
{
ulong dramsize = 0;
ulong test1, test2;
@@
-105,9
+106,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(C
FG
_SDRAM_BASE, 0x80000000);
+ test1 = get_ram_size(C
ONFIG_SYS
_SDRAM_BASE, 0x80000000);
sdram_start(1);
sdram_start(1);
- test2 = get_ram_size(C
FG
_SDRAM_BASE, 0x80000000);
+ test2 = get_ram_size(C
ONFIG_SYS
_SDRAM_BASE, 0x80000000);
if (test1 > test2) {
sdram_start(0);
if (test1 > test2) {
sdram_start(0);
@@
-142,9
+143,9
@@
long int initdram(int board_type)
#if 0
/* find RAM size using SDRAM CS1 only */
sdram_start(0);
#if 0
/* find RAM size using SDRAM CS1 only */
sdram_start(0);
- get_ram_size((ulong *) (C
FG
_SDRAM_BASE + dramsize), 0x80000000);
+ get_ram_size((ulong *) (C
ONFIG_SYS
_SDRAM_BASE + dramsize), 0x80000000);
sdram_start(1);
sdram_start(1);
- get_ram_size((ulong *) (C
FG
_SDRAM_BASE + dramsize), 0x80000000);
+ get_ram_size((ulong *) (C
ONFIG_SYS
_SDRAM_BASE + dramsize), 0x80000000);
sdram_start(0);
#endif
/* set SDRAM CS1 size according to the amount of RAM found */
sdram_start(0);
#endif
/* set SDRAM CS1 size according to the amount of RAM found */
@@
-174,14
+175,14
@@
void flash_preinit(void)
void flash_afterinit(ulong size)
{
void flash_afterinit(ulong size)
{
- if (size == C
FG
_FLASH_SIZE) {
+ if (size == C
ONFIG_SYS
_FLASH_SIZE) {
/* adjust mapping */
*(vu_long *) MPC5XXX_BOOTCS_START =
*(vu_long *) MPC5XXX_CS0_START =
/* 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);
}
}
}
}
@@
-259,3
+260,8
@@
void init_power_switch(void)
__asm__ volatile ("sync");
}
}
__asm__ volatile ("sync");
}
}
+
+int board_eth_init(bd_t *bis)
+{
+ return pci_eth_init(bis);
+}