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>
This commit is contained in:
parent
bc02e97db7
commit
2c2dd5be3e
|
@ -299,7 +299,7 @@ if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "qemuarmv6" -o "$MACHINE" = "qemuarm
|
|||
export QEMU_AUDIO_DRV="none"
|
||||
QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS"
|
||||
# QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -force-pointer"
|
||||
if [ "$FSTYPE" = "ext3" -o "$FSTYPE" = "btrfs" ]; then
|
||||
if [ "${FSTYPE:0:3}" = "ext" -o "$FSTYPE" = "btrfs" ]; then
|
||||
KERNCMDLINE="root=/dev/sda rw console=ttyAMA0,115200 console=tty $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY highres=off"
|
||||
QEMUOPTIONS="$QEMU_NETWORK_CMD -M ${MACHINE_SUBTYPE} -hda $ROOTFS -no-reboot $QEMU_UI_OPTIONS"
|
||||
fi
|
||||
|
@ -323,7 +323,7 @@ fi
|
|||
if [ "$MACHINE" = "qemux86" ]; then
|
||||
QEMU=qemu-system-i386
|
||||
QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -vga vmware"
|
||||
if [ "$FSTYPE" = "ext2" -o "$FSTYPE" = "ext3" -o "$FSTYPE" = "btrfs" ]; then
|
||||
if [ "${FSTYPE:0:3}" = "ext" -o "$FSTYPE" = "btrfs" ]; then
|
||||
KERNCMDLINE="vga=0 uvesafb.mode_option=640x480-32 root=$DROOT rw mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD"
|
||||
QEMUOPTIONS="$QEMU_NETWORK_CMD $ROOTFS_OPTIONS $QEMU_UI_OPTIONS"
|
||||
fi
|
||||
|
@ -347,7 +347,7 @@ fi
|
|||
if [ "$MACHINE" = "qemux86-64" ]; then
|
||||
QEMU=qemu-system-x86_64
|
||||
QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -vga vmware"
|
||||
if [ "$FSTYPE" = "ext3" -o "$FSTYPE" = "btrfs" ]; then
|
||||
if [ "${FSTYPE:0:3}" = "ext" -o "$FSTYPE" = "btrfs" ]; then
|
||||
KERNCMDLINE="vga=0 uvesafb.mode_option=640x480-32 root=$DROOT rw mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD"
|
||||
QEMUOPTIONS="$QEMU_NETWORK_CMD $ROOTFS_OPTIONS $QEMU_UI_OPTIONS"
|
||||
fi
|
||||
|
@ -373,7 +373,7 @@ fi
|
|||
|
||||
if [ "$MACHINE" = "spitz" ]; then
|
||||
QEMU=qemu-system-arm
|
||||
if [ "$FSTYPE" = "ext3" -o "$FSTYPE" = "btrfs" ]; then
|
||||
if [ "${FSTYPE:0:3}" = "ext" -o "$FSTYPE" = "btrfs" ]; then
|
||||
echo $ROOTFS
|
||||
ROOTFS=`readlink -f $ROOTFS`
|
||||
echo $ROOTFS
|
||||
|
@ -393,7 +393,7 @@ if [ "$MACHINE" = "qemumips" -o "$MACHINE" = "qemumipsel" -o "$MACHINE" = "qemum
|
|||
esac
|
||||
MACHINE_SUBTYPE=malta
|
||||
QEMU_UI_OPTIONS="-vga cirrus $QEMU_UI_OPTIONS"
|
||||
if [ "$FSTYPE" = "ext3" -o "$FSTYPE" = "btrfs" ]; then
|
||||
if [ "${FSTYPE:0:3}" = "ext" -o "$FSTYPE" = "btrfs" ]; then
|
||||
#KERNCMDLINE="root=/dev/hda console=ttyS0 console=tty0 $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
|
||||
KERNCMDLINE="root=/dev/hda rw console=ttyS0 console=tty $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
|
||||
QEMUOPTIONS="$QEMU_NETWORK_CMD -M $MACHINE_SUBTYPE -hda $ROOTFS -no-reboot $QEMU_UI_OPTIONS"
|
||||
|
@ -415,7 +415,7 @@ if [ "$MACHINE" = "qemuppc" ]; then
|
|||
CPU_SUBTYPE=G4
|
||||
QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS"
|
||||
QEMU_NETWORK_CMD="-net nic,model=pcnet $QEMU_TAP_CMD"
|
||||
if [ "$FSTYPE" = "ext3" -o "$FSTYPE" = "btrfs" ]; then
|
||||
if [ "${FSTYPE:0:3}" = "ext" -o "$FSTYPE" = "btrfs" ]; then
|
||||
KERNCMDLINE="root=/dev/hda rw console=ttyS0 console=tty $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
|
||||
QEMUOPTIONS="$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE -M $MACHINE_SUBTYPE -hda $ROOTFS -no-reboot $QEMU_UI_OPTIONS"
|
||||
fi
|
||||
|
@ -434,7 +434,7 @@ if [ "$MACHINE" = "qemush4" ]; then
|
|||
QEMU=qemu-system-sh4
|
||||
MACHINE_SUBTYPE=r2d
|
||||
QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS"
|
||||
if [ "$FSTYPE" = "ext3" -o "$FSTYPE" = "btrfs" ]; then
|
||||
if [ "${FSTYPE:0:3}" = "ext" -o "$FSTYPE" = "btrfs" ]; then
|
||||
#KERNCMDLINE="root=/dev/hda console=ttyS0 console=tty0 $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
|
||||
KERNCMDLINE="root=/dev/hda rw console=ttySC1 noiotrap earlyprintk=sh-sci.1 console=tty $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
|
||||
QEMUOPTIONS="$QEMU_NETWORK_CMD -M $MACHINE_SUBTYPE -hda $ROOTFS -no-reboot $QEMU_UI_OPTIONS -monitor null -serial vc -serial stdio"
|
||||
|
|
Loading…
Reference in New Issue