<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Jun 16, 2015 at 12:37 PM, Joshua Lock <span dir="ltr"><<a href="mailto:joshua.lock@collabora.co.uk" target="_blank">joshua.lock@collabora.co.uk</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">On 15/06/15 17:56, Jagadeesh Krishnanjanappa wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Ping.<br>
</blockquote>
<br>
<br>
Is this change intended for fido or master? Usually fixes like this would go into master first and then be backported to the stable branch.<br><br></blockquote><div>The runqemu scripts of fido and master branch are almost at the same level, the patch should apply to both of them without any warnings. The intended change is for fido (and future versions) as it already has support for booting aarch64 qemu target.</div><div><br></div><div>Regards,</div><div>Jagadeesh</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><span class="">
Regards,<br>
Jagadeesh<br>
<br>
On Tue, Jun 9, 2015 at 10:18 AM, Jagadeesh Krishnanjanappa<br></span><span class="">
<<a href="mailto:jkrishnanjanappa@mvista.com" target="_blank">jkrishnanjanappa@mvista.com</a> <mailto:<a href="mailto:jkrishnanjanappa@mvista.com" target="_blank">jkrishnanjanappa@mvista.com</a>>> wrote:<br>
<br>
The other changes include,<br>
runqemu - fix MACHINE type being detected as qemuarm when qemuarm64<br>
kernel<br>
image name is given.<br>
<br>
runqemu-internal - Added console=ttyAMA0,115200 as one of the boot<br>
parameters<br>
for qemuarm, in order to print bootlog messages<br>
on the<br>
console.<br>
<br>
- Use "-nographic" option only if "serial" option<br>
is not<br>
specified. Otherwise we get below error when<br>
'runqemu <kernel_image> <rootfs_image> serial'<br>
is executed,<br>
<br>
(snip)<br>
QEMU 2.2.0 monitor - type 'help' for more information<br>
(qemu) qemu-system-aarch64: -serial stdio: cannot use stdio by<br>
multiple character devices<br>
-- CUT --<br>
<br>
qemuarm64 NFS booting has been tested successfully on Ubuntu 14.04 host.<br>
<br>
Signed-off-by: Jagadeesh Krishnanjanappa<br></span>
<<a href="mailto:jkrishnanjanappa@mvista.com" target="_blank">jkrishnanjanappa@mvista.com</a> <mailto:<a href="mailto:jkrishnanjanappa@mvista.com" target="_blank">jkrishnanjanappa@mvista.com</a>>><div><div class="h5"><br>
---<br>
scripts/runqemu | 4 ++--<br>
scripts/runqemu-internal | 20 +++++++++++++++-----<br>
2 files changed, 17 insertions(+), 7 deletions(-)<br>
<br>
diff --git a/scripts/runqemu b/scripts/runqemu<br>
index 84ece4d..09c507d 100755<br>
--- a/scripts/runqemu<br>
+++ b/scripts/runqemu<br>
@@ -232,13 +232,13 @@ fi<br>
<br>
if [ -z "$MACHINE" ]; then<br>
if [ "x$FSTYPE" = "xvmdk" ]; then<br>
- MACHINE=`basename $VM | sed -n<br>
's/.*\(qemux86-64\|qemux86\|qemuarm\|qemumips64\|qemumips\|qemuppc\|qemush4\).*/\1/p'`<br>
+ MACHINE=`basename $VM | sed -n<br>
's/.*\(qemux86-64\|qemux86\|qemuarm64\|qemuarm\|qemumips64\|qemumips\|qemuppc\|qemush4\).*/\1/p'`<br>
if [ -z "$MACHINE" ]; then<br>
error "Unable to set MACHINE from vmdk filename [$VM]"<br>
fi<br>
echo "Set MACHINE to [$MACHINE] based on vmdk [$VM]"<br>
else<br>
- MACHINE=`basename $KERNEL | sed -n<br>
's/.*\(qemux86-64\|qemux86\|qemuarm\|qemumips64\|qemumips\|qemuppc\|qemush4\).*/\1/p'`<br>
+ MACHINE=`basename $KERNEL | sed -n<br>
's/.*\(qemux86-64\|qemux86\|qemuarm64\|qemuarm\|qemumips64\|qemumips\|qemuppc\|qemush4\).*/\1/p'`<br>
if [ -z "$MACHINE" ]; then<br>
error "Unable to set MACHINE from kernel filename<br>
[$KERNEL]"<br>
fi<br>
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal<br>
index 2db5566..e346c64 100755<br>
--- a/scripts/runqemu-internal<br>
+++ b/scripts/runqemu-internal<br>
@@ -275,9 +275,6 @@ else<br>
<br>
KERNCMDLINE="mem=$QEMU_MEMORY"<br>
QEMU_UI_OPTIONS="-show-cursor -usb -usbdevice wacom-tablet"<br>
- if [ $MACHINE = 'qemuarm64' ]; then<br>
- QEMU_UI_OPTIONS="-nographic"<br>
- fi<br>
<br>
NFS_INSTANCE=`echo $TAP | sed 's/tap//'`<br>
export NFS_INSTANCE<br>
@@ -368,7 +365,7 @@ if [ "$MACHINE" = "qemuarm" -o "$MACHINE" =<br>
"qemuarmv6" -o "$MACHINE" = "qemuarm<br>
cleanup<br>
return 1<br>
fi<br>
- KERNCMDLINE="root=/dev/nfs<br>
nfsroot=$NFS_SERVER:$NFS_DIR,$UNFS_OPTS rw $KERNEL_NETWORK_CMD<br>
mem=$QEMU_MEMORY"<br>
+ KERNCMDLINE="root=/dev/nfs<br>
nfsroot=$NFS_SERVER:$NFS_DIR,$UNFS_OPTS rw console=ttyAMA0,115200<br>
$KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"<br>
QEMUOPTIONS="$QEMU_NETWORK_CMD -M ${MACHINE_SUBTYPE}<br>
--no-reboot $QEMU_UI_OPTIONS"<br>
fi<br>
if [ "$MACHINE" = "qemuarmv6" ]; then<br>
@@ -383,12 +380,25 @@ if [ "$MACHINE" = "qemuarm64" ]; then<br>
QEMU=qemu-system-aarch64<br>
<br>
export QEMU_AUDIO_DRV="none"<br>
- QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS"<br>
+ if [ "x$SERIALSTDIO" = "x" ] ; then<br>
+ QEMU_UI_OPTIONS="-nographic"<br>
+ else<br>
+ QEMU_UI_OPTIONS=""<br>
+ fi<br>
if [ "${FSTYPE:0:3}" = "ext" -o "$FSTYPE" = "btrfs" ]; then<br>
KERNCMDLINE="root=/dev/vda rw console=ttyAMA0,38400<br>
mem=$QEMU_MEMORY highres=off $KERNEL_NETWORK_CMD"<br>
# qemu-system-aarch64 only support '-machine virt -cpu<br>
cortex-a57' for now<br>
QEMUOPTIONS="$QEMU_NETWORK_CMD -machine virt -cpu<br>
cortex-a57 $ROOTFS_OPTIONS $QEMU_UI_OPTIONS"<br>
fi<br>
+ if [ "$FSTYPE" = "nfs" ]; then<br>
+ if [ "$NFS_SERVER" = "192.168.7.1" -a ! -d "$NFS_DIR" ]; then<br>
+ echo "Error: NFS mount point $ROOTFS doesn't exist"<br>
+ cleanup<br>
+ return 1<br>
+ fi<br>
+ KERNCMDLINE="root=/dev/nfs<br>
nfsroot=$NFS_SERVER:$NFS_DIR,$UNFS_OPTS rw console=ttyAMA0,38400<br>
mem=$QEMU_MEMORY highres=off $KERNEL_NETWORK_CMD"<br>
+ QEMUOPTIONS="$QEMU_NETWORK_CMD -machine virt -cpu<br>
cortex-a57 $QEMU_UI_OPTIONS"<br>
+ fi<br>
fi<br>
<br>
<br>
--<br>
1.8.2.3<br>
<br>
<br>
<br>
<br>
</div></div></blockquote><span class="HOEnZb"><font color="#888888">
<br>
-- <br>
_______________________________________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org" target="_blank">Openembedded-core@lists.openembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/mailman/listinfo/openembedded-core</a><br>
</font></span></blockquote></div><br></div></div>