From: Hannes Petermaier <oe5hpm@oevsv.at>
Date: Fri, 13 Jun 2014 04:25:29 +0000 (+0200)
Subject: fix: CONFIG_NETCONSOLE start/handle this stuff only outside SPL
X-Git-Tag: v2014.07-rc4~31
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1f9ce3063cd723a1dcf0d02070f07c59491cf6f9;p=u-boot

fix: CONFIG_NETCONSOLE start/handle this stuff only outside SPL

SPL stage does not support various networking things, and therefore
CONFIG_NETCONSOLE cannot be built within SPL.

Signed-off-by: Hannes Petermaier <oe5hpm@oevsv.at>
---

diff --git a/net/net.c b/net/net.c
index f7cc29f039..0f7625fde1 100644
--- a/net/net.c
+++ b/net/net.c
@@ -419,7 +419,7 @@ restart:
 			CDPStart();
 			break;
 #endif
-#ifdef CONFIG_NETCONSOLE
+#if defined (CONFIG_NETCONSOLE) && !(CONFIG_SPL_BUILD)
 		case NETCONS:
 			NcStart();
 			break;
@@ -1182,7 +1182,7 @@ NetReceive(uchar *inpkt, int len)
 #endif
 
 
-#ifdef CONFIG_NETCONSOLE
+#if defined (CONFIG_NETCONSOLE) && !(CONFIG_SPL_BUILD)
 		nc_input_packet((uchar *)ip + IP_UDP_HDR_SIZE,
 					src_ip,
 					ntohs(ip->udp_dst),