summaryrefslogtreecommitdiffstats
path: root/scripts/runqemu-internal
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2016-03-02 19:37:45 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-25 10:29:14 +0000
commitfae732f24e965e80d414b5cd63ff5d33d8dfcd60 (patch)
tree0db31b176d1b8d34b051a4097418ac2e7a6ad8ef /scripts/runqemu-internal
parente469bb722e89d4246aa908660b22f79b8a7f1041 (diff)
downloadpoky-fae732f24e965e80d414b5cd63ff5d33d8dfcd60.tar.gz
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>
Diffstat (limited to 'scripts/runqemu-internal')
-rwxr-xr-xscripts/runqemu-internal41
1 files changed, 1 insertions, 40 deletions
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index 6fa93c9d07..7ae077766c 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -77,23 +77,12 @@ fi
77# QEMU_MEMORY has 'M' appended to mem_size 77# QEMU_MEMORY has 'M' appended to mem_size
78QEMU_MEMORY="$mem_size"M 78QEMU_MEMORY="$mem_size"M
79 79
80# Bug 433: qemuarm cannot use > 256 MB RAM
81if [ "$MACHINE" = "qemuarm" ]; then
82 if [ -z "$mem_size" -o $mem_size -gt 256 ]; then
83 echo "WARNING: qemuarm does not support > 256M of RAM."
84 echo "Changing QEMU_MEMORY to default of 256M."
85 QEMU_MEMORY="256M"
86 mem_size="256"
87 SCRIPT_QEMU_EXTRA_OPT=`echo $SCRIPT_QEMU_EXTRA_OPT | sed -e "s/$mem_set/-m 256/" `
88 fi
89fi
90
91# We need to specify -m <mem_size> to overcome a bug in qemu 0.14.0 80# We need to specify -m <mem_size> to overcome a bug in qemu 0.14.0
92# https://bugs.launchpad.net/ubuntu/+source/qemu-kvm/+bug/584480 81# https://bugs.launchpad.net/ubuntu/+source/qemu-kvm/+bug/584480
93
94if [ -z "$mem_set" ] ; then 82if [ -z "$mem_set" ] ; then
95 SCRIPT_QEMU_EXTRA_OPT="$SCRIPT_QEMU_EXTRA_OPT -m $mem_size" 83 SCRIPT_QEMU_EXTRA_OPT="$SCRIPT_QEMU_EXTRA_OPT -m $mem_size"
96fi 84fi
85
97# This file is created when runqemu-gen-tapdevs creates a bank of tap 86# This file is created when runqemu-gen-tapdevs creates a bank of tap
98# devices, indicating that the user should not bring up new ones using 87# devices, indicating that the user should not bring up new ones using
99# sudo. 88# sudo.
@@ -292,8 +281,6 @@ case "$MACHINE" in
292 "qemux86") ;; 281 "qemux86") ;;
293 "qemux86-64") ;; 282 "qemux86-64") ;;
294 "qemuzynq") ;; 283 "qemuzynq") ;;
295 "akita") ;;
296 "spitz") ;;
297 *) 284 *)
298 echo "Error: Unsupported machine type $MACHINE" 285 echo "Error: Unsupported machine type $MACHINE"
299 return 1 286 return 1
@@ -472,20 +459,6 @@ if [ "$MACHINE" = "qemux86-64" ]; then
472 KERNCMDLINE="$KERNCMDLINE oprofile.timer=1" 459 KERNCMDLINE="$KERNCMDLINE oprofile.timer=1"
473fi 460fi
474 461
475if [ "$MACHINE" = "spitz" ]; then
476 QEMU=qemu-system-arm
477 if [ "${FSTYPE:0:3}" = "ext" -o "$FSTYPE" = "btrfs" ]; then
478 echo $ROOTFS
479 ROOTFS=`readlink -f $ROOTFS`
480 echo $ROOTFS
481 if [ ! -e "$ROOTFS.qemudisk" ]; then
482 echo "Adding a partition table to the ext3 image for use by QEMU, please wait..."
483 runqemu-addptable2image $ROOTFS $ROOTFS.qemudisk
484 fi
485 QEMUOPTIONS="$QEMU_NETWORK_CMD -M spitz -hda $ROOTFS.qemudisk -portrait"
486 fi
487fi
488
489if [ "$MACHINE" = "qemumips" -o "$MACHINE" = "qemumipsel" -o "$MACHINE" = "qemumips64" ]; then 462if [ "$MACHINE" = "qemumips" -o "$MACHINE" = "qemumipsel" -o "$MACHINE" = "qemumips64" ]; then
490 case "$MACHINE" in 463 case "$MACHINE" in
491 qemumips) QEMU=qemu-system-mips ;; 464 qemumips) QEMU=qemu-system-mips ;;
@@ -561,18 +534,6 @@ if [ "${FSTYPE:0:3}" = "ext" ]; then
561 KERNCMDLINE="$KERNCMDLINE rootfstype=$FSTYPE" 534 KERNCMDLINE="$KERNCMDLINE rootfstype=$FSTYPE"
562fi 535fi
563 536
564if [ "$MACHINE" = "akita" ]; then
565 QEMU=qemu-system-arm
566 if [ "$FSTYPE" = "jffs2" ]; then
567 ROOTFS=`readlink -f $ROOTFS`
568 if [ ! -e "$ROOTFS.qemuflash" ]; then
569 echo "Converting raw image into flash image format for use by QEMU, please wait..."
570 raw2flash.akita < $ROOTFS > $ROOTFS.qemuflash
571 fi
572 QEMUOPTIONS="$QEMU_NETWORK_CMD -M akita -mtdblock $ROOTFS.qemuflash -portrait"
573 fi
574fi
575
576if [ "$MACHINE" = "qemumicroblaze" ]; then 537if [ "$MACHINE" = "qemumicroblaze" ]; then
577 QEMU=qemu-system-microblazeel 538 QEMU=qemu-system-microblazeel
578 QEMU_SYSTEM_OPTIONS="$QEMU_NETWORK_CMD -M petalogix-ml605 -serial mon:stdio" 539 QEMU_SYSTEM_OPTIONS="$QEMU_NETWORK_CMD -M petalogix-ml605 -serial mon:stdio"