sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

runqemu: simplify checking for iso and ramfs 

(From OE-Core rev: 69a1fca4374797dea56035ce56a17441a2ca9280)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Robert Yang 2016-03-02 17:50:05 -08:00 committed by Richard Purdie
parent 3610329929
commit e469bb722e
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/runqemu
View File

@ -125,7 +125,7 @@ while true; do
[ -z "$MACHINE" -o "$MACHINE" = "$arg" ] && MACHINE=$arg || \
error "conflicting MACHINE types [$MACHINE] and [$arg]"
;;
"ext"[234] | "jffs2" | "nfs" | "btrfs")
"ext"[234] | "jffs2" | "nfs" | "btrfs" | "iso")
check_fstype_conflicts $arg
;;
"hddimg" | "hdddirect" | "wic" | "vmdk" | "qcow2" | "vdi")
@ -134,12 +134,7 @@ while true; do
;;
"ramfs")
FSTYPE=cpio.gz
RAMFS=true
;;
"iso")
FSTYPE=iso
ISOFS=true
;;
"nographic")
SCRIPT_QEMU_OPT="$SCRIPT_QEMU_OPT -nographic"
SCRIPT_KERNEL_OPT="$SCRIPT_KERNEL_OPT console=ttyS0"

4
scripts/runqemu-internal
View File

@ -593,12 +593,12 @@ if [ "$MACHINE" = "qemuzynq" ]; then
fi
fi
if [ "x$RAMFS" = "xtrue" ]; then
if [ "$FSTYPE" = "cpio.gz" ]; then
QEMUOPTIONS="-initrd $ROOTFS -nographic"
KERNCMDLINE="root=/dev/ram0 console=ttyS0 debugshell"
fi
if [ "x$ISOFS" = "xtrue" ]; then
if [ "$FSTYPE" = "iso" ]; then
QEMUOPTIONS="$QEMU_NETWORK_CMD -cdrom $ROOTFS $QEMU_UI_OPTIONS"
fi