summaryrefslogtreecommitdiffstats
path: root/scripts/runqemu-internal
diff options
context:
space:
mode:
authorJagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.com>2015-06-16 16:18:30 +0530
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-23 11:47:16 +0100
commit840d0557b2b3242dea3325e2b710a5be88aac48e (patch)
tree01896571845250472fcaa7ae57d882a088e029cb /scripts/runqemu-internal
parenta155d2416070bc79f527dc2871d8b54f7a4e6db3 (diff)
downloadpoky-840d0557b2b3242dea3325e2b710a5be88aac48e.tar.gz
runqemu-internal: set mutual exclusiveness for serial and nographic options
Use "-nographic" option only if "serial" option is not specified. Otherwise we get below error when 'runqemu <kernel_image> <rootfs_image> serial' is executed, (snip) QEMU 2.2.0 monitor - type 'help' for more information (qemu) qemu-system-aarch64: -serial stdio: cannot use stdio by multiple character devices -- CUT -- (From OE-Core rev: 8b0527951ab71c4a4dc4d1238cd9e9e60a6eb5ee) Signed-off-by: Jagadeesh Krishnanjanappa <jkrishnanjanappa@mvista.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-internal9
1 files changed, 5 insertions, 4 deletions
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index 3df18031a6..694815fb74 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -275,9 +275,6 @@ else
275 275
276 KERNCMDLINE="mem=$QEMU_MEMORY" 276 KERNCMDLINE="mem=$QEMU_MEMORY"
277 QEMU_UI_OPTIONS="-show-cursor -usb -usbdevice wacom-tablet" 277 QEMU_UI_OPTIONS="-show-cursor -usb -usbdevice wacom-tablet"
278 if [ $MACHINE = 'qemuarm64' ]; then
279 QEMU_UI_OPTIONS="-nographic"
280 fi
281 278
282 NFS_INSTANCE=`echo $TAP | sed 's/tap//'` 279 NFS_INSTANCE=`echo $TAP | sed 's/tap//'`
283 export NFS_INSTANCE 280 export NFS_INSTANCE
@@ -383,7 +380,11 @@ if [ "$MACHINE" = "qemuarm64" ]; then
383 QEMU=qemu-system-aarch64 380 QEMU=qemu-system-aarch64
384 381
385 export QEMU_AUDIO_DRV="none" 382 export QEMU_AUDIO_DRV="none"
386 QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS" 383 if [ "x$SERIALSTDIO" = "x" ] ; then
384 QEMU_UI_OPTIONS="-nographic"
385 else
386 QEMU_UI_OPTIONS=""
387 fi
387 if [ "${FSTYPE:0:3}" = "ext" -o "$FSTYPE" = "btrfs" ]; then 388 if [ "${FSTYPE:0:3}" = "ext" -o "$FSTYPE" = "btrfs" ]; then
388 KERNCMDLINE="root=/dev/vda rw console=ttyAMA0,38400 mem=$QEMU_MEMORY highres=off $KERNEL_NETWORK_CMD" 389 KERNCMDLINE="root=/dev/vda rw console=ttyAMA0,38400 mem=$QEMU_MEMORY highres=off $KERNEL_NETWORK_CMD"
389 # qemu-system-aarch64 only support '-machine virt -cpu cortex-a57' for now 390 # qemu-system-aarch64 only support '-machine virt -cpu cortex-a57' for now