diff options
author | Nathan Rossi <nathan.rossi@xilinx.com> | 2013-07-04 07:47:46 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-07-10 09:41:51 +0100 |
commit | f6538c3b649e19088e0f396f84061086c3cc786a (patch) | |
tree | 1a6d1efb338d79eea45af36fa4c35054b2a0fc4a /scripts | |
parent | 41563388edbe7f7559070c37c4f5cefd4cf37a96 (diff) | |
download | poky-f6538c3b649e19088e0f396f84061086c3cc786a.tar.gz |
scripts/runqemu: Add support for 'qemumicroblaze' machine
* Add support to boot the 'qemumicroblaze' machine in
qemu-system-microblazeel
* Use the specific machine model for a MicroBlaze system 'petalogix-ml605'
* Use the DTB generated from the kernel build as the DTB for boot
* Force use of initrd rootfs (either in ext or cpio formats)
(From OE-Core rev: 2c164a5dfc877d180ef58d46c063573621297929)
Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/runqemu | 5 | ||||
-rwxr-xr-x | scripts/runqemu-internal | 13 |
2 files changed, 17 insertions, 1 deletions
diff --git a/scripts/runqemu b/scripts/runqemu index 5ad83dd215..04dc3b0571 100755 --- a/scripts/runqemu +++ b/scripts/runqemu | |||
@@ -108,7 +108,7 @@ while true; do | |||
108 | arg=${1} | 108 | arg=${1} |
109 | case "$arg" in | 109 | case "$arg" in |
110 | "qemux86" | "qemux86-64" | "qemuarm" | "qemumips" | "qemumipsel" | \ | 110 | "qemux86" | "qemux86-64" | "qemuarm" | "qemumips" | "qemumipsel" | \ |
111 | "qemumips64" | "qemush4" | "qemuppc" | "qemuzynq") | 111 | "qemumips64" | "qemush4" | "qemuppc" | "qemumicroblaze" | "qemuzynq") |
112 | [ -z "$MACHINE" ] && MACHINE=$arg || \ | 112 | [ -z "$MACHINE" ] && MACHINE=$arg || \ |
113 | error "conflicting MACHINE types [$MACHINE] and [$arg]" | 113 | error "conflicting MACHINE types [$MACHINE] and [$arg]" |
114 | ;; | 114 | ;; |
@@ -309,6 +309,9 @@ QEMUSH4_DEFAULT_FSTYPE=ext3 | |||
309 | QEMUPPC_DEFAULT_KERNEL=vmlinux-qemuppc.bin | 309 | QEMUPPC_DEFAULT_KERNEL=vmlinux-qemuppc.bin |
310 | QEMUPPC_DEFAULT_FSTYPE=ext3 | 310 | QEMUPPC_DEFAULT_FSTYPE=ext3 |
311 | 311 | ||
312 | QEMUMICROBLAZE_DEFAULT_KERNEL=linux.bin.ub | ||
313 | QEMUMICROBLAZE_DEFAULT_FSTYPE=cpio | ||
314 | |||
312 | QEMUZYNQ_DEFAULT_KERNEL=uImage | 315 | QEMUZYNQ_DEFAULT_KERNEL=uImage |
313 | QEMUZYNQ_DEFAULT_FSTYPE=cpio | 316 | QEMUZYNQ_DEFAULT_FSTYPE=cpio |
314 | 317 | ||
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal index f156c4dae5..9619bec7b9 100755 --- a/scripts/runqemu-internal +++ b/scripts/runqemu-internal | |||
@@ -50,6 +50,9 @@ else | |||
50 | "qemuarm") | 50 | "qemuarm") |
51 | mem_size=128 | 51 | mem_size=128 |
52 | ;; | 52 | ;; |
53 | "qemumicroblaze") | ||
54 | mem_size=64 | ||
55 | ;; | ||
53 | "qemumips"|"qemumips64") | 56 | "qemumips"|"qemumips64") |
54 | mem_size=128 | 57 | mem_size=128 |
55 | ;; | 58 | ;; |
@@ -264,6 +267,7 @@ fi | |||
264 | 267 | ||
265 | case "$MACHINE" in | 268 | case "$MACHINE" in |
266 | "qemuarm") ;; | 269 | "qemuarm") ;; |
270 | "qemumicroblaze") ;; | ||
267 | "qemumips") ;; | 271 | "qemumips") ;; |
268 | "qemumipsel") ;; | 272 | "qemumipsel") ;; |
269 | "qemumips64") ;; | 273 | "qemumips64") ;; |
@@ -496,6 +500,15 @@ if [ "$MACHINE" = "akita" ]; then | |||
496 | fi | 500 | fi |
497 | fi | 501 | fi |
498 | 502 | ||
503 | if [ "$MACHINE" = "qemumicroblaze" ]; then | ||
504 | QEMU=qemu-system-microblazeel | ||
505 | QEMU_SYSTEM_OPTIONS="-M petalogix-ml605 -serial mon:stdio -dtb $KERNEL-$MACHINE.dtb" | ||
506 | if [ "${FSTYPE:0:3}" = "ext" -o "${FSTYPE:0:4}" = "cpio" ]; then | ||
507 | KERNCMDLINE="earlyprintk root=/dev/ram rw" | ||
508 | QEMUOPTIONS="$QEMU_SYSTEM_OPTIONS -initrd $ROOTFS" | ||
509 | fi | ||
510 | fi | ||
511 | |||
499 | if [ "$MACHINE" = "qemuzynq" ]; then | 512 | if [ "$MACHINE" = "qemuzynq" ]; then |
500 | QEMU=qemu-system-arm | 513 | QEMU=qemu-system-arm |
501 | QEMU_SYSTEM_OPTIONS="-M xilinx-zynq-a9 -serial null -serial mon:stdio -dtb $KERNEL-$MACHINE.dtb" | 514 | QEMU_SYSTEM_OPTIONS="-M xilinx-zynq-a9 -serial null -serial mon:stdio -dtb $KERNEL-$MACHINE.dtb" |