summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Guinot <sguinot@lacie.com>2011-05-01 23:38:40 +0000
committerWolfgang Denk <wd@denx.de>2011-05-12 19:11:51 +0200
commit8b6bbe104f908296722248eb1a430bc45d628fcf (patch)
tree52915a6bf04fb7dfafd5fc000bbcdf729628fc54
parent910f1ae3eb05533ac0c7f7fe5b31b50b91f7f0e1 (diff)
downloadblackbird-obmc-uboot-8b6bbe104f908296722248eb1a430bc45d628fcf.tar.gz
blackbird-obmc-uboot-8b6bbe104f908296722248eb1a430bc45d628fcf.zip
netconsole: remove `serverip' check
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>
-rw-r--r--net/net.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/net.c b/net/net.c
index e50bdf17be..19ac0196b5 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);
OpenPOWER on IntegriCloud