From mboxrd@z Thu Jan  1 00:00:00 1970
From: Simon Guinot <simon.guinot@sequanux.org>
Date: Tue,  3 May 2011 00:42:27 +0200
Subject: [U-Boot] [PATCH v5 4/5] netconsole: remove `serverip' check
In-Reply-To: <yes>
References: <yes>
Message-ID: <1304376148-6332-5-git-send-email-simon.guinot@sequanux.org>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

From: Simon Guinot <sguinot@lacie.com>

Netconsole use the environment variable `ncip' to configure the
destination IP. `serverip' don't need to be defined.

Signed-off-by: Simon Guinot <sguinot@lacie.com>
---
Changes for v2:
  - restore NetOurIP check

Changes for v3:
  - add a "/* Fall through */" comment before the NETCONS case label

Changes for v4,5: none

 net/net.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/net/net.c b/net/net.c
index e50bdf1..19ac019 100644
--- a/net/net.c
+++ b/net/net.c
@@ -1718,7 +1718,6 @@ static int net_check_prereq (proto_t protocol)
 #if defined(CONFIG_CMD_NFS)
 	case NFS:
 #endif
-	case NETCONS:
 	case TFTP:
 		if (NetServerIP == 0) {
 			puts ("*** ERROR: `serverip' not set\n");
@@ -1728,7 +1727,9 @@ static int net_check_prereq (proto_t protocol)
     defined(CONFIG_CMD_DNS)
     common:
 #endif
+		/* Fall through */
 
+	case NETCONS:
 		if (NetOurIP == 0) {
 			puts ("*** ERROR: `ipaddr' not set\n");
 			return (1);
-- 
1.6.3.1