diff options
| author | Joe Hershberger <joe.hershberger@ni.com> | 2012-05-23 07:59:19 +0000 |
|---|---|---|
| committer | Joe Hershberger <joe.hershberger@ni.com> | 2012-05-23 17:53:05 -0500 |
| commit | 2c00e099fe77b014dd094a49113e2c6ce8a24a16 (patch) | |
| tree | 8fd179098f867dbdf817881fa3fc350c0606c4e5 | |
| parent | 1752f0fdc7a3b914f6b651f68cb59dde102c9c92 (diff) | |
| download | u-boot-imx-2c00e099fe77b014dd094a49113e2c6ce8a24a16.zip u-boot-imx-2c00e099fe77b014dd094a49113e2c6ce8a24a16.tar.gz u-boot-imx-2c00e099fe77b014dd094a49113e2c6ce8a24a16.tar.bz2 | |
net: Add option CONFIG_BOOTP_MAY_FAIL
This is useful if you want to look for a DHCP server, but try some
other settings if not available.
Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Acked-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | README | 7 | ||||
| -rw-r--r-- | net/bootp.c | 5 |
2 files changed, 12 insertions, 0 deletions
@@ -1592,10 +1592,17 @@ The following options need to be configured: CONFIG_BOOTP_NTPSERVER CONFIG_BOOTP_TIMEOFFSET CONFIG_BOOTP_VENDOREX + CONFIG_BOOTP_MAY_FAIL CONFIG_BOOTP_SERVERIP - TFTP server will be the serverip environment variable, not the BOOTP server. + CONFIG_BOOTP_MAY_FAIL - If the DHCP server is not found + after the configured retry count, the call will fail + instead of starting over. This can be used to fail over + to Link-local IP address configuration if the DHCP server + is not available. + CONFIG_BOOTP_DNS2 - If a DHCP client requests the DNS serverip from a DHCP server, it is possible that more than one DNS serverip is offered to the client. diff --git a/net/bootp.c b/net/bootp.c index 7e24b66..0f0867b 100644 --- a/net/bootp.c +++ b/net/bootp.c @@ -326,8 +326,13 @@ static void BootpTimeout(void) { if (BootpTry >= TIMEOUT_COUNT) { +#ifdef CONFIG_BOOTP_MAY_FAIL + puts("\nRetry count exceeded\n"); + NetSetState(NETLOOP_FAIL); +#else puts("\nRetry count exceeded; starting again\n"); NetStartAgain(); +#endif } else { NetSetTimeout(TIMEOUT, BootpTimeout); BootpRequest(); |