summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorScott Garman <scott.a.garman@intel.com>2012-08-13 20:20:38 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-17 17:04:20 (GMT)
commit5bffd94316d9e6d49afea001c6f0a1d09624379a (patch)
tree9b7958ba5bad675790267a07cd2a1f5fdfefd3f8 /scripts
parenta102793b1583d9d385a8f01ae89f2235531e6c83 (diff)
downloadpoky-5bffd94316d9e6d49afea001c6f0a1d09624379a.tar.gz
runqemu: support booting ramfs-based images
Added support for booting ramfs-based images (e.g, poky-tiny) which do not have block device support. This fixes [YOCTO #2612]. (From OE-Core rev: b09c45f017da71ff966004752f8e926ea00ac451) Signed-off-by: Scott Garman <scott.a.garman@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/runqemu6
-rwxr-xr-xscripts/runqemu-internal5
2 files changed, 11 insertions, 0 deletions
diff --git a/scripts/runqemu b/scripts/runqemu
index 7454dd4..7e4bcc4 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -26,6 +26,7 @@ usage() {
26 echo " KERNEL - the kernel image file to use" 26 echo " KERNEL - the kernel image file to use"
27 echo " ROOTFS - the rootfs image file or nfsroot directory to use" 27 echo " ROOTFS - the rootfs image file or nfsroot directory to use"
28 echo " MACHINE - the machine name (optional, autodetected from KERNEL filename if unspecified)" 28 echo " MACHINE - the machine name (optional, autodetected from KERNEL filename if unspecified)"
29 echo " RAMFS - boot a ramfs-based image"
29 echo " Simplified QEMU command-line options can be passed with:" 30 echo " Simplified QEMU command-line options can be passed with:"
30 echo " nographic - disables video console" 31 echo " nographic - disables video console"
31 echo " serial - enables a serial console on /dev/ttyS0" 32 echo " serial - enables a serial console on /dev/ttyS0"
@@ -37,6 +38,7 @@ usage() {
37 echo " $MYNAME qemuarm" 38 echo " $MYNAME qemuarm"
38 echo " $MYNAME qemux86-64 core-image-sato ext3" 39 echo " $MYNAME qemux86-64 core-image-sato ext3"
39 echo " $MYNAME path/to/bzImage-qemux86.bin path/to/nfsrootdir/ serial" 40 echo " $MYNAME path/to/bzImage-qemux86.bin path/to/nfsrootdir/ serial"
41 echo " $MYNAME qemux86 ramfs"
40 echo " $MYNAME qemux86 qemuparams=\"-m 256\"" 42 echo " $MYNAME qemux86 qemuparams=\"-m 256\""
41 echo " $MYNAME qemux86 bootparams=\"psplash=false\"" 43 echo " $MYNAME qemux86 bootparams=\"psplash=false\""
42 exit 1 44 exit 1
@@ -118,6 +120,10 @@ while true; do
118 LAZY_ROOTFS="true" 120 LAZY_ROOTFS="true"
119 fi 121 fi
120 ;; 122 ;;
123 "ramfs")
124 FSTYPE=cpio.gz
125 RAMFS=true
126 ;;
121 "nographic") 127 "nographic")
122 SCRIPT_QEMU_OPT="$SCRIPT_QEMU_OPT -nographic" 128 SCRIPT_QEMU_OPT="$SCRIPT_QEMU_OPT -nographic"
123 SCRIPT_KERNEL_OPT="$SCRIPT_KERNEL_OPT console=ttyS0" 129 SCRIPT_KERNEL_OPT="$SCRIPT_KERNEL_OPT console=ttyS0"
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index eeadb24..0d4f4a1 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -453,6 +453,11 @@ if [ "$MACHINE" = "akita" ]; then
453 fi 453 fi
454fi 454fi
455 455
456if [ "x$RAMFS" = "xtrue" ]; then
457 QEMUOPTIONS="-initrd $ROOTFS -nographic"
458 KERNCMDLINE="root=/dev/ram0"
459fi
460
456if [ "x$QEMUOPTIONS" = "x" ]; then 461if [ "x$QEMUOPTIONS" = "x" ]; then
457 echo "Error: Unable to support this combination of options" 462 echo "Error: Unable to support this combination of options"
458 cleanup 463 cleanup