summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2011-03-17 11:24:39 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-03-23 15:43:58 +0000
commit112f153a6059e761dcc016fd68e4fe5f7ffdac8c (patch)
tree65287534da99232f7663656238b11651f4d43403
parent3b0fa0f9f62e0b155968a2bda7dcf4962acb8d16 (diff)
downloadpoky-112f153a6059e761dcc016fd68e4fe5f7ffdac8c.tar.gz
scripts/poky-qemu-internal: Add rw to KERNCMDLINE for non nfs boots as well
Without using rw the ext3 images boot the kernel but do not spawn the console at the end (From OE-Core rev: 44359c953a6205a5028483e22b81e9d1691bfd44) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xscripts/poky-qemu-internal10
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/poky-qemu-internal b/scripts/poky-qemu-internal
index 067c909085..8fd1834ca8 100755
--- a/scripts/poky-qemu-internal
+++ b/scripts/poky-qemu-internal
@@ -275,7 +275,7 @@ if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "qemuarmv6" -o "$MACHINE" = "qemuarm
275 QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS" 275 QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS"
276 # QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -force-pointer" 276 # QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -force-pointer"
277 if [ "$FSTYPE" = "ext3" ]; then 277 if [ "$FSTYPE" = "ext3" ]; then
278 KERNCMDLINE="root=/dev/sda console=ttyAMA0,115200 console=tty $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY highres=off" 278 KERNCMDLINE="root=/dev/sda rw console=ttyAMA0,115200 console=tty $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY highres=off"
279 QEMUOPTIONS="$QEMU_NETWORK_CMD -M versatilepb -hda $ROOTFS -no-reboot $QEMU_UI_OPTIONS" 279 QEMUOPTIONS="$QEMU_NETWORK_CMD -M versatilepb -hda $ROOTFS -no-reboot $QEMU_UI_OPTIONS"
280 fi 280 fi
281 if [ "$FSTYPE" = "nfs" ]; then 281 if [ "$FSTYPE" = "nfs" ]; then
@@ -299,7 +299,7 @@ if [ "$MACHINE" = "qemux86" ]; then
299 QEMU=qemu 299 QEMU=qemu
300 QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -vga vmware -enable-gl" 300 QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -vga vmware -enable-gl"
301 if [ "$FSTYPE" = "ext3" ]; then 301 if [ "$FSTYPE" = "ext3" ]; then
302 KERNCMDLINE="vga=0 root=/dev/hda mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD" 302 KERNCMDLINE="vga=0 root=/dev/hda rw mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD"
303 QEMUOPTIONS="$QEMU_NETWORK_CMD -hda $ROOTFS $QEMU_UI_OPTIONS" 303 QEMUOPTIONS="$QEMU_NETWORK_CMD -hda $ROOTFS $QEMU_UI_OPTIONS"
304 fi 304 fi
305 if [ "$FSTYPE" = "nfs" ]; then 305 if [ "$FSTYPE" = "nfs" ]; then
@@ -320,7 +320,7 @@ if [ "$MACHINE" = "qemux86-64" ]; then
320 QEMU=qemu-system-x86_64 320 QEMU=qemu-system-x86_64
321 QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -vga vmware -enable-gl" 321 QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -vga vmware -enable-gl"
322 if [ "$FSTYPE" = "ext3" ]; then 322 if [ "$FSTYPE" = "ext3" ]; then
323 KERNCMDLINE="vga=0 root=/dev/hda mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD" 323 KERNCMDLINE="vga=0 root=/dev/hda rw mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD"
324 QEMUOPTIONS="$QEMU_NETWORK_CMD -hda $ROOTFS $QEMU_UI_OPTIONS" 324 QEMUOPTIONS="$QEMU_NETWORK_CMD -hda $ROOTFS $QEMU_UI_OPTIONS"
325 fi 325 fi
326 if [ "$FSTYPE" = "nfs" ]; then 326 if [ "$FSTYPE" = "nfs" ]; then
@@ -360,7 +360,7 @@ if [ "$MACHINE" = "qemumips" ]; then
360 QEMU_UI_OPTIONS="-vga cirrus $QEMU_UI_OPTIONS" 360 QEMU_UI_OPTIONS="-vga cirrus $QEMU_UI_OPTIONS"
361 if [ "$FSTYPE" = "ext3" ]; then 361 if [ "$FSTYPE" = "ext3" ]; then
362 #KERNCMDLINE="root=/dev/hda console=ttyS0 console=tty0 $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" 362 #KERNCMDLINE="root=/dev/hda console=ttyS0 console=tty0 $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
363 KERNCMDLINE="root=/dev/hda console=ttyS0 console=tty $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" 363 KERNCMDLINE="root=/dev/hda rw console=ttyS0 console=tty $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
364 QEMUOPTIONS="$QEMU_NETWORK_CMD -M $MACHINE_SUBTYPE -hda $ROOTFS -no-reboot $QEMU_UI_OPTIONS" 364 QEMUOPTIONS="$QEMU_NETWORK_CMD -M $MACHINE_SUBTYPE -hda $ROOTFS -no-reboot $QEMU_UI_OPTIONS"
365 fi 365 fi
366 if [ "$FSTYPE" = "nfs" ]; then 366 if [ "$FSTYPE" = "nfs" ]; then
@@ -381,7 +381,7 @@ if [ "$MACHINE" = "qemuppc" ]; then
381 BIOS=powerpc_rom.bin 381 BIOS=powerpc_rom.bin
382 QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -nographic" 382 QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -nographic"
383 if [ "$FSTYPE" = "ext3" ]; then 383 if [ "$FSTYPE" = "ext3" ]; then
384 KERNCMDLINE="root=/dev/hda console=ttyS0 console=tty0 $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" 384 KERNCMDLINE="root=/dev/hda rw console=ttyS0 console=tty0 $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
385 QEMUOPTIONS="$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE -M $MACHINE_SUBTYPE -bios $BIOS -hda $ROOTFS -no-reboot $QEMU_UI_OPTIONS" 385 QEMUOPTIONS="$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE -M $MACHINE_SUBTYPE -bios $BIOS -hda $ROOTFS -no-reboot $QEMU_UI_OPTIONS"
386 fi 386 fi
387 if [ "$FSTYPE" = "nfs" ]; then 387 if [ "$FSTYPE" = "nfs" ]; then