diff options
Diffstat (limited to 'net')
| -rw-r--r-- | net/eth.c | 4 | ||||
| -rw-r--r-- | net/nfs.c | 7 | ||||
| -rw-r--r-- | net/tftp.c | 2 |
3 files changed, 11 insertions, 2 deletions
diff --git a/net/eth.c b/net/eth.c index 75175ec62b9..62297abba41 100644 --- a/net/eth.c +++ b/net/eth.c @@ -63,6 +63,7 @@ extern int atstk1000_eth_initialize(bd_t *); extern int atngw100_eth_initialize(bd_t *); extern int mcffec_initialize(bd_t*); extern int mcdmafec_initialize(bd_t*); +extern int at91cap9_eth_initialize(bd_t *); #ifdef CONFIG_API extern void (*push_packet)(volatile void *, int); @@ -283,6 +284,9 @@ int eth_initialize(bd_t *bis) #if defined(CONFIG_FSLDMAFEC) mcdmafec_initialize(bis); #endif +#if defined(CONFIG_AT91CAP9) + at91cap9_eth_initialize(bis); +#endif if (!eth_devices) { puts ("No ethernet found.\n"); diff --git a/net/nfs.c b/net/nfs.c index aa8d612e584..6573c1716bb 100644 --- a/net/nfs.c +++ b/net/nfs.c @@ -34,7 +34,8 @@ #if defined(CONFIG_CMD_NET) && defined(CONFIG_CMD_NFS) #define HASHES_PER_LINE 65 /* Number of "loading" hashes per line */ -#define NFS_TIMEOUT 60UL +#define NFS_RETRY_COUNT 30 +#define NFS_TIMEOUT 2UL static int fs_mounted = 0; static unsigned long rpc_id = 0; @@ -586,6 +587,10 @@ Interfaces of U-BOOT static void NfsTimeout (void) { + if ( NfsTimeoutCount++ < NFS_RETRY_COUNT ) { + NfsSend (); + return; + } puts ("Timeout\n"); NetState = NETLOOP_FAIL; return; diff --git a/net/tftp.c b/net/tftp.c index 3dd2b06aae1..ea8fea2f7e8 100644 --- a/net/tftp.c +++ b/net/tftp.c @@ -474,7 +474,7 @@ TftpStart (void) printf ("*** Warning: no boot file name; using '%s'\n", tftp_filename); } else { - char *p = strchr (p, ':'); + char *p = strchr (BootFile, ':'); if (p == NULL) { strncpy(tftp_filename, BootFile, MAX_LEN); |