summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRandy Witt <randy.e.witt@linux.intel.com>2015-08-26 15:15:34 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-29 13:15:40 +0100
commitc71309616a3247cfab969b74d8642ff0bf9b6500 (patch)
tree400acf70e0b9f8de7a3f460a58fbcaed4f7120c1
parent74d02c942414a193a01367c0a32bf91a3329a8d4 (diff)
downloadopenembedded-core-c71309616a3247cfab969b74d8642ff0bf9b6500.tar.gz
openembedded-core-c71309616a3247cfab969b74d8642ff0bf9b6500.tar.bz2
openembedded-core-c71309616a3247cfab969b74d8642ff0bf9b6500.zip
runqemu-internal: Make sure tcpserial is always last
If this is not the case, sometimes the additional tcpserial will be enumerated as ttyS0, which is not what we want. Because then it would be the console, and qemurunner would not log things properly. Signed-off-by: Randy Witt <randy.e.witt@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xscripts/runqemu-internal4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index b317358f94..baf53f3e8b 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -622,9 +622,9 @@ fi
if [ $TCPSERIAL_PORTNUM != "" ]; then
if [ "$MACHINE" = "qemuarm64" ]; then
- QEMUOPTIONS="$QEMUOPTIONS -device virtio-serial-device -chardev socket,id=virtcon,port=$TCPSERIAL_PORTNUM,host=127.0.0.1 -device virtconsole,chardev=virtcon"
+ SCRIPT_QEMU_EXTRA_OPT="$SCRIPT_QEMU_EXTRA_OPT -device virtio-serial-device -chardev socket,id=virtcon,port=$TCPSERIAL_PORTNUM,host=127.0.0.1 -device virtconsole,chardev=virtcon"
else
- QEMUOPTIONS="$QEMUOPTIONS -serial tcp:127.0.0.1:$TCPSERIAL_PORTNUM"
+ SCRIPT_QEMU_EXTRA_OPT="$SCRIPT_QEMU_EXTRA_OPT -serial tcp:127.0.0.1:$TCPSERIAL_PORTNUM"
fi
fi