[oe-commits] Nathan Rossi : runqemu-internal: For qemumicroblaze use the QEMU provided device tree

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 5830519bc10fa1195789d5b6a1b1bbbef4b940be
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=5830519bc10fa1195789d5b6a1b1bbbef4b940be

Author: Nathan Rossi <nathan at nathanrossi.com>
Date:   Wed Sep 16 14:59:59 2015 +1000

runqemu-internal: For qemumicroblaze use the QEMU provided device tree

Setup the qemumicroblaze machine to use the device tree provided by QEMU
instead of the device tree located in the images directory. Additionally
setup the default memory size to match the QEMU device tree.

Signed-off-by: Nathan Rossi <nathan at nathanrossi.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>

---

 scripts/runqemu-internal | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index 2d2a839..d6b1102 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -54,7 +54,7 @@ else
             mem_size=512
             ;;
         "qemumicroblaze")
-            mem_size=64
+            mem_size=256
             ;;
         "qemumips"|"qemumips64")
             mem_size=256
@@ -587,7 +587,7 @@ fi
 
 if [ "$MACHINE" = "qemumicroblaze" ]; then
     QEMU=qemu-system-microblazeel
-    QEMU_SYSTEM_OPTIONS="$QEMU_NETWORK_CMD -M petalogix-ml605 -serial mon:stdio -dtb $KERNEL-$MACHINE.dtb"
+    QEMU_SYSTEM_OPTIONS="$QEMU_NETWORK_CMD -M petalogix-ml605 -serial mon:stdio"
     if [ "${FSTYPE:0:3}" = "ext" -o "${FSTYPE:0:4}" = "cpio" ]; then
         KERNCMDLINE="earlyprintk root=/dev/ram rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
         QEMUOPTIONS="$QEMU_SYSTEM_OPTIONS -initrd $ROOTFS"