aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYong-iL Joh <yong-il.joh@windriver.com>2015-10-15 21:01:53 +0900
committerYong-iL Joh <yong-il.joh@windriver.com>2015-11-10 20:52:52 +0900
commit4b4f5b0cd36ebc778e7ea63ddfbd8ac266613281 (patch)
tree19968a896cff0d4457b3deedfac0fab8c00a988f
parenteaa9ea93dc58c76170e8214add950c63a0c125bb (diff)
downloadmeta-ivi-4b4f5b0cd36ebc778e7ea63ddfbd8ac266613281.tar.gz
meta-ivi-4b4f5b0cd36ebc778e7ea63ddfbd8ac266613281.tar.bz2
meta-ivi-4b4f5b0cd36ebc778e7ea63ddfbd8ac266613281.zip
runqemu: remove workaround for vexpressa9
Signed-off-by: Yong-iL Joh <yong-il.joh@windriver.com>
-rwxr-xr-xscripts/runqemu3
-rwxr-xr-xscripts/runqemu-internal15
2 files changed, 10 insertions, 8 deletions
diff --git a/scripts/runqemu b/scripts/runqemu
index fe4a720..9fc295a 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -306,7 +306,7 @@ QEMUARM_DEFAULT_KERNEL=zImage-qemuarm.bin
QEMUARM_DEFAULT_FSTYPE=ext4
VEXPRESSA9_DEFAULT_KERNEL=zImage-vexpressa9.bin
-VEXPRESSA9_DEFAULT_FSTYPE=tar.bz2
+VEXPRESSA9_DEFAULT_FSTYPE=ext3
QEMUARM64_DEFAULT_KERNEL=Image-qemuarm64.bin
QEMUARM64_DEFAULT_FSTYPE=ext4
@@ -462,7 +462,6 @@ fi
if [ "$LAZY_ROOTFS" = "true" ]; then
setup_path_vars 1
echo "Assuming $ROOTFS really means $DEPLOY_DIR_IMAGE/$ROOTFS-$MACHINE.$FSTYPE"
- IMGNAME=$DEPLOY_DIR_IMAGE/$ROOTFS-$MACHINE.ext3
ROOTFS=$DEPLOY_DIR_IMAGE/$ROOTFS-$MACHINE.$FSTYPE
fi
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index c0c37d1..d021442 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -365,12 +365,15 @@ if [ "$MACHINE" = "qemuarm" -o "$MACHINE" = "qemuarmv6" -o "$MACHINE" = "qemuarm
QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS"
# QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -force-pointer"
if [ "${FSTYPE:0:3}" = "ext" -o "$FSTYPE" = "btrfs" ]; then
- KERNCMDLINE="root=/dev/sda rw console=ttyAMA0,115200 console=tty $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY highres=off"
- QEMUOPTIONS="$QEMU_NETWORK_CMD -M ${MACHINE_SUBTYPE} -hda $ROOTFS -no-reboot $QEMU_UI_OPTIONS"
- elif [ "$FSTYPE" = "tar.bz2" ]; then
- KERNCMDLINE="root=/dev/mmcblk0 rw console=ttyAMA0,38400n8 console=tty0 $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY raid=noautodetect vmalloc=256MB rootwait devtmpfs.mount=0"
- QEMUOPTIONS="$QEMU_NETWORK_CMD -M ${MACHINE_SUBTYPE} -sd $IMGNAME $QEMU_UI_OPTIONS -cpu cortex-a9"
-#/storage/src/CCCP/genivi-baseline_pre9.0/build/tmp/sysroots/x86_64-linux/usr/bin/qemu-system-arm -kernel /storage/src/CCCP/genivi-baseline_pre9.0/build/tmp/deploy/images/vexpressa9/zImage-vexpressa9.bin -net nic,vlan=0 -net tap,vlan=0,ifname=tap0,script=no,downscript=no -M vexpress-a9 -cpu cortex-a9 -sd /storage/src/CCCP/genivi-baseline_pre9.0/build/tmp/deploy/images/vexpressa9/kronos-image-vexpressa9-20150916072634.rootfs.tar.bz2 -no-reboot -m 1024 --append "root=/dev/mmcblk0 rw mem=1024M raid=noautodetect console=tty0 console=ttyAMA0,38400n8 rootwait vmalloc=256MB devtmpfs.mount=0 "
+ if [ "$MACHINE" = "vexpressa9" ]; then
+ KERN_root="root=/dev/mmcblk0 vmalloc=384MB"
+ QEMU_root="-sd $ROOTFS"
+ else
+ KERN_root="root=/dev/sda"
+ QEMU_root="-hda $ROOTFS"
+ fi
+ KERNCMDLINE="${KERN_root} rw console=ttyAMA0,115200 console=tty $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY highres=off"
+ QEMUOPTIONS="$QEMU_NETWORK_CMD -M ${MACHINE_SUBTYPE} ${QEMU_root} -no-reboot $QEMU_UI_OPTIONS"
elif [ "$FSTYPE" = "nfs" ]; then
if [ "$NFS_SERVER" = "192.168.7.1" -a ! -d "$NFS_DIR" ]; then
echo "Error: NFS mount point $ROOTFS doesn't exist"