diff options
Diffstat (limited to 'net')
| -rw-r--r-- | net/Makefile | 12 | ||||
| -rw-r--r-- | net/bootp.c | 2 | ||||
| -rw-r--r-- | net/net.c | 12 | ||||
| -rw-r--r-- | net/tftp.c | 5 |
4 files changed, 20 insertions, 11 deletions
diff --git a/net/Makefile b/net/Makefile index 64ab7ec740a..a7075c36a04 100644 --- a/net/Makefile +++ b/net/Makefile @@ -10,14 +10,14 @@ obj-$(CONFIG_CMD_BOOTP) += bootp.o obj-$(CONFIG_CMD_CDP) += cdp.o obj-$(CONFIG_CMD_DNS) += dns.o obj-$(CONFIG_DM_DSA) += dsa-uclass.o -obj-$(CONFIG_$(SPL_)DM_ETH) += eth-uclass.o -obj-$(CONFIG_$(SPL_TPL_)BOOTDEV_ETH) += eth_bootdev.o +obj-$(CONFIG_$(XPL_)DM_ETH) += eth-uclass.o +obj-$(CONFIG_$(PHASE_)BOOTDEV_ETH) += eth_bootdev.o obj-$(CONFIG_DM_MDIO) += mdio-uclass.o obj-$(CONFIG_DM_MDIO_MUX) += mdio-mux-uclass.o -obj-$(CONFIG_$(SPL_)DM_ETH) += eth_common.o +obj-$(CONFIG_$(XPL_)DM_ETH) += eth_common.o obj-$(CONFIG_CMD_LINK_LOCAL) += link_local.o obj-$(CONFIG_IPV6) += ndisc.o -obj-$(CONFIG_$(SPL_)DM_ETH) += net.o +obj-$(CONFIG_$(XPL_)DM_ETH) += net.o obj-$(CONFIG_IPV6) += net6.o obj-$(CONFIG_CMD_NFS) += nfs.o obj-$(CONFIG_CMD_PING) += ping.o @@ -27,8 +27,8 @@ obj-$(CONFIG_CMD_PCAP) += pcap.o obj-$(CONFIG_CMD_RARP) += rarp.o obj-$(CONFIG_CMD_SNTP) += sntp.o obj-$(CONFIG_CMD_TFTPBOOT) += tftp.o -obj-$(CONFIG_$(SPL_TPL_)UDP_FUNCTION_FASTBOOT) += fastboot_udp.o -obj-$(CONFIG_$(SPL_TPL_)TCP_FUNCTION_FASTBOOT) += fastboot_tcp.o +obj-$(CONFIG_$(PHASE_)UDP_FUNCTION_FASTBOOT) += fastboot_udp.o +obj-$(CONFIG_$(PHASE_)TCP_FUNCTION_FASTBOOT) += fastboot_tcp.o obj-$(CONFIG_CMD_WOL) += wol.o obj-$(CONFIG_PROT_UDP) += udp.o obj-$(CONFIG_PROT_TCP) += tcp.o diff --git a/net/bootp.c b/net/bootp.c index 512ab2ed7c8..afd5b48094a 100644 --- a/net/bootp.c +++ b/net/bootp.c @@ -434,7 +434,7 @@ static u8 *add_vci(u8 *e) char *vci = NULL; char *env_vci = env_get("bootp_vci"); -#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_NET_VCI_STRING) +#if defined(CONFIG_XPL_BUILD) && defined(CONFIG_SPL_NET_VCI_STRING) vci = CONFIG_SPL_NET_VCI_STRING; #elif defined(CONFIG_BOOTP_VCI_STRING) vci = CONFIG_BOOTP_VCI_STRING; diff --git a/net/net.c b/net/net.c index 1e0b7c85624..64bcf69d83f 100644 --- a/net/net.c +++ b/net/net.c @@ -87,6 +87,7 @@ #include <env_internal.h> #include <errno.h> #include <image.h> +#include <led.h> #include <log.h> #include <net.h> #include <net6.h> @@ -305,7 +306,7 @@ U_BOOT_ENV_CALLBACK(dnsip, on_dnsip); */ void net_auto_load(void) { -#if defined(CONFIG_CMD_NFS) && !defined(CONFIG_SPL_BUILD) +#if defined(CONFIG_CMD_NFS) && !defined(CONFIG_XPL_BUILD) const char *s = env_get("autoload"); if (s != NULL && strcmp(s, "NFS") == 0) { @@ -559,7 +560,7 @@ restart: ping6_start(); break; #endif -#if defined(CONFIG_CMD_NFS) && !defined(CONFIG_SPL_BUILD) +#if defined(CONFIG_CMD_NFS) && !defined(CONFIG_XPL_BUILD) case NFS: nfs_start(); break; @@ -574,7 +575,7 @@ restart: cdp_start(); break; #endif -#if defined(CONFIG_NETCONSOLE) && !defined(CONFIG_SPL_BUILD) +#if defined(CONFIG_NETCONSOLE) && !defined(CONFIG_XPL_BUILD) case NETCONS: nc_start(); break; @@ -664,6 +665,9 @@ restart: /* Invalidate the last protocol */ eth_set_last_protocol(BOOTP); + /* Turn off activity LED if triggered */ + led_activity_off(); + puts("\nAbort\n"); /* include a debug print as well incase the debug messages are directed to stderr */ @@ -1439,7 +1443,7 @@ void net_process_received_packet(uchar *in_packet, int len) } } -#if defined(CONFIG_NETCONSOLE) && !defined(CONFIG_SPL_BUILD) +#if defined(CONFIG_NETCONSOLE) && !defined(CONFIG_XPL_BUILD) nc_input_packet((uchar *)ip + IP_UDP_HDR_SIZE, src_ip, ntohs(ip->udp_dst), diff --git a/net/tftp.c b/net/tftp.c index d6744bc24e2..704b20b4ff8 100644 --- a/net/tftp.c +++ b/net/tftp.c @@ -10,6 +10,7 @@ #include <efi_loader.h> #include <env.h> #include <image.h> +#include <led.h> #include <lmb.h> #include <log.h> #include <mapmem.h> @@ -185,6 +186,7 @@ static void new_transfer(void) #ifdef CONFIG_CMD_TFTPPUT tftp_put_final_block_sent = 0; #endif + led_activity_blink(); } #ifdef CONFIG_CMD_TFTPPUT @@ -294,6 +296,9 @@ static void tftp_complete(void) time_start * 1000, "/s"); } puts("\ndone\n"); + + led_activity_off(); + if (!tftp_put_active) efi_set_bootdev("Net", "", tftp_filename, map_sysmem(tftp_load_addr, 0), |