diff options
| author | Tom Rini <trini@konsulko.com> | 2018-07-02 16:11:09 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-07-02 16:11:09 -0400 |
| commit | d4c7a9348f27c8e3fdb1b754d8f0d1fa27375d1c (patch) | |
| tree | e4f82532c04d791c257ef6e5b202389103891777 /include | |
| parent | 03b54997d568a6879a045ba775e44d62289a8fb9 (diff) | |
| parent | a9ea30d267f26bee0b3a5cdd659624a866da3d19 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-net
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/ax25-ae350.h | 1 | ||||
| -rw-r--r-- | include/net.h | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/configs/ax25-ae350.h b/include/configs/ax25-ae350.h index b1ca5ac11a9..b230896734e 100644 --- a/include/configs/ax25-ae350.h +++ b/include/configs/ax25-ae350.h @@ -11,7 +11,6 @@ * CPU and Board Configuration Options */ #define CONFIG_BOOTP_SEND_HOSTNAME -#define CONFIG_BOOTP_SERVERIP /* * Miscellaneous configurable options diff --git a/include/net.h b/include/net.h index 57606855564..f9984ae86ca 100644 --- a/include/net.h +++ b/include/net.h @@ -344,6 +344,7 @@ struct vlan_ethernet_hdr { #define PROT_IP 0x0800 /* IP protocol */ #define PROT_ARP 0x0806 /* IP ARP protocol */ +#define PROT_WOL 0x0842 /* ether-wake WoL protocol */ #define PROT_RARP 0x8035 /* IP ARP protocol */ #define PROT_VLAN 0x8100 /* IEEE 802.1q protocol */ #define PROT_IPV6 0x86dd /* IPv6 over bluebook */ @@ -535,10 +536,12 @@ extern int net_restart_wrap; /* Tried all network devices */ enum proto_t { BOOTP, RARP, ARP, TFTPGET, DHCP, PING, DNS, NFS, CDP, NETCONS, SNTP, - TFTPSRV, TFTPPUT, LINKLOCAL, FASTBOOT + TFTPSRV, TFTPPUT, LINKLOCAL, FASTBOOT, WOL }; extern char net_boot_file_name[1024];/* Boot File name */ +/* Indicates whether the file name was specified on the command line */ +extern bool net_boot_file_name_explicit; /* The actual transferred size of the bootfile (in bytes) */ extern u32 net_boot_file_size; /* Boot file size in blocks as reported by the DHCP server */ |