diff options
| author | wdenk <wdenk> | 2003-06-03 23:54:09 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2003-06-03 23:54:09 +0000 |
| commit | 682011ff6968198da14b89e40d9f55b00f6d91f7 (patch) | |
| tree | 18793a72134a5262daf281ab0b904ab16f5337ac /net | |
| parent | 7a8e9bed17d7924a9c5c4699b1f6a3a0359524ed (diff) | |
* Patches by Udi Finkelstein, 2 June 2003:LABEL_2003_06_04_0200
- 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')
| -rw-r--r-- | net/bootp.c | 4 | ||||
| -rw-r--r-- | net/eth.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/net/bootp.c b/net/bootp.c index f6d08a7e764..4be0ad586a6 100644 --- a/net/bootp.c +++ b/net/bootp.c @@ -55,7 +55,7 @@ ulong seed1, seed2; #if (CONFIG_COMMANDS & CFG_CMD_DHCP) dhcp_state_t dhcp_state = INIT; -unsigned int dhcp_leasetime = 0; +unsigned long dhcp_leasetime = 0; IPaddr_t NetDHCPServerIP = 0; static void DhcpHandler(uchar * pkt, unsigned dest, unsigned src, unsigned len); @@ -712,7 +712,7 @@ static void DhcpOptionsProcess(uchar *popt) NetOurRootPath[size] = 0 ; break; case 51: - dhcp_leasetime = *(unsigned int *)(popt + 2); + NetCopyLong (&dhcp_leasetime, (ulong *)(popt + 2)); break; case 53: /* Ignore Message Type Option */ break; diff --git a/net/eth.c b/net/eth.c index e2d699e5f4e..22d33da6dd3 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 |