sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

scripts: Update qemu scripts with changes in recent qemu calling conventions and the switch to ext3 images

This commit is contained in:
Richard Purdie 2009-01-05 16:00:31 +00:00
parent e45a4a847c
commit eae7eb5bd5
3 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/poky-qemu
View File

@ -40,7 +40,7 @@ fi
if [ "x$1" = "x" ]; then if [ "x$1" = "x" ]; then
TYPE="nfs" TYPE="nfs"
else else
TYPE="ext2" TYPE="ext3"
if [ "$MACHINE" = "akita" ]; then if [ "$MACHINE" = "akita" ]; then
TYPE="jffs2" TYPE="jffs2"
fi fi

8
scripts/poky-qemu-internal
View File

@ -88,7 +88,7 @@ fi
if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "qemuarmv6" -o "$MACHINE" = "qemuarmv7" ]; then if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "qemuarmv6" -o "$MACHINE" = "qemuarmv7" ]; then
QEMU=qemu-system-arm QEMU=qemu-system-arm
if [ "$TYPE" = "ext2" ]; then if [ "$TYPE" = "ext3" ]; then
KERNCMDLINE="root=/dev/sda console=ttyAMA0 console=tty0 $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" KERNCMDLINE="root=/dev/sda console=ttyAMA0 console=tty0 $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
QEMUOPTIONS="$QEMU_NETWORK_CMD -M versatilepb -hda $HDIMAGE -usb -usbdevice wacom-tablet -no-reboot" QEMUOPTIONS="$QEMU_NETWORK_CMD -M versatilepb -hda $HDIMAGE -usb -usbdevice wacom-tablet -no-reboot"
fi fi
@ -113,9 +113,9 @@ fi
if [ "$MACHINE" = "qemux86" ]; then if [ "$MACHINE" = "qemux86" ]; then
QEMU=qemu QEMU=qemu
if [ "$TYPE" = "ext2" ]; then if [ "$TYPE" = "ext3" ]; then
KERNCMDLINE="root=/dev/hda mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD" KERNCMDLINE="root=/dev/hda mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD"
QEMUOPTIONS="-std-vga $QEMU_NETWORK_CMD -hda $HDIMAGE -usb -usbdevice wacom-tablet" QEMUOPTIONS="-vga std $QEMU_NETWORK_CMD -hda $HDIMAGE -usb -usbdevice wacom-tablet"
fi fi
if [ "$TYPE" = "nfs" ]; then if [ "$TYPE" = "nfs" ]; then
if [ "x$HDIMAGE" = "x" ]; then if [ "x$HDIMAGE" = "x" ]; then
@ -126,7 +126,7 @@ if [ "$MACHINE" = "qemux86" ]; then
return return
fi fi
KERNCMDLINE="root=/dev/nfs nfsroot=192.168.7.1:$HDIMAGE rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" KERNCMDLINE="root=/dev/nfs nfsroot=192.168.7.1:$HDIMAGE rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
QEMUOPTIONS="-std-vga -usb -usbdevice wacom-tablet $QEMU_NETWORK_CMD" QEMUOPTIONS="-vga std -usb -usbdevice wacom-tablet $QEMU_NETWORK_CMD"
fi fi
fi fi

30
scripts/runqemu
View File

@ -43,7 +43,7 @@ if [ "x$1" != "x" ]; then
TYPE=$1 TYPE=$1
shift shift
else else
TYPE="ext2" TYPE="ext3"
if [ "$MACHINE" = "akita" ]; then if [ "$MACHINE" = "akita" ]; then
TYPE="jffs2" TYPE="jffs2"
fi fi
@ -73,15 +73,15 @@ if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "spitz" -o "$MACHINE" = "borzoi" -o
fi fi
if [ "$MACHINE" = "qemuarm" ]; then if [ "$MACHINE" = "qemuarm" ]; then
if [ "$TYPE" = "ext2" ]; then if [ "$TYPE" = "ext3" ]; then
if [ "x$HDIMAGE" = "x" ]; then if [ "x$HDIMAGE" = "x" ]; then
T=$BUILDDIR/tmp/deploy/images/poky-image T=$BUILDDIR/tmp/deploy/images/poky-image
if [ -e "$T-sdk-qemuarm.ext2" ]; then if [ -e "$T-sdk-qemuarm.ext3" ]; then
HDIMAGE="$T-sdk-qemuarm.ext2" HDIMAGE="$T-sdk-qemuarm.ext3"
elif [ -e "$T-sato-qemuarm.ext2" ]; then elif [ -e "$T-sato-qemuarm.ext3" ]; then
HDIMAGE="$T-sato-qemuarm.ext2" HDIMAGE="$T-sato-qemuarm.ext3"
elif [ -e "$T-minimal-qemuarm.ext2" ]; then elif [ -e "$T-minimal-qemuarm.ext3" ]; then
HDIMAGE="$T-minimal-qemuarm.ext2" HDIMAGE="$T-minimal-qemuarm.ext3"
fi fi
fi fi
fi fi
@ -116,15 +116,15 @@ if [ "$MACHINE" = "qemux86" ]; then
if [ "x$ZIMAGE" = "x" ]; then if [ "x$ZIMAGE" = "x" ]; then
ZIMAGE=$BUILDDIR/tmp/deploy/images/bzImage-$MACHINE.bin ZIMAGE=$BUILDDIR/tmp/deploy/images/bzImage-$MACHINE.bin
fi fi
if [ "$TYPE" = "ext2" ]; then if [ "$TYPE" = "ext3" ]; then
if [ "x$HDIMAGE" = "x" ]; then if [ "x$HDIMAGE" = "x" ]; then
T=$BUILDDIR/tmp/deploy/images/poky-image T=$BUILDDIR/tmp/deploy/images/poky-image
if [ -e "$T-sdk-qemux86.ext2" ]; then if [ -e "$T-sdk-qemux86.ext3" ]; then
HDIMAGE=$T-sdk-qemux86.ext2 HDIMAGE=$T-sdk-qemux86.ext3
elif [ -e "$T-sato-qemux86.ext2" ]; then elif [ -e "$T-sato-qemux86.ext3" ]; then
HDIMAGE=$T-sato-qemux86.ext2 HDIMAGE=$T-sato-qemux86.ext3
elif [ -e "$T-minimal-qemux86.ext2" ]; then elif [ -e "$T-minimal-qemux86.ext3" ]; then
HDIMAGE=$T-minimal-qemux86.ext2 HDIMAGE=$T-minimal-qemux86.ext3
fi fi
fi fi
fi fi