Merge branch 'master' of git://git.denx.de/u-boot-arm into master

[karo-tx-uboot.git] / tools / netconsole

diff --git a/tools/netconsole b/tools/netconsole
index c8109bb09569ab770aa26be63fad94433b97fc09..1a0ef22244e3d5dbe0cfd4983ca1666198cd8a81 100755 (executable)
--- 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