random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-11-04 14:00:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.denx.de/u-boot-net

Browse Source
This commit is contained in:
Tom Rini 2016-02-26 14:56:23 -05:00
commit 38e65aeb70
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README
View File

@ -5409,6 +5409,12 @@ List of environment variables (most likely not complete):
Ethernet is encapsulated/received over 802.1q Ethernet is encapsulated/received over 802.1q
VLAN tagged frames. VLAN tagged frames.
bootpretryperiod - Period during which BOOTP/DHCP sends retries.
Unsigned value, in milliseconds. If not set, the period will
be either the default (28000), or a value based on
CONFIG_NET_RETRY_COUNT, if defined. This value has
precedence over the valu based on CONFIG_NET_RETRY_COUNT.
The following image location variables contain the location of images The following image location variables contain the location of images
used in booting. The "Image" column gives the role of the image and is used in booting. The "Image" column gives the role of the image and is
not an environment variable name. The other columns are environment not an environment variable name. The other columns are environment

3
drivers/net/phy/atheros.c
View File

@ -33,6 +33,9 @@ static int ar8035_config(struct phy_device *phydev)
phydev->supported = phydev->drv->features; phydev->supported = phydev->drv->features;
genphy_config_aneg(phydev);
genphy_restart_aneg(phydev);
return 0; return 0;
} }

11
net/bootp.c
View File

@ -60,6 +60,8 @@ char net_nis_domain[32] = {0,}; /* Our NIS domain */
char net_hostname[32] = {0,}; /* Our hostname */ char net_hostname[32] = {0,}; /* Our hostname */
char net_root_path[64] = {0,}; /* Our bootpath */ char net_root_path[64] = {0,}; /* Our bootpath */
static ulong time_taken_max;
#if defined(CONFIG_CMD_DHCP) #if defined(CONFIG_CMD_DHCP)
static dhcp_state_t dhcp_state = INIT; static dhcp_state_t dhcp_state = INIT;
static u32 dhcp_leasetime; static u32 dhcp_leasetime;
@ -380,7 +382,7 @@ static void bootp_timeout_handler(void)
{ {
ulong time_taken = get_timer(bootp_start); ulong time_taken = get_timer(bootp_start);
if (time_taken >= TIMEOUT_MS) { if (time_taken >= time_taken_max) {
#ifdef CONFIG_BOOTP_MAY_FAIL #ifdef CONFIG_BOOTP_MAY_FAIL
puts("\nRetry time exceeded\n"); puts("\nRetry time exceeded\n");
net_set_state(NETLOOP_FAIL); net_set_state(NETLOOP_FAIL);
@ -675,12 +677,19 @@ void bootp_request(void)
u32 bootp_id; u32 bootp_id;
struct in_addr zero_ip; struct in_addr zero_ip;
struct in_addr bcast_ip; struct in_addr bcast_ip;
char *ep; /* Environment pointer */
bootstage_mark_name(BOOTSTAGE_ID_BOOTP_START, "bootp_start"); bootstage_mark_name(BOOTSTAGE_ID_BOOTP_START, "bootp_start");
#if defined(CONFIG_CMD_DHCP) #if defined(CONFIG_CMD_DHCP)
dhcp_state = INIT; dhcp_state = INIT;
#endif #endif
ep = getenv("bootpretryperiod");
if (ep != NULL)
time_taken_max = simple_strtoul(ep, NULL, 10);
else
time_taken_max = TIMEOUT_MS;
#ifdef CONFIG_BOOTP_RANDOM_DELAY /* Random BOOTP delay */ #ifdef CONFIG_BOOTP_RANDOM_DELAY /* Random BOOTP delay */
if (bootp_try == 0) if (bootp_try == 0)
srand_mac(); srand_mac();