summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-19 11:33:30 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-20 11:03:50 +0000
commitfd2823d13b2d2e6436be895bd6034c185225edb6 (patch)
tree2b87104a533775b8eed18e99186b4ae8e614e7ea
parentb8107c5991218a26fb4d27cefcb7b27ce87156a9 (diff)
downloadpoky-fd2823d13b2d2e6436be895bd6034c185225edb6.tar.gz
runqemu-internal: Add cpio support for qemux86 so that we can boot poky-tiny images
poky-tiny generates cpio.gz images, add support for these so we can boot them using runqemu. (From OE-Core rev: fdd2e0c1baa80106d26236cb734e0d9a98e3fdac) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xscripts/runqemu-internal5
1 files changed, 5 insertions, 0 deletions
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index 6594dc33ec..2db55660ce 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -408,6 +408,11 @@ if [ "$MACHINE" = "qemux86" ]; then
408 KERNCMDLINE="vga=0 uvesafb.mode_option=640x480-32 root=$DROOT rw mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD" 408 KERNCMDLINE="vga=0 uvesafb.mode_option=640x480-32 root=$DROOT rw mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD"
409 QEMUOPTIONS="$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE $ROOTFS_OPTIONS $QEMU_UI_OPTIONS" 409 QEMUOPTIONS="$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE $ROOTFS_OPTIONS $QEMU_UI_OPTIONS"
410 fi 410 fi
411 if [ "${FSTYPE:0:4}" = "cpio" ]; then
412 KERNCMDLINE="vga=0 uvesafb.mode_option=640x480-32 root=/dev/ram0 rw mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD"
413 QEMUOPTIONS="$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE -initrd $ROOTFS $QEMU_UI_OPTIONS"
414 fi
415
411 if [ "$FSTYPE" = "nfs" ]; then 416 if [ "$FSTYPE" = "nfs" ]; then
412 if [ "$NFS_SERVER" = "192.168.7.1" -a ! -d "$NFS_DIR" ]; then 417 if [ "$NFS_SERVER" = "192.168.7.1" -a ! -d "$NFS_DIR" ]; then
413 echo "Error: NFS mount point $ROOTFS doesn't exist." 418 echo "Error: NFS mount point $ROOTFS doesn't exist."