aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2012-09-27 12:06:07 -0700
committerTom Rini <trini@ti.com>2012-09-27 12:06:07 -0700
commitcec2655c3b3b86f14a6a5c2cbb01833f7e3974be (patch)
tree8428f50b579b3656fd24056ae3c6304f58aee620 /tools
parentc57b953da923c6402afc1c890c21fdc7d5a2cc4a (diff)
parentee0f60df0b71092cd632fc6651f4157a2d252598 (diff)
downloadu-boot-linaro-stable-cec2655c3b3b86f14a6a5c2cbb01833f7e3974be.tar.gz
Merge branch 'master' of git://git.denx.de/u-boot-net
Diffstat (limited to 'tools')
-rwxr-xr-xtools/netconsole18
1 files changed, 11 insertions, 7 deletions
diff --git a/tools/netconsole b/tools/netconsole
index c8109bb09..1a0ef2224 100755
--- a/tools/netconsole
+++ b/tools/netconsole
@@ -2,7 +2,7 @@
usage() {
(
- echo "Usage: $0 <board IP> [board port]"
+ echo "Usage: $0 <board-IP> [board-port [board-in-port]]"
echo ""
echo "If port is not specified, '6666' will be used"
[ -z "$*" ] && exit 0
@@ -24,9 +24,13 @@ while [ -n "$1" ] ; do
done
ip=$1
-port=${2:-6666}
+board_out_port=${2:-6666}
+board_in_port=${3:-${board_out_port}}
-if [ -z "${ip}" ] || [ -n "$3" ] ; then
+echo Board out port: ${board_out_port}
+echo Board in port: ${board_in_port}
+
+if [ -z "${ip}" ] || [ -n "$4" ] ; then
usage "Invalid number of arguments"
fi
@@ -41,19 +45,19 @@ stty -icanon -echo intr ^T
(
if type ncb 2>/dev/null ; then
# see if ncb is in $PATH
- exec ncb ${port}
+ exec ncb ${board_out_port}
elif [ -x ${0%/*}/ncb ] ; then
# maybe it's in the same dir as the netconsole script
- exec ${0%/*}/ncb ${port}
+ exec ${0%/*}/ncb ${board_out_port}
else
# blah, just use regular netcat
- while ${nc} -u -l -p ${port} < /dev/null ; do
+ while ${nc} -u -l -p ${board_out_port} < /dev/null ; do
:
done
fi
) &
pid=$!
-${nc} -u ${ip} ${port}
+${nc} -u ${ip} ${board_in_port}
kill ${pid} 2>/dev/null