diff options
author | Nathan Rossi <nathan@nathanrossi.com> | 2015-09-16 14:59:59 +1000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-23 09:52:57 +0100 |
commit | fe70aa48641e7710f4581eabddc071ae60629429 (patch) | |
tree | 0218eba3f12a6dbe6340d74f6e0d58148c71f6ef /scripts/runqemu-internal | |
parent | 9aaf7e3f840e26d9f7bd282479858179cc1925bf (diff) | |
download | poky-fe70aa48641e7710f4581eabddc071ae60629429.tar.gz |
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.
(From OE-Core rev: 5830519bc10fa1195789d5b6a1b1bbbef4b940be)
Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/runqemu-internal')
-rwxr-xr-x | scripts/runqemu-internal | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal index 2d2a839746..d6b1102008 100755 --- a/scripts/runqemu-internal +++ b/scripts/runqemu-internal | |||
@@ -54,7 +54,7 @@ else | |||
54 | mem_size=512 | 54 | mem_size=512 |
55 | ;; | 55 | ;; |
56 | "qemumicroblaze") | 56 | "qemumicroblaze") |
57 | mem_size=64 | 57 | mem_size=256 |
58 | ;; | 58 | ;; |
59 | "qemumips"|"qemumips64") | 59 | "qemumips"|"qemumips64") |
60 | mem_size=256 | 60 | mem_size=256 |
@@ -587,7 +587,7 @@ fi | |||
587 | 587 | ||
588 | if [ "$MACHINE" = "qemumicroblaze" ]; then | 588 | if [ "$MACHINE" = "qemumicroblaze" ]; then |
589 | QEMU=qemu-system-microblazeel | 589 | QEMU=qemu-system-microblazeel |
590 | QEMU_SYSTEM_OPTIONS="$QEMU_NETWORK_CMD -M petalogix-ml605 -serial mon:stdio -dtb $KERNEL-$MACHINE.dtb" | 590 | QEMU_SYSTEM_OPTIONS="$QEMU_NETWORK_CMD -M petalogix-ml605 -serial mon:stdio" |
591 | if [ "${FSTYPE:0:3}" = "ext" -o "${FSTYPE:0:4}" = "cpio" ]; then | 591 | if [ "${FSTYPE:0:3}" = "ext" -o "${FSTYPE:0:4}" = "cpio" ]; then |
592 | KERNCMDLINE="earlyprintk root=/dev/ram rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" | 592 | KERNCMDLINE="earlyprintk root=/dev/ram rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY" |
593 | QEMUOPTIONS="$QEMU_SYSTEM_OPTIONS -initrd $ROOTFS" | 593 | QEMUOPTIONS="$QEMU_SYSTEM_OPTIONS -initrd $ROOTFS" |