runqemu-internal: cleanup unsed code
* remove akita and spitz related code They are not supported by runqemu anymore: $ runqemu spitz Error: unable to classify arg [spitz] So remove related code. * Remove checking of 256M for qemuarm, qemu can check it, for example: $ runqemu qemuarm qemuparams="-m 1024" [snip] qemu: Too much memory for this machine: 1024 MB, maximum 256 MB [snip] (From OE-Core rev: 36fb785bf8cd2f387c91d52f597602a5dbc3948b) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
e469bb722e
commit
fae732f24e
|
@ -350,12 +350,6 @@ QEMUMICROBLAZE_DEFAULT_FSTYPE=cpio
|
||||||
QEMUZYNQ_DEFAULT_KERNEL=uImage
|
QEMUZYNQ_DEFAULT_KERNEL=uImage
|
||||||
QEMUZYNQ_DEFAULT_FSTYPE=cpio
|
QEMUZYNQ_DEFAULT_FSTYPE=cpio
|
||||||
|
|
||||||
AKITA_DEFAULT_KERNEL=zImage-akita.bin
|
|
||||||
AKITA_DEFAULT_FSTYPE=jffs2
|
|
||||||
|
|
||||||
SPITZ_DEFAULT_KERNEL=zImage-spitz.bin
|
|
||||||
SPITZ_DEFAULT_FSTYPE=ext3
|
|
||||||
|
|
||||||
setup_path_vars() {
|
setup_path_vars() {
|
||||||
if [ -z "$OE_TMPDIR" ] ; then
|
if [ -z "$OE_TMPDIR" ] ; then
|
||||||
PATHS_REQUIRED=true
|
PATHS_REQUIRED=true
|
||||||
|
|
|
@ -77,23 +77,12 @@ fi
|
||||||
# QEMU_MEMORY has 'M' appended to mem_size
|
# QEMU_MEMORY has 'M' appended to mem_size
|
||||||
QEMU_MEMORY="$mem_size"M
|
QEMU_MEMORY="$mem_size"M
|
||||||
|
|
||||||
# Bug 433: qemuarm cannot use > 256 MB RAM
|
|
||||||
if [ "$MACHINE" = "qemuarm" ]; then
|
|
||||||
if [ -z "$mem_size" -o $mem_size -gt 256 ]; then
|
|
||||||
echo "WARNING: qemuarm does not support > 256M of RAM."
|
|
||||||
echo "Changing QEMU_MEMORY to default of 256M."
|
|
||||||
QEMU_MEMORY="256M"
|
|
||||||
mem_size="256"
|
|
||||||
SCRIPT_QEMU_EXTRA_OPT=`echo $SCRIPT_QEMU_EXTRA_OPT | sed -e "s/$mem_set/-m 256/" `
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# We need to specify -m <mem_size> to overcome a bug in qemu 0.14.0
|
# We need to specify -m <mem_size> to overcome a bug in qemu 0.14.0
|
||||||
# https://bugs.launchpad.net/ubuntu/+source/qemu-kvm/+bug/584480
|
# https://bugs.launchpad.net/ubuntu/+source/qemu-kvm/+bug/584480
|
||||||
|
|
||||||
if [ -z "$mem_set" ] ; then
|
if [ -z "$mem_set" ] ; then
|
||||||
SCRIPT_QEMU_EXTRA_OPT="$SCRIPT_QEMU_EXTRA_OPT -m $mem_size"
|
SCRIPT_QEMU_EXTRA_OPT="$SCRIPT_QEMU_EXTRA_OPT -m $mem_size"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# This file is created when runqemu-gen-tapdevs creates a bank of tap
|
# This file is created when runqemu-gen-tapdevs creates a bank of tap
|
||||||
# devices, indicating that the user should not bring up new ones using
|
# devices, indicating that the user should not bring up new ones using
|
||||||
# sudo.
|
# sudo.
|
||||||
|
@ -292,8 +281,6 @@ case "$MACHINE" in
|
||||||
"qemux86") ;;
|
"qemux86") ;;
|
||||||
"qemux86-64") ;;
|
"qemux86-64") ;;
|
||||||
"qemuzynq") ;;
|
"qemuzynq") ;;
|
||||||
"akita") ;;
|
|
||||||
"spitz") ;;
|
|
||||||
*)
|
*)
|
||||||
echo "Error: Unsupported machine type $MACHINE"
|
echo "Error: Unsupported machine type $MACHINE"
|
||||||
return 1
|
return 1
|
||||||
|
@ -472,20 +459,6 @@ if [ "$MACHINE" = "qemux86-64" ]; then
|
||||||
KERNCMDLINE="$KERNCMDLINE oprofile.timer=1"
|
KERNCMDLINE="$KERNCMDLINE oprofile.timer=1"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$MACHINE" = "spitz" ]; then
|
|
||||||
QEMU=qemu-system-arm
|
|
||||||
if [ "${FSTYPE:0:3}" = "ext" -o "$FSTYPE" = "btrfs" ]; then
|
|
||||||
echo $ROOTFS
|
|
||||||
ROOTFS=`readlink -f $ROOTFS`
|
|
||||||
echo $ROOTFS
|
|
||||||
if [ ! -e "$ROOTFS.qemudisk" ]; then
|
|
||||||
echo "Adding a partition table to the ext3 image for use by QEMU, please wait..."
|
|
||||||
runqemu-addptable2image $ROOTFS $ROOTFS.qemudisk
|
|
||||||
fi
|
|
||||||
QEMUOPTIONS="$QEMU_NETWORK_CMD -M spitz -hda $ROOTFS.qemudisk -portrait"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$MACHINE" = "qemumips" -o "$MACHINE" = "qemumipsel" -o "$MACHINE" = "qemumips64" ]; then
|
if [ "$MACHINE" = "qemumips" -o "$MACHINE" = "qemumipsel" -o "$MACHINE" = "qemumips64" ]; then
|
||||||
case "$MACHINE" in
|
case "$MACHINE" in
|
||||||
qemumips) QEMU=qemu-system-mips ;;
|
qemumips) QEMU=qemu-system-mips ;;
|
||||||
|
@ -561,18 +534,6 @@ if [ "${FSTYPE:0:3}" = "ext" ]; then
|
||||||
KERNCMDLINE="$KERNCMDLINE rootfstype=$FSTYPE"
|
KERNCMDLINE="$KERNCMDLINE rootfstype=$FSTYPE"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$MACHINE" = "akita" ]; then
|
|
||||||
QEMU=qemu-system-arm
|
|
||||||
if [ "$FSTYPE" = "jffs2" ]; then
|
|
||||||
ROOTFS=`readlink -f $ROOTFS`
|
|
||||||
if [ ! -e "$ROOTFS.qemuflash" ]; then
|
|
||||||
echo "Converting raw image into flash image format for use by QEMU, please wait..."
|
|
||||||
raw2flash.akita < $ROOTFS > $ROOTFS.qemuflash
|
|
||||||
fi
|
|
||||||
QEMUOPTIONS="$QEMU_NETWORK_CMD -M akita -mtdblock $ROOTFS.qemuflash -portrait"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$MACHINE" = "qemumicroblaze" ]; then
|
if [ "$MACHINE" = "qemumicroblaze" ]; then
|
||||||
QEMU=qemu-system-microblazeel
|
QEMU=qemu-system-microblazeel
|
||||||
QEMU_SYSTEM_OPTIONS="$QEMU_NETWORK_CMD -M petalogix-ml605 -serial mon:stdio"
|
QEMU_SYSTEM_OPTIONS="$QEMU_NETWORK_CMD -M petalogix-ml605 -serial mon:stdio"
|
||||||
|
|
Loading…
Reference in New Issue