summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorBen Warren <biggerbadderben@gmail.com>2008-08-31 10:13:34 -0700
committerBen Warren <biggerbadderben@gmail.com>2008-09-02 21:18:17 -0700
commit6aca145e067efe75398e9fac97822bd3700de0b2 (patch)
treed8b8fe359483ed29ece36f2cb6e293479170dca0 /board
parente3090534d62045dcb73f5392bacc64a4e8e443dc (diff)
Moved initialization of GT6426x Ethernet controller to board_eth_init()
Affected boards: EVB64260 P3G4 ZUMA Removed initialization of the driver from net/eth.c Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
Diffstat (limited to 'board')
-rw-r--r--board/evb64260/eth.c1
-rw-r--r--board/evb64260/evb64260.c8
2 files changed, 8 insertions, 1 deletions
diff --git a/board/evb64260/eth.c b/board/evb64260/eth.c
index fa5b6d4a923..ca8bab52d96 100644
--- a/board/evb64260/eth.c
+++ b/board/evb64260/eth.c
@@ -27,6 +27,7 @@ Skeleton NIC driver for Etherboot
#include <asm/cache.h>
#include <miiphy.h>
#include <net.h>
+#include <netdev.h>
#include "eth.h"
#include "eth_addrtbl.h"
diff --git a/board/evb64260/evb64260.c b/board/evb64260/evb64260.c
index ab599410b27..bc108d0594e 100644
--- a/board/evb64260/evb64260.c
+++ b/board/evb64260/evb64260.c
@@ -31,6 +31,7 @@
#include <galileo/pci.h>
#include <galileo/gt64260R.h>
#include <net.h>
+#include <netdev.h>
#include <asm/io.h>
#include "eth.h"
@@ -248,7 +249,6 @@ int board_early_init_f (void)
sram_boot = 1;
#endif
- if (!sram_boot)
memoryMapDeviceSpace(DEVICE0, CFG_DEV0_SPACE, CFG_DEV0_SIZE);
memoryMapDeviceSpace(DEVICE1, CFG_DEV1_SPACE, CFG_DEV1_SIZE);
@@ -443,3 +443,9 @@ display_mem_map(void)
printf(" BOOT: base - 0x%08x\tsize - %dM bytes\twidth - %d bits\n",
base, size>>20, width);
}
+
+int board_eth_init(bd_t *bis)
+{
+ gt6426x_eth_initialize(bis);
+ return 0;
+}