summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xscripts/runqemu9
-rwxr-xr-xscripts/runqemu-internal21
2 files changed, 29 insertions, 1 deletions
diff --git a/scripts/runqemu b/scripts/runqemu
index d7fa941a66..de0503546c 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -121,7 +121,7 @@ while true; do
121 arg=${1} 121 arg=${1}
122 case "$arg" in 122 case "$arg" in
123 "qemux86" | "qemux86-64" | "qemuarm" | "qemuarm64" | "qemumips" | "qemumipsel" | \ 123 "qemux86" | "qemux86-64" | "qemuarm" | "qemuarm64" | "qemumips" | "qemumipsel" | \
124 "qemumips64" | "qemush4" | "qemuppc" | "qemumicroblaze" | "qemuzynq") 124 "qemumips64" | "qemush4" | "qemuppc" | "qemumicroblaze" | "qemuzynq" | "qemuzynqmp")
125 [ -z "$MACHINE" -o "$MACHINE" = "$arg" ] && MACHINE=$arg || \ 125 [ -z "$MACHINE" -o "$MACHINE" = "$arg" ] && MACHINE=$arg || \
126 error "conflicting MACHINE types [$MACHINE] and [$arg]" 126 error "conflicting MACHINE types [$MACHINE] and [$arg]"
127 ;; 127 ;;
@@ -350,6 +350,10 @@ QEMUMICROBLAZE_DEFAULT_FSTYPE=cpio
350QEMUZYNQ_DEFAULT_KERNEL=uImage 350QEMUZYNQ_DEFAULT_KERNEL=uImage
351QEMUZYNQ_DEFAULT_FSTYPE=cpio 351QEMUZYNQ_DEFAULT_FSTYPE=cpio
352 352
353# Default to booting u-boot as a direct Linux boot isn't supported yet.
354QEMUZYNQMP_DEFAULT_KERNEL=u-boot-qemuzynqmp.elf
355QEMUZYNQMP_DEFAULT_FSTYPE=cpio
356
353setup_path_vars() { 357setup_path_vars() {
354 if [ -z "$OE_TMPDIR" ] ; then 358 if [ -z "$OE_TMPDIR" ] ; then
355 PATHS_REQUIRED=true 359 PATHS_REQUIRED=true
@@ -382,6 +386,9 @@ setup_path_vars() {
382 if [ -z "$DEPLOY_DIR_IMAGE" ] ; then 386 if [ -z "$DEPLOY_DIR_IMAGE" ] ; then
383 DEPLOY_DIR_IMAGE=`sed -n 's/^DEPLOY_DIR_IMAGE=\"\(.*\)\"/\1/p' $BITBAKE_ENV_TMPFILE` 387 DEPLOY_DIR_IMAGE=`sed -n 's/^DEPLOY_DIR_IMAGE=\"\(.*\)\"/\1/p' $BITBAKE_ENV_TMPFILE`
384 fi 388 fi
389 if [ -z "$QEMU_DTB" ] ; then
390 QEMU_DTB=`sed -n 's/^QEMU_DTB=\"\(.*\)\"/\1/p' $BITBAKE_ENV_TMPFILE`
391 fi
385 if [ -z "$OE_TMPDIR" ]; then 392 if [ -z "$OE_TMPDIR" ]; then
386 # Check for errors from bitbake that the user needs to know about 393 # Check for errors from bitbake that the user needs to know about
387 BITBAKE_OUTPUT=`cat $BITBAKE_ENV_TMPFILE | wc -l` 394 BITBAKE_OUTPUT=`cat $BITBAKE_ENV_TMPFILE | wc -l`
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index ac1c703c53..5671b4f434 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -498,6 +498,24 @@ config_qemuzynq() {
498 fi 498 fi
499} 499}
500 500
501config_qemuzynqmp() {
502 set_mem_size 2048
503 QEMU=qemu-system-aarch64
504
505 export QEMU_AUDIO_DRV="none"
506 if [ "x$SERIALSTDIO" = "x" ] ; then
507 QEMU_UI_OPTIONS="-nographic"
508 else
509 QEMU_UI_OPTIONS=""
510 fi
511
512 # Networking and system options required for QEMU ZynqMP machine
513 QEMU_NETWORK_CMD="-net nic -net nic -net nic -net nic -net user,net=10.10.70.0,dhcpstart=10.10.70.1,host=10.10.70.101"
514 QEMU_SYSTEM_OPTIONS="$QEMU_NETWORK_CMD -M xlnx-ep108 -serial mon:stdio -dtb $DEPLOY_DIR_IMAGE/${QEMU_DTB}.dtb"
515
516 QEMUOPTIONS="$QEMU_SYSTEM_OPTIONS $QEMU_UI_OPTIONS -tftp $DEPLOY_DIR_IMAGE"
517}
518
501config_qemumicroblaze() { 519config_qemumicroblaze() {
502 set_mem_size 256 520 set_mem_size 256
503 QEMU=qemu-system-microblazeel 521 QEMU=qemu-system-microblazeel
@@ -533,6 +551,9 @@ case "$MACHINE" in
533 "qemuzynq") 551 "qemuzynq")
534 config_qemuzynq 552 config_qemuzynq
535 ;; 553 ;;
554 "qemuzynqmp")
555 config_qemuzynqmp
556 ;;
536 "qemumicroblaze") 557 "qemumicroblaze")
537 config_qemumicroblaze 558 config_qemumicroblaze
538 ;; 559 ;;