diff options
author | Scott Sweeny <scott.sweeny@timesys.com> | 2010-09-01 12:02:01 -0400 |
---|---|---|
committer | Scott Sweeny <scott.sweeny@timesys.com> | 2010-09-01 12:06:18 -0400 |
commit | 3456a4958ec2ecb2b2e35b1f37039fb28274f182 (patch) | |
tree | bf6aef6608c5410ad8b7e4f49dc2cc58aad22538 /net | |
parent | e1dce181db649aadcf5c83e9459ebf53dd038073 (diff) |
Freescale board patch for MPC5125_TWR board
Diffstat (limited to 'net')
-rw-r--r-- | net/eth.c | 13 | ||||
-rw-r--r-- | net/net.c | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/net/eth.c b/net/eth.c index 217e8853f5c..30cdc5ebc16 100644 --- a/net/eth.c +++ b/net/eth.c @@ -56,6 +56,10 @@ static struct { static unsigned int eth_rcv_current = 0, eth_rcv_last = 0; #endif +#ifdef CONFIG_FASTBOOT +int eth_init_skipped; +#endif + static struct eth_device *eth_devices, *eth_current; struct eth_device *eth_get_dev(void) @@ -330,6 +334,15 @@ int eth_init(bd_t *bis) { struct eth_device* old_current; +#ifdef CONFIG_FASTBOOT + if (eth_init_skipped) { + DECLARE_GLOBAL_DATA_PTR; + eth_init_skipped = 0; + printf("Net: "); + eth_initialize(gd->bd); + } +#endif + if (!eth_current) { puts ("No ethernet found.\n"); return -1; diff --git a/net/net.c b/net/net.c index a55f4d33f98..73217a96773 100644 --- a/net/net.c +++ b/net/net.c @@ -303,6 +303,7 @@ NetInitLoop(proto_t protocol) NetCopyIP(&NetOurIP, &bd->bi_ip_addr); NetOurGatewayIP = getenv_IPaddr ("gatewayip"); NetOurSubnetMask= getenv_IPaddr ("netmask"); + NetServerIP = getenv_IPaddr ("serverip"); NetOurVLAN = getenv_VLAN("vlan"); NetOurNativeVLAN = getenv_VLAN("nvlan"); @@ -312,7 +313,6 @@ NetInitLoop(proto_t protocol) #endif case NETCONS: case TFTP: - NetServerIP = getenv_IPaddr ("serverip"); break; #if defined(CONFIG_CMD_PING) case PING: |