diff options
author | Nathan Rossi <nathan@nathanrossi.com> | 2015-09-16 14:59:58 +1000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-21 15:20:11 +0100 |
commit | 49bdfab6ba1d92d8f48ce9c63d796a7cedf4f247 (patch) | |
tree | b6952f8e322b789dd2b4e78d3a261f5544c3df45 /scripts/runqemu-internal | |
parent | 6c133405c790d29859d441cc596e6459cb32537f (diff) | |
download | openembedded-core-49bdfab6ba1d92d8f48ce9c63d796a7cedf4f247.tar.gz openembedded-core-49bdfab6ba1d92d8f48ce9c63d796a7cedf4f247.tar.bz2 openembedded-core-49bdfab6ba1d92d8f48ce9c63d796a7cedf4f247.zip |
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.
Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'scripts/runqemu-internal')
-rwxr-xr-x | scripts/runqemu-internal | 8 |
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 if [ "$MACHINE" = "qemumicroblaze" ]; then QEMU=qemu-system-microblazeel - QEMU_SYSTEM_OPTIONS="-M petalogix-ml605 -serial mon:stdio -dtb $KERNEL-$MACHINE.dtb" + QEMU_SYSTEM_OPTIONS="$QEMU_NETWORK_CMD -M petalogix-ml605 -serial mon:stdio -dtb $KERNEL-$MACHINE.dtb" if [ "${FSTYPE:0:3}" = "ext" -o "${FSTYPE:0:4}" = "cpio" ]; then - KERNCMDLINE="earlyprintk root=/dev/ram rw" + KERNCMDLINE="earlyprintk root=/dev/ram rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" QEMUOPTIONS="$QEMU_SYSTEM_OPTIONS -initrd $ROOTFS" fi fi if [ "$MACHINE" = "qemuzynq" ]; then QEMU=qemu-system-arm - QEMU_SYSTEM_OPTIONS="-M xilinx-zynq-a9 -serial null -serial mon:stdio -dtb $KERNEL-$MACHINE.dtb" + QEMU_SYSTEM_OPTIONS="$QEMU_NETWORK_CMD -M xilinx-zynq-a9 -serial null -serial mon:stdio -dtb $KERNEL-$MACHINE.dtb" # zynq serial ports are named 'ttyPS0' and 'ttyPS1', fixup the default values SCRIPT_KERNEL_OPT=$(echo "$SCRIPT_KERNEL_OPT" | sed 's/console=ttyS/console=ttyPS/g') if [ "${FSTYPE:0:3}" = "ext" -o "${FSTYPE:0:4}" = "cpio" ]; then - KERNCMDLINE="earlyprintk root=/dev/ram rw" + KERNCMDLINE="earlyprintk root=/dev/ram rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" QEMUOPTIONS="$QEMU_SYSTEM_OPTIONS -initrd $ROOTFS" fi fi |