From: Jason Kridner <jkridner@gmail.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 3/4] Handle NETCONSOLE and SPL enabled
Date: Wed, 7 Mar 2018 05:40:43 -0500 [thread overview]
Message-ID: <20180307104044.4739-4-jdk@ti.com> (raw)
In-Reply-To: <20180307104044.4739-1-jdk@ti.com>
From: Jason Kridner <jkridner@beagleboard.org>
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>
---
include/net.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
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;
--
2.15.1
next prev parent reply other threads:[~2018-03-07 10:40 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-07 10:40 [U-Boot] [PATCH 0/4] Add support for BeagleBoard.org PocketBeagle Jason Kridner
2018-03-07 10:40 ` [U-Boot] [PATCH 1/4] " Jason Kridner
2018-03-07 14:27 ` Tom Rini
2018-04-07 0:44 ` [U-Boot] [U-Boot, " Tom Rini
2018-03-07 10:40 ` [U-Boot] [PATCH 2/4] am335x_evm: scan more partitions and use uname_r Jason Kridner
2018-03-07 14:27 ` Tom Rini
2018-03-10 16:34 ` Jason Kridner
2018-03-10 23:13 ` Vagrant Cascadian
2018-03-07 10:40 ` Jason Kridner [this message]
2018-03-07 14:27 ` [U-Boot] [PATCH 3/4] Handle NETCONSOLE and SPL enabled Tom Rini
2018-03-07 18:01 ` Joe Hershberger
2018-04-07 0:44 ` [U-Boot] [U-Boot,3/4] " Tom Rini
2018-03-07 10:40 ` [U-Boot] [PATCH 4/4] am335x: am335x_evm_usbspl_defconfig: NETCONSOLE Jason Kridner
2018-03-07 14:27 ` Tom Rini
2018-04-07 0:44 ` [U-Boot] [U-Boot, " Tom Rini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180307104044.4739-4-jdk@ti.com \
--to=jkridner@gmail.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.