aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/runqemu-internal
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:38:03 +0100
commit63340aefe538471086f62e380ad4ac85d9c993a9 (patch)
tree6e21b555601f63287e6856b6dad852d2b611c8fd /scripts/runqemu-internal
parent6de522e1cc4affbde05fc93f6c45b04b30307746 (diff)
downloadopenembedded-core-contrib-63340aefe538471086f62e380ad4ac85d9c993a9.tar.gz
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. (From OE-Core rev: c71309616a3247cfab969b74d8642ff0bf9b6500) 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>
Diffstat (limited to 'scripts/runqemu-internal')
-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