summaryrefslogtreecommitdiffstats
path: root/scripts/runqemu-internal
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2016-06-29 17:08:11 -0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-07-08 09:55:41 +0100
commit79798f20b2c0b98d84c3c4b14600635ff8ddfdad (patch)
treec395bd61f539afda67aa8ccadf457d793fc8be73 /scripts/runqemu-internal
parent2857658ff5e477cb436cf2778a78fa9f192caab8 (diff)
downloadopenembedded-core-contrib-79798f20b2c0b98d84c3c4b14600635ff8ddfdad.tar.gz
openembedded-core-contrib-79798f20b2c0b98d84c3c4b14600635ff8ddfdad.tar.bz2
openembedded-core-contrib-79798f20b2c0b98d84c3c4b14600635ff8ddfdad.zip
runqemu: Avoid duplicating custom QEMU options for AArch64
When detecting the second serial options we shouldn't append the custom QEMU options otherwise we will end duplicating those. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'scripts/runqemu-internal')
-rwxr-xr-xscripts/runqemu-internal2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index ea1a307234..3f413e7788 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -681,7 +681,7 @@ fi
# qemuarm64 uses virtio for any additional serial ports so the normal mechanism
# of using -serial will not work
if [ "$MACHINE" = "qemuarm64" ]; then
- SECOND_SERIAL_OPT="$SCRIPT_QEMU_EXTRA_OPT -device virtio-serial-device -chardev null,id=virtcon -device virtconsole,chardev=virtcon"
+ SECOND_SERIAL_OPT="-device virtio-serial-device -chardev null,id=virtcon -device virtconsole,chardev=virtcon"
else
SECOND_SERIAL_OPT="-serial null"
fi