diff options
| author | Jason Kridner | 2018-03-07 05:40:43 -0500 |
|---|---|---|
| committer | Tom Rini | 2018-04-06 17:04:33 -0400 |
| commit | 99761e536cfaa8f404ee7ef8565bf780465245aa (patch) | |
| tree | bb127076ca664c9f3f4008658c3ce352645a9b5b | |
| parent | eff0c977b3b9466657362869e04da231a892e31e (diff) | |
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 <jdk@ti.com>
Cc: Joe Hershberger <joe.hershberger@ni.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
| -rw-r--r-- | include/net.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/net.h b/include/net.h index 455b48f6c72..3101096e9a1 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; |