summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorNathan Rossi <nathan@nathanrossi.com>2015-09-16 14:59:58 +1000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-23 09:52:57 +0100
commit9aaf7e3f840e26d9f7bd282479858179cc1925bf (patch)
tree1018e34512873616b6a395b83bb2eedf65b617af /scripts
parentbe493ba7df535495d28afa926457623753060d68 (diff)
downloadpoky-9aaf7e3f840e26d9f7bd282479858179cc1925bf.tar.gz
runqemu-internal: Fix qemu networking for qemuzynq an qemumicroblaze
This patch brings the qemu networking setup for qemuzynq and qemumicroblaze into feature parity with the other qemu machines. Specifically enabling TAP interface attachcment and kernel command line IP configuration. (From OE-Core rev: 49bdfab6ba1d92d8f48ce9c63d796a7cedf4f247) Signed-off-by: Nathan Rossi <nathan@nathanrossi.com> 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-internal8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index 15272683b8..2d2a839746 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -587,20 +587,20 @@ fi
587 587
588if [ "$MACHINE" = "qemumicroblaze" ]; then 588if [ "$MACHINE" = "qemumicroblaze" ]; then
589 QEMU=qemu-system-microblazeel 589 QEMU=qemu-system-microblazeel
590 QEMU_SYSTEM_OPTIONS="-M petalogix-ml605 -serial mon:stdio -dtb $KERNEL-$MACHINE.dtb" 590 QEMU_SYSTEM_OPTIONS="$QEMU_NETWORK_CMD -M petalogix-ml605 -serial mon:stdio -dtb $KERNEL-$MACHINE.dtb"
591 if [ "${FSTYPE:0:3}" = "ext" -o "${FSTYPE:0:4}" = "cpio" ]; then 591 if [ "${FSTYPE:0:3}" = "ext" -o "${FSTYPE:0:4}" = "cpio" ]; then
592 KERNCMDLINE="earlyprintk root=/dev/ram rw" 592 KERNCMDLINE="earlyprintk root=/dev/ram rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
593 QEMUOPTIONS="$QEMU_SYSTEM_OPTIONS -initrd $ROOTFS" 593 QEMUOPTIONS="$QEMU_SYSTEM_OPTIONS -initrd $ROOTFS"
594 fi 594 fi
595fi 595fi
596 596
597if [ "$MACHINE" = "qemuzynq" ]; then 597if [ "$MACHINE" = "qemuzynq" ]; then
598 QEMU=qemu-system-arm 598 QEMU=qemu-system-arm
599 QEMU_SYSTEM_OPTIONS="-M xilinx-zynq-a9 -serial null -serial mon:stdio -dtb $KERNEL-$MACHINE.dtb" 599 QEMU_SYSTEM_OPTIONS="$QEMU_NETWORK_CMD -M xilinx-zynq-a9 -serial null -serial mon:stdio -dtb $KERNEL-$MACHINE.dtb"
600 # zynq serial ports are named 'ttyPS0' and 'ttyPS1', fixup the default values 600 # zynq serial ports are named 'ttyPS0' and 'ttyPS1', fixup the default values
601 SCRIPT_KERNEL_OPT=$(echo "$SCRIPT_KERNEL_OPT" | sed 's/console=ttyS/console=ttyPS/g') 601 SCRIPT_KERNEL_OPT=$(echo "$SCRIPT_KERNEL_OPT" | sed 's/console=ttyS/console=ttyPS/g')
602 if [ "${FSTYPE:0:3}" = "ext" -o "${FSTYPE:0:4}" = "cpio" ]; then 602 if [ "${FSTYPE:0:3}" = "ext" -o "${FSTYPE:0:4}" = "cpio" ]; then
603 KERNCMDLINE="earlyprintk root=/dev/ram rw" 603 KERNCMDLINE="earlyprintk root=/dev/ram rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
604 QEMUOPTIONS="$QEMU_SYSTEM_OPTIONS -initrd $ROOTFS" 604 QEMUOPTIONS="$QEMU_SYSTEM_OPTIONS -initrd $ROOTFS"
605 fi 605 fi
606fi 606fi