diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/poky-qemu | 2 | ||||
| -rwxr-xr-x | scripts/poky-qemu-internal | 8 | ||||
| -rwxr-xr-x | scripts/runqemu | 30 |
3 files changed, 20 insertions, 20 deletions
diff --git a/scripts/poky-qemu b/scripts/poky-qemu index 1407c25f33..be070d7024 100755 --- a/scripts/poky-qemu +++ b/scripts/poky-qemu | |||
| @@ -40,7 +40,7 @@ fi | |||
| 40 | if [ "x$1" = "x" ]; then | 40 | if [ "x$1" = "x" ]; then |
| 41 | TYPE="nfs" | 41 | TYPE="nfs" |
| 42 | else | 42 | else |
| 43 | TYPE="ext2" | 43 | TYPE="ext3" |
| 44 | if [ "$MACHINE" = "akita" ]; then | 44 | if [ "$MACHINE" = "akita" ]; then |
| 45 | TYPE="jffs2" | 45 | TYPE="jffs2" |
| 46 | fi | 46 | fi |
diff --git a/scripts/poky-qemu-internal b/scripts/poky-qemu-internal index b9061ecd8e..327c0dd3d6 100755 --- a/scripts/poky-qemu-internal +++ b/scripts/poky-qemu-internal | |||
| @@ -88,7 +88,7 @@ fi | |||
| 88 | 88 | ||
| 89 | if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "qemuarmv6" -o "$MACHINE" = "qemuarmv7" ]; then | 89 | if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "qemuarmv6" -o "$MACHINE" = "qemuarmv7" ]; then |
| 90 | QEMU=qemu-system-arm | 90 | QEMU=qemu-system-arm |
| 91 | if [ "$TYPE" = "ext2" ]; then | 91 | if [ "$TYPE" = "ext3" ]; then |
| 92 | KERNCMDLINE="root=/dev/sda console=ttyAMA0 console=tty0 $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" | 92 | KERNCMDLINE="root=/dev/sda console=ttyAMA0 console=tty0 $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" |
| 93 | QEMUOPTIONS="$QEMU_NETWORK_CMD -M versatilepb -hda $HDIMAGE -usb -usbdevice wacom-tablet -no-reboot" | 93 | QEMUOPTIONS="$QEMU_NETWORK_CMD -M versatilepb -hda $HDIMAGE -usb -usbdevice wacom-tablet -no-reboot" |
| 94 | fi | 94 | fi |
| @@ -113,9 +113,9 @@ fi | |||
| 113 | 113 | ||
| 114 | if [ "$MACHINE" = "qemux86" ]; then | 114 | if [ "$MACHINE" = "qemux86" ]; then |
| 115 | QEMU=qemu | 115 | QEMU=qemu |
| 116 | if [ "$TYPE" = "ext2" ]; then | 116 | if [ "$TYPE" = "ext3" ]; then |
| 117 | KERNCMDLINE="root=/dev/hda mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD" | 117 | KERNCMDLINE="root=/dev/hda mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD" |
| 118 | QEMUOPTIONS="-std-vga $QEMU_NETWORK_CMD -hda $HDIMAGE -usb -usbdevice wacom-tablet" | 118 | QEMUOPTIONS="-vga std $QEMU_NETWORK_CMD -hda $HDIMAGE -usb -usbdevice wacom-tablet" |
| 119 | fi | 119 | fi |
| 120 | if [ "$TYPE" = "nfs" ]; then | 120 | if [ "$TYPE" = "nfs" ]; then |
| 121 | if [ "x$HDIMAGE" = "x" ]; then | 121 | if [ "x$HDIMAGE" = "x" ]; then |
| @@ -126,7 +126,7 @@ if [ "$MACHINE" = "qemux86" ]; then | |||
| 126 | return | 126 | return |
| 127 | fi | 127 | fi |
| 128 | KERNCMDLINE="root=/dev/nfs nfsroot=192.168.7.1:$HDIMAGE rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" | 128 | KERNCMDLINE="root=/dev/nfs nfsroot=192.168.7.1:$HDIMAGE rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" |
| 129 | QEMUOPTIONS="-std-vga -usb -usbdevice wacom-tablet $QEMU_NETWORK_CMD" | 129 | QEMUOPTIONS="-vga std -usb -usbdevice wacom-tablet $QEMU_NETWORK_CMD" |
| 130 | fi | 130 | fi |
| 131 | fi | 131 | fi |
| 132 | 132 | ||
diff --git a/scripts/runqemu b/scripts/runqemu index d69e7a3e23..d0abe56f57 100755 --- a/scripts/runqemu +++ b/scripts/runqemu | |||
| @@ -43,7 +43,7 @@ if [ "x$1" != "x" ]; then | |||
| 43 | TYPE=$1 | 43 | TYPE=$1 |
| 44 | shift | 44 | shift |
| 45 | else | 45 | else |
| 46 | TYPE="ext2" | 46 | TYPE="ext3" |
| 47 | if [ "$MACHINE" = "akita" ]; then | 47 | if [ "$MACHINE" = "akita" ]; then |
| 48 | TYPE="jffs2" | 48 | TYPE="jffs2" |
| 49 | fi | 49 | fi |
| @@ -73,15 +73,15 @@ if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "spitz" -o "$MACHINE" = "borzoi" -o | |||
| 73 | fi | 73 | fi |
| 74 | 74 | ||
| 75 | if [ "$MACHINE" = "qemuarm" ]; then | 75 | if [ "$MACHINE" = "qemuarm" ]; then |
| 76 | if [ "$TYPE" = "ext2" ]; then | 76 | if [ "$TYPE" = "ext3" ]; then |
| 77 | if [ "x$HDIMAGE" = "x" ]; then | 77 | if [ "x$HDIMAGE" = "x" ]; then |
| 78 | T=$BUILDDIR/tmp/deploy/images/poky-image | 78 | T=$BUILDDIR/tmp/deploy/images/poky-image |
| 79 | if [ -e "$T-sdk-qemuarm.ext2" ]; then | 79 | if [ -e "$T-sdk-qemuarm.ext3" ]; then |
| 80 | HDIMAGE="$T-sdk-qemuarm.ext2" | 80 | HDIMAGE="$T-sdk-qemuarm.ext3" |
| 81 | elif [ -e "$T-sato-qemuarm.ext2" ]; then | 81 | elif [ -e "$T-sato-qemuarm.ext3" ]; then |
| 82 | HDIMAGE="$T-sato-qemuarm.ext2" | 82 | HDIMAGE="$T-sato-qemuarm.ext3" |
| 83 | elif [ -e "$T-minimal-qemuarm.ext2" ]; then | 83 | elif [ -e "$T-minimal-qemuarm.ext3" ]; then |
| 84 | HDIMAGE="$T-minimal-qemuarm.ext2" | 84 | HDIMAGE="$T-minimal-qemuarm.ext3" |
| 85 | fi | 85 | fi |
| 86 | fi | 86 | fi |
| 87 | fi | 87 | fi |
| @@ -116,15 +116,15 @@ if [ "$MACHINE" = "qemux86" ]; then | |||
| 116 | if [ "x$ZIMAGE" = "x" ]; then | 116 | if [ "x$ZIMAGE" = "x" ]; then |
| 117 | ZIMAGE=$BUILDDIR/tmp/deploy/images/bzImage-$MACHINE.bin | 117 | ZIMAGE=$BUILDDIR/tmp/deploy/images/bzImage-$MACHINE.bin |
| 118 | fi | 118 | fi |
| 119 | if [ "$TYPE" = "ext2" ]; then | 119 | if [ "$TYPE" = "ext3" ]; then |
| 120 | if [ "x$HDIMAGE" = "x" ]; then | 120 | if [ "x$HDIMAGE" = "x" ]; then |
| 121 | T=$BUILDDIR/tmp/deploy/images/poky-image | 121 | T=$BUILDDIR/tmp/deploy/images/poky-image |
| 122 | if [ -e "$T-sdk-qemux86.ext2" ]; then | 122 | if [ -e "$T-sdk-qemux86.ext3" ]; then |
| 123 | HDIMAGE=$T-sdk-qemux86.ext2 | 123 | HDIMAGE=$T-sdk-qemux86.ext3 |
| 124 | elif [ -e "$T-sato-qemux86.ext2" ]; then | 124 | elif [ -e "$T-sato-qemux86.ext3" ]; then |
| 125 | HDIMAGE=$T-sato-qemux86.ext2 | 125 | HDIMAGE=$T-sato-qemux86.ext3 |
| 126 | elif [ -e "$T-minimal-qemux86.ext2" ]; then | 126 | elif [ -e "$T-minimal-qemux86.ext3" ]; then |
| 127 | HDIMAGE=$T-minimal-qemux86.ext2 | 127 | HDIMAGE=$T-minimal-qemux86.ext3 |
| 128 | fi | 128 | fi |
| 129 | fi | 129 | fi |
| 130 | fi | 130 | fi |
