diff options
| -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 | |||
| 587 | 587 | ||
| 588 | if [ "$MACHINE" = "qemumicroblaze" ]; then | 588 | if [ "$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 |
| 595 | fi | 595 | fi |
| 596 | 596 | ||
| 597 | if [ "$MACHINE" = "qemuzynq" ]; then | 597 | if [ "$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 |
| 606 | fi | 606 | fi |
