summaryrefslogtreecommitdiffstats
path: root/scripts
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:57:25 +0100
commitdc626e3bdc1aeae1f3d79ea78b61a581b5e6ea3e (patch)
tree76b4f38e13906cabab69d5a9cce37dac01ff22aa /scripts
parente8e8d412e7bafd38bdda7fea03f5db3b5e179baf (diff)
downloadpoky-dc626e3bdc1aeae1f3d79ea78b61a581b5e6ea3e.tar.gz
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. (From OE-Core rev: 79798f20b2c0b98d84c3c4b14600635ff8ddfdad) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-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
681# qemuarm64 uses virtio for any additional serial ports so the normal mechanism 681# qemuarm64 uses virtio for any additional serial ports so the normal mechanism
682# of using -serial will not work 682# of using -serial will not work
683if [ "$MACHINE" = "qemuarm64" ]; then 683if [ "$MACHINE" = "qemuarm64" ]; then
684 SECOND_SERIAL_OPT="$SCRIPT_QEMU_EXTRA_OPT -device virtio-serial-device -chardev null,id=virtcon -device virtconsole,chardev=virtcon" 684 SECOND_SERIAL_OPT="-device virtio-serial-device -chardev null,id=virtcon -device virtconsole,chardev=virtcon"
685else 685else
686 SECOND_SERIAL_OPT="-serial null" 686 SECOND_SERIAL_OPT="-serial null"
687fi 687fi