summaryrefslogtreecommitdiff
path: root/net/eth.c
diff options
context:
space:
mode:
authorwdenk <wdenk>2003-06-03 23:54:09 +0000
committerwdenk <wdenk>2003-06-03 23:54:09 +0000
commit682011ff6968198da14b89e40d9f55b00f6d91f7 (patch)
tree18793a72134a5262daf281ab0b904ab16f5337ac /net/eth.c
parent7a8e9bed17d7924a9c5c4699b1f6a3a0359524ed (diff)
downloadu-boot-imx-682011ff6968198da14b89e40d9f55b00f6d91f7.zip
u-boot-imx-682011ff6968198da14b89e40d9f55b00f6d91f7.tar.gz
u-boot-imx-682011ff6968198da14b89e40d9f55b00f6d91f7.tar.bz2
* Patches by Udi Finkelstein, 2 June 2003:
- Added support for custom keyboards, initialized by defining a board-specific drv_keyboard_init as well as defining CONFIG_KEYBOARD . - Added support for the RBC823 board. - cpu/mpc8xx/lcd.c now automatically calculates the Horizontal Pixel Count field. * Fix alignment problem in BOOTP (dhcp_leasetime option) [pointed out by Nicolas Lacressonnière, 2 Jun 2003] * Patch by Mark Rakes, 14 May 2003: add support for Intel e1000 gig cards. * Patch by Nye Liu, 3 Jun 2003: fix critical typo in MAMR definition (include/mpc8xx.h) * Fix requirement to align U-Boot image on 16 kB boundaries on PPC. * Patch by Klaus Heydeck, 2 Jun 2003 Minor changes for KUP4K configuration
Diffstat (limited to 'net/eth.c')
-rw-r--r--net/eth.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/net/eth.c b/net/eth.c
index e2d699e..22d33da 100644
--- a/net/eth.c
+++ b/net/eth.c
@@ -31,6 +31,7 @@
extern int gt6426x_eth_initialize(bd_t *bis);
#endif
+extern int e1000_initialize(bd_t*);
extern int eepro100_initialize(bd_t*);
extern int natsemi_initialize(bd_t*);
extern int ns8382x_initialize(bd_t*);
@@ -103,6 +104,9 @@ int eth_initialize(bd_t *bis)
#ifdef CONFIG_PLB2800_ETHER
plb2800_eth_initialize(bis);
#endif
+#ifdef CONFIG_E1000
+ e1000_initialize(bis);
+#endif
#ifdef CONFIG_EEPRO100
eepro100_initialize(bis);
#endif