From: Jason Kridner Date: Wed, 7 Mar 2018 10:40:43 +0000 (-0500) Subject: Handle NETCONSOLE and SPL enabled X-Git-Tag: v2018.05-rc2~106 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=99761e536cfaa8f404ee7ef8565bf780465245aa;p=oweals%2Fu-boot.git Handle NETCONSOLE and SPL enabled NETCONSOLE isn't compiled in with SPL, so the include file needs to recognize that. Signed-off-by: Jason Kridner Cc: Joe Hershberger Reviewed-by: Tom Rini Acked-by: Joe Hershberger --- diff --git a/include/net.h b/include/net.h index 455b48f6c7..3101096e9a 100644 --- a/include/net.h +++ b/include/net.h @@ -676,7 +676,7 @@ int net_send_udp_packet(uchar *ether, struct in_addr dest, int dport, /* Processes a received packet */ void net_process_received_packet(uchar *in_packet, int len); -#ifdef CONFIG_NETCONSOLE +#if defined(CONFIG_NETCONSOLE) && !defined(CONFIG_SPL_BUILD) void nc_start(void); int nc_input_packet(uchar *pkt, struct in_addr src_ip, unsigned dest_port, unsigned src_port, unsigned len); @@ -684,7 +684,7 @@ int nc_input_packet(uchar *pkt, struct in_addr src_ip, unsigned dest_port, static __always_inline int eth_is_on_demand_init(void) { -#ifdef CONFIG_NETCONSOLE +#if defined(CONFIG_NETCONSOLE) && !defined(CONFIG_SPL_BUILD) extern enum proto_t net_loop_last_protocol; return net_loop_last_protocol != NETCONS; @@ -695,7 +695,7 @@ static __always_inline int eth_is_on_demand_init(void) static inline void eth_set_last_protocol(int protocol) { -#ifdef CONFIG_NETCONSOLE +#if defined(CONFIG_NETCONSOLE) && !defined(CONFIG_SPL_BUILD) extern enum proto_t net_loop_last_protocol; net_loop_last_protocol = protocol;