summaryrefslogtreecommitdiffstats
path: root/scripts/runqemu-internal
diff options
context:
space:
mode:
authorStefan Stanacar <stefanx.stanacar@intel.com>2013-05-10 16:06:25 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-12 07:33:16 (GMT)
commit2c2dd5be3ea38e8639ed3ffb65dd9ad638c08a59 (patch)
tree42667c8bb799aa724129316d93af204f67dd3262 /scripts/runqemu-internal
parentbc02e97db7ce7edc69528d486149c52e1261fa34 (diff)
downloadpoky-2c2dd5be3ea38e8639ed3ffb65dd9ad638c08a59.tar.gz
runqemu-internal: support for ext2 and ext4 not only ext3
Don't check only for ext3 fstype, we can boot ext2 and ext4 just as well. (From OE-Core rev: 8fbf21365fbfab9e3cd36c4eab86fe03efa04e8e) Signed-off-by: Stefan Stanacar <stefanx.stanacar@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/runqemu-internal')
-rwxr-xr-xscripts/runqemu-internal14
1 files changed, 7 insertions, 7 deletions
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index f11706d..3bd0a09 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -299,7 +299,7 @@ if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "qemuarmv6" -o "$MACHINE" = "qemuarm
299 export QEMU_AUDIO_DRV="none" 299 export QEMU_AUDIO_DRV="none"
300 QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS" 300 QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS"
301 # QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -force-pointer" 301 # QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -force-pointer"
302 if [ "$FSTYPE" = "ext3" -o "$FSTYPE" = "btrfs" ]; then 302 if [ "${FSTYPE:0:3}" = "ext" -o "$FSTYPE" = "btrfs" ]; then
303 KERNCMDLINE="root=/dev/sda rw console=ttyAMA0,115200 console=tty $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY highres=off" 303 KERNCMDLINE="root=/dev/sda rw console=ttyAMA0,115200 console=tty $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY highres=off"
304 QEMUOPTIONS="$QEMU_NETWORK_CMD -M ${MACHINE_SUBTYPE} -hda $ROOTFS -no-reboot $QEMU_UI_OPTIONS" 304 QEMUOPTIONS="$QEMU_NETWORK_CMD -M ${MACHINE_SUBTYPE} -hda $ROOTFS -no-reboot $QEMU_UI_OPTIONS"
305 fi 305 fi
@@ -323,7 +323,7 @@ fi
323if [ "$MACHINE" = "qemux86" ]; then 323if [ "$MACHINE" = "qemux86" ]; then
324 QEMU=qemu-system-i386 324 QEMU=qemu-system-i386
325 QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -vga vmware" 325 QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -vga vmware"
326 if [ "$FSTYPE" = "ext2" -o "$FSTYPE" = "ext3" -o "$FSTYPE" = "btrfs" ]; then 326 if [ "${FSTYPE:0:3}" = "ext" -o "$FSTYPE" = "btrfs" ]; then
327 KERNCMDLINE="vga=0 uvesafb.mode_option=640x480-32 root=$DROOT rw mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD" 327 KERNCMDLINE="vga=0 uvesafb.mode_option=640x480-32 root=$DROOT rw mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD"
328 QEMUOPTIONS="$QEMU_NETWORK_CMD $ROOTFS_OPTIONS $QEMU_UI_OPTIONS" 328 QEMUOPTIONS="$QEMU_NETWORK_CMD $ROOTFS_OPTIONS $QEMU_UI_OPTIONS"
329 fi 329 fi
@@ -347,7 +347,7 @@ fi
347if [ "$MACHINE" = "qemux86-64" ]; then 347if [ "$MACHINE" = "qemux86-64" ]; then
348 QEMU=qemu-system-x86_64 348 QEMU=qemu-system-x86_64
349 QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -vga vmware" 349 QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -vga vmware"
350 if [ "$FSTYPE" = "ext3" -o "$FSTYPE" = "btrfs" ]; then 350 if [ "${FSTYPE:0:3}" = "ext" -o "$FSTYPE" = "btrfs" ]; then
351 KERNCMDLINE="vga=0 uvesafb.mode_option=640x480-32 root=$DROOT rw mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD" 351 KERNCMDLINE="vga=0 uvesafb.mode_option=640x480-32 root=$DROOT rw mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD"
352 QEMUOPTIONS="$QEMU_NETWORK_CMD $ROOTFS_OPTIONS $QEMU_UI_OPTIONS" 352 QEMUOPTIONS="$QEMU_NETWORK_CMD $ROOTFS_OPTIONS $QEMU_UI_OPTIONS"
353 fi 353 fi
@@ -373,7 +373,7 @@ fi
373 373
374if [ "$MACHINE" = "spitz" ]; then 374if [ "$MACHINE" = "spitz" ]; then
375 QEMU=qemu-system-arm 375 QEMU=qemu-system-arm
376 if [ "$FSTYPE" = "ext3" -o "$FSTYPE" = "btrfs" ]; then 376 if [ "${FSTYPE:0:3}" = "ext" -o "$FSTYPE" = "btrfs" ]; then
377 echo $ROOTFS 377 echo $ROOTFS
378 ROOTFS=`readlink -f $ROOTFS` 378 ROOTFS=`readlink -f $ROOTFS`
379 echo $ROOTFS 379 echo $ROOTFS
@@ -393,7 +393,7 @@ if [ "$MACHINE" = "qemumips" -o "$MACHINE" = "qemumipsel" -o "$MACHINE" = "qemum
393 esac 393 esac
394 MACHINE_SUBTYPE=malta 394 MACHINE_SUBTYPE=malta
395 QEMU_UI_OPTIONS="-vga cirrus $QEMU_UI_OPTIONS" 395 QEMU_UI_OPTIONS="-vga cirrus $QEMU_UI_OPTIONS"
396 if [ "$FSTYPE" = "ext3" -o "$FSTYPE" = "btrfs" ]; then 396 if [ "${FSTYPE:0:3}" = "ext" -o "$FSTYPE" = "btrfs" ]; then
397 #KERNCMDLINE="root=/dev/hda console=ttyS0 console=tty0 $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" 397 #KERNCMDLINE="root=/dev/hda console=ttyS0 console=tty0 $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
398 KERNCMDLINE="root=/dev/hda rw console=ttyS0 console=tty $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" 398 KERNCMDLINE="root=/dev/hda rw console=ttyS0 console=tty $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
399 QEMUOPTIONS="$QEMU_NETWORK_CMD -M $MACHINE_SUBTYPE -hda $ROOTFS -no-reboot $QEMU_UI_OPTIONS" 399 QEMUOPTIONS="$QEMU_NETWORK_CMD -M $MACHINE_SUBTYPE -hda $ROOTFS -no-reboot $QEMU_UI_OPTIONS"
@@ -415,7 +415,7 @@ if [ "$MACHINE" = "qemuppc" ]; then
415 CPU_SUBTYPE=G4 415 CPU_SUBTYPE=G4
416 QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS" 416 QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS"
417 QEMU_NETWORK_CMD="-net nic,model=pcnet $QEMU_TAP_CMD" 417 QEMU_NETWORK_CMD="-net nic,model=pcnet $QEMU_TAP_CMD"
418 if [ "$FSTYPE" = "ext3" -o "$FSTYPE" = "btrfs" ]; then 418 if [ "${FSTYPE:0:3}" = "ext" -o "$FSTYPE" = "btrfs" ]; then
419 KERNCMDLINE="root=/dev/hda rw console=ttyS0 console=tty $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" 419 KERNCMDLINE="root=/dev/hda rw console=ttyS0 console=tty $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
420 QEMUOPTIONS="$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE -M $MACHINE_SUBTYPE -hda $ROOTFS -no-reboot $QEMU_UI_OPTIONS" 420 QEMUOPTIONS="$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE -M $MACHINE_SUBTYPE -hda $ROOTFS -no-reboot $QEMU_UI_OPTIONS"
421 fi 421 fi
@@ -434,7 +434,7 @@ if [ "$MACHINE" = "qemush4" ]; then
434 QEMU=qemu-system-sh4 434 QEMU=qemu-system-sh4
435 MACHINE_SUBTYPE=r2d 435 MACHINE_SUBTYPE=r2d
436 QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS" 436 QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS"
437 if [ "$FSTYPE" = "ext3" -o "$FSTYPE" = "btrfs" ]; then 437 if [ "${FSTYPE:0:3}" = "ext" -o "$FSTYPE" = "btrfs" ]; then
438 #KERNCMDLINE="root=/dev/hda console=ttyS0 console=tty0 $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" 438 #KERNCMDLINE="root=/dev/hda console=ttyS0 console=tty0 $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
439 KERNCMDLINE="root=/dev/hda rw console=ttySC1 noiotrap earlyprintk=sh-sci.1 console=tty $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" 439 KERNCMDLINE="root=/dev/hda rw console=ttySC1 noiotrap earlyprintk=sh-sci.1 console=tty $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
440 QEMUOPTIONS="$QEMU_NETWORK_CMD -M $MACHINE_SUBTYPE -hda $ROOTFS -no-reboot $QEMU_UI_OPTIONS -monitor null -serial vc -serial stdio" 440 QEMUOPTIONS="$QEMU_NETWORK_CMD -M $MACHINE_SUBTYPE -hda $ROOTFS -no-reboot $QEMU_UI_OPTIONS -monitor null -serial vc -serial stdio"