linux-sunxi/u-boot-sunxi
1
0
Fork 0
mirror of https://github.com/linux-sunxi/u-boot-sunxi.git synced 2024-02-12 11:16:03 +08:00
Code Issues Projects Releases Wiki Activity

Handle NETCONSOLE and SPL enabled

Browse Source 
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>
This commit is contained in:
Jason Kridner
2018-03-07 05:40:43 -05:00
committed by Tom Rini
parent eff0c977b3
commit 99761e536c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/net.h
View File

@ -676,7 +676,7 @@ int net_send_udp_packet(uchar *ether, struct in_addr dest, int dport,
/* Processes a received packet */ /* Processes a received packet */
void net_process_received_packet(uchar *in_packet, int len); 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); void nc_start(void);
int nc_input_packet(uchar *pkt, struct in_addr src_ip, unsigned dest_port, int nc_input_packet(uchar *pkt, struct in_addr src_ip, unsigned dest_port,
unsigned src_port, unsigned len); 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) 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; extern enum proto_t net_loop_last_protocol;
return net_loop_last_protocol != NETCONS; 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) 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; extern enum proto_t net_loop_last_protocol;
net_loop_last_protocol = protocol; net_loop_last_protocol = protocol;