diff options
author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2011-06-16 17:58:39 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-06-30 20:56:36 +0100 |
commit | d591e696b2516ab605cc829786e56f45e76c2cee (patch) | |
tree | 14cd5c05b158586d399c0799ee99689a0a49d11b /scripts/runqemu-internal | |
parent | c9ed41a3130549f3397b5325bf2e503c2186d1a7 (diff) | |
download | poky-d591e696b2516ab605cc829786e56f45e76c2cee.tar.gz |
scripts/runqemu: enable btrfs
(From OE-Core rev: 45689bbd46b0bb8e66b7c0ff7cc3321e5eef5b5f)
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/runqemu-internal')
-rwxr-xr-x | scripts/runqemu-internal | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal index ffac05e8e5..c15632d32e 100755 --- a/scripts/runqemu-internal +++ b/scripts/runqemu-internal | |||
@@ -277,7 +277,7 @@ if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "qemuarmv6" -o "$MACHINE" = "qemuarm | |||
277 | MACHINE_SUBTYPE=versatilepb | 277 | MACHINE_SUBTYPE=versatilepb |
278 | QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS" | 278 | QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS" |
279 | # QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -force-pointer" | 279 | # QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -force-pointer" |
280 | if [ "$FSTYPE" = "ext3" ]; then | 280 | if [ "$FSTYPE" = "ext3" -o "$FSTYPE" = "btrfs" ]; then |
281 | KERNCMDLINE="root=/dev/sda rw console=ttyAMA0,115200 console=tty $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY highres=off" | 281 | KERNCMDLINE="root=/dev/sda rw console=ttyAMA0,115200 console=tty $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY highres=off" |
282 | QEMUOPTIONS="$QEMU_NETWORK_CMD -M versatilepb -hda $ROOTFS -no-reboot $QEMU_UI_OPTIONS" | 282 | QEMUOPTIONS="$QEMU_NETWORK_CMD -M versatilepb -hda $ROOTFS -no-reboot $QEMU_UI_OPTIONS" |
283 | fi | 283 | fi |
@@ -301,7 +301,7 @@ fi | |||
301 | if [ "$MACHINE" = "qemux86" ]; then | 301 | if [ "$MACHINE" = "qemux86" ]; then |
302 | QEMU=qemu | 302 | QEMU=qemu |
303 | QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -vga vmware -enable-gl" | 303 | QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -vga vmware -enable-gl" |
304 | if [ "$FSTYPE" = "ext3" ]; then | 304 | if [ "$FSTYPE" = "ext3" -o "$FSTYPE" = "btrfs" ]; then |
305 | KERNCMDLINE="vga=0 root=/dev/hda rw mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD" | 305 | KERNCMDLINE="vga=0 root=/dev/hda rw mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD" |
306 | QEMUOPTIONS="$QEMU_NETWORK_CMD -hda $ROOTFS $QEMU_UI_OPTIONS" | 306 | QEMUOPTIONS="$QEMU_NETWORK_CMD -hda $ROOTFS $QEMU_UI_OPTIONS" |
307 | fi | 307 | fi |
@@ -322,7 +322,7 @@ fi | |||
322 | if [ "$MACHINE" = "qemux86-64" ]; then | 322 | if [ "$MACHINE" = "qemux86-64" ]; then |
323 | QEMU=qemu-system-x86_64 | 323 | QEMU=qemu-system-x86_64 |
324 | QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -vga vmware -enable-gl" | 324 | QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -vga vmware -enable-gl" |
325 | if [ "$FSTYPE" = "ext3" ]; then | 325 | if [ "$FSTYPE" = "ext3" -o "$FSTYPE" = "btrfs" ]; then |
326 | KERNCMDLINE="vga=0 root=/dev/hda rw mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD" | 326 | KERNCMDLINE="vga=0 root=/dev/hda rw mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD" |
327 | QEMUOPTIONS="$QEMU_NETWORK_CMD -hda $ROOTFS $QEMU_UI_OPTIONS" | 327 | QEMUOPTIONS="$QEMU_NETWORK_CMD -hda $ROOTFS $QEMU_UI_OPTIONS" |
328 | fi | 328 | fi |
@@ -345,7 +345,7 @@ fi | |||
345 | 345 | ||
346 | if [ "$MACHINE" = "spitz" ]; then | 346 | if [ "$MACHINE" = "spitz" ]; then |
347 | QEMU=qemu-system-arm | 347 | QEMU=qemu-system-arm |
348 | if [ "$FSTYPE" = "ext3" ]; then | 348 | if [ "$FSTYPE" = "ext3" -o "$FSTYPE" = "btrfs" ]; then |
349 | echo $ROOTFS | 349 | echo $ROOTFS |
350 | ROOTFS=`readlink -f $ROOTFS` | 350 | ROOTFS=`readlink -f $ROOTFS` |
351 | echo $ROOTFS | 351 | echo $ROOTFS |
@@ -361,7 +361,7 @@ if [ "$MACHINE" = "qemumips" ]; then | |||
361 | QEMU=qemu-system-mips | 361 | QEMU=qemu-system-mips |
362 | MACHINE_SUBTYPE=malta | 362 | MACHINE_SUBTYPE=malta |
363 | QEMU_UI_OPTIONS="-vga cirrus $QEMU_UI_OPTIONS" | 363 | QEMU_UI_OPTIONS="-vga cirrus $QEMU_UI_OPTIONS" |
364 | if [ "$FSTYPE" = "ext3" ]; then | 364 | if [ "$FSTYPE" = "ext3" -o "$FSTYPE" = "btrfs" ]; then |
365 | #KERNCMDLINE="root=/dev/hda console=ttyS0 console=tty0 $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" | 365 | #KERNCMDLINE="root=/dev/hda console=ttyS0 console=tty0 $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" |
366 | KERNCMDLINE="root=/dev/hda rw console=ttyS0 console=tty $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" | 366 | KERNCMDLINE="root=/dev/hda rw console=ttyS0 console=tty $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" |
367 | QEMUOPTIONS="$QEMU_NETWORK_CMD -M $MACHINE_SUBTYPE -hda $ROOTFS -no-reboot $QEMU_UI_OPTIONS" | 367 | QEMUOPTIONS="$QEMU_NETWORK_CMD -M $MACHINE_SUBTYPE -hda $ROOTFS -no-reboot $QEMU_UI_OPTIONS" |
@@ -383,7 +383,7 @@ if [ "$MACHINE" = "qemuppc" ]; then | |||
383 | CPU_SUBTYPE=603e | 383 | CPU_SUBTYPE=603e |
384 | BIOS=powerpc_rom.bin | 384 | BIOS=powerpc_rom.bin |
385 | QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -nographic" | 385 | QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -nographic" |
386 | if [ "$FSTYPE" = "ext3" ]; then | 386 | if [ "$FSTYPE" = "ext3" -o "$FSTYPE" = "btrfs" ]; then |
387 | KERNCMDLINE="root=/dev/hda rw console=ttyS0 console=tty0 $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" | 387 | KERNCMDLINE="root=/dev/hda rw console=ttyS0 console=tty0 $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" |
388 | QEMUOPTIONS="$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE -M $MACHINE_SUBTYPE -bios $BIOS -hda $ROOTFS -no-reboot $QEMU_UI_OPTIONS" | 388 | QEMUOPTIONS="$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE -M $MACHINE_SUBTYPE -bios $BIOS -hda $ROOTFS -no-reboot $QEMU_UI_OPTIONS" |
389 | fi | 389 | fi |