diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-04-08 00:11:22 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-04-08 00:11:22 +0200 |
| commit | f9eabcb357ea294e3e01bfe26841bf51d6bd8f05 (patch) | |
| tree | 7e3dffe10717babf2e2430ab4c9ed236bcba3742 /net | |
| parent | 2c78febd114b716714e7ac83c17bac5e30066512 (diff) | |
| parent | 2d934ea51f276522b532f870a820e844ff480b5b (diff) | |
| download | u-boot-imx-f9eabcb357ea294e3e01bfe26841bf51d6bd8f05.zip u-boot-imx-f9eabcb357ea294e3e01bfe26841bf51d6bd8f05.tar.gz u-boot-imx-f9eabcb357ea294e3e01bfe26841bf51d6bd8f05.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-net
Diffstat (limited to 'net')
| -rw-r--r-- | net/bootp.c | 5 | ||||
| -rw-r--r-- | net/eth.c | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/net/bootp.c b/net/bootp.c index 89e30d2..0eeef57 100644 --- a/net/bootp.c +++ b/net/bootp.c @@ -879,7 +879,10 @@ static void DhcpSendRequestPkt(Bootp_t *bp_offer) iplen = BOOTP_HDR_SIZE - sizeof(bp->bp_vend) + extlen; NetSetIP(iphdr, 0xFFFFFFFFL, PORT_BOOTPS, PORT_BOOTPC, iplen); - debug ("Transmitting DHCPREQUEST packet: len = %d\n", pktlen); + debug ("Transmitting DHCPREQUEST packet: len = %d\n", pktlen); +#ifdef CONFIG_BOOTP_DHCP_REQUEST_DELAY + udelay(CONFIG_BOOTP_DHCP_REQUEST_DELAY); +#endif /* CONFIG_BOOTP_DHCP_REQUEST_DELAY */ NetSendPacket(NetTxPacket, pktlen); } @@ -60,6 +60,7 @@ extern int npe_initialize(bd_t *); extern int uec_initialize(int); extern int bfin_EMAC_initialize(bd_t *); extern int atstk1000_eth_initialize(bd_t *); +extern int greth_initialize(bd_t *); extern int atngw100_eth_initialize(bd_t *); extern int mcffec_initialize(bd_t*); extern int mcdmafec_initialize(bd_t*); @@ -275,6 +276,9 @@ int eth_initialize(bd_t *bis) #if defined(CONFIG_ATSTK1000) atstk1000_eth_initialize(bis); #endif +#if defined(CONFIG_GRETH) + greth_initialize(bis); +#endif #if defined(CONFIG_ATNGW100) atngw100_eth_initialize(bis); #endif |