summaryrefslogtreecommitdiffstats
path: root/scripts/runqemu-internal
diff options
context:
space:
mode:
authorAlistair Francis <alistair.francis@xilinx.com>2016-06-07 11:33:37 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-12 23:47:15 +0100
commit98fbdc77d241c65fff0df8bf95cb733f75aa74a6 (patch)
treeb97d19426db55390da4cc38882542fd574586683 /scripts/runqemu-internal
parent768dcc197eee758447ecbaea3dd34aa66d2e388b (diff)
downloadpoky-98fbdc77d241c65fff0df8bf95cb733f75aa74a6.tar.gz
runqemu-internal: Update the qemuzynq boot options
The current qemuzynq options were causing QEMU to exit instead of booting as the QEMU Zynq-7000 machine does not have virtio or display devices. (From OE-Core rev: e76f62a862a895147a89cea2519679aad337a679) Signed-off-by: Alistair Francis <alistair.francis@xilinx.com> Reported-by: Arno <star@gmx.li> 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-internal3
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index 5671b4f434..ea1a307234 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -489,7 +489,8 @@ config_qemush4() {
489config_qemuzynq() { 489config_qemuzynq() {
490 set_mem_size 1024 490 set_mem_size 1024
491 QEMU=qemu-system-arm 491 QEMU=qemu-system-arm
492 QEMU_SYSTEM_OPTIONS="$QEMU_NETWORK_CMD -M xilinx-zynq-a9 -serial null -serial mon:stdio -dtb $KERNEL-$MACHINE.dtb" 492 QEMU_NETWORK_CMD="-net nic -net nic $QEMU_TAP_CMD"
493 QEMU_SYSTEM_OPTIONS="$QEMU_NETWORK_CMD -M xilinx-zynq-a9 -serial null -serial mon:stdio -nographic -dtb $KERNEL-$MACHINE.dtb"
493 # zynq serial ports are named 'ttyPS0' and 'ttyPS1', fixup the default values 494 # zynq serial ports are named 'ttyPS0' and 'ttyPS1', fixup the default values
494 SCRIPT_KERNEL_OPT=$(echo "$SCRIPT_KERNEL_OPT" | sed 's/console=ttyS/console=ttyPS/g') 495 SCRIPT_KERNEL_OPT=$(echo "$SCRIPT_KERNEL_OPT" | sed 's/console=ttyS/console=ttyPS/g')
495 if [ "${FSTYPE:0:3}" = "ext" -o "${FSTYPE:0:4}" = "cpio" ]; then 496 if [ "${FSTYPE:0:3}" = "ext" -o "${FSTYPE:0:4}" = "cpio" ]; then