As of the 4.7 kernel qemuarm must be booted with a dtb. To allow
older and recent kernels to both boot qemuarm, we add the device
tree definitions only to recipes that need it (linux-yocto-dev)
and make runqemu detect and use the dtb if present.

Signed-off-by: Bruce Ashfield <[email protected]>
---
 scripts/runqemu-internal | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index d10466d35cce..e74a9150cbd7 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -298,6 +298,9 @@ config_qemuarm() {
         KERNCMDLINE="root=/dev/nfs nfsroot=$NFS_SERVER:$NFS_DIR,$UNFS_OPTS rw 
console=ttyAMA0,115200 $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
         QEMUOPTIONS="$QEMU_NETWORK_CMD -M ${MACHINE_SUBTYPE} --no-reboot 
$QEMU_UI_OPTIONS"
     fi
+    if [ -e "$DEPLOY_DIR_IMAGE/zImage-versatile-pb.dtb" ]; then
+        QEMUOPTIONS="$QEMUOPTIONS -dtb 
$DEPLOY_DIR_IMAGE/zImage-versatile-pb.dtb"
+    fi
     if [ "$MACHINE" = "qemuarmv6" ]; then
         QEMUOPTIONS="$QEMUOPTIONS -cpu arm1136"
     fi
-- 
2.5.0

-- 
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Reply via email to