summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorNathan Rossi <nathan.rossi@xilinx.com>2013-07-04 07:47:01 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-07-10 08:41:51 (GMT)
commit41563388edbe7f7559070c37c4f5cefd4cf37a96 (patch)
tree4df8558d3b63ed5cfabd30728edd0a969bc66772 /scripts
parentce1638c50dc44c69717c67049dcc76a1cb5b7e75 (diff)
downloadpoky-41563388edbe7f7559070c37c4f5cefd4cf37a96.tar.gz
scripts/runqemu: Add support for 'qemuzynq' machine
* Add support to boot the 'qemuzynq' machine in qemu-system-arm * Use the specific machine model for Zynq 'xilinx-zynq-a9' * 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: 1e4b1d95e1f47654e928f38cd091ffe272689844) 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-xscripts/runqemu6
-rwxr-xr-xscripts/runqemu-internal15
2 files changed, 20 insertions, 1 deletions
diff --git a/scripts/runqemu b/scripts/runqemu
index 406092b..5ad83dd 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -107,7 +107,8 @@ KVM_ENABLED="no"
107while true; do 107while true; do
108 arg=${1} 108 arg=${1}
109 case "$arg" in 109 case "$arg" in
110 "qemux86" | "qemux86-64" | "qemuarm" | "qemumips" | "qemumipsel" | "qemumips64" | "qemush4" | "qemuppc") 110 "qemux86" | "qemux86-64" | "qemuarm" | "qemumips" | "qemumipsel" | \
111 "qemumips64" | "qemush4" | "qemuppc" | "qemuzynq")
111 [ -z "$MACHINE" ] && MACHINE=$arg || \ 112 [ -z "$MACHINE" ] && MACHINE=$arg || \
112 error "conflicting MACHINE types [$MACHINE] and [$arg]" 113 error "conflicting MACHINE types [$MACHINE] and [$arg]"
113 ;; 114 ;;
@@ -308,6 +309,9 @@ QEMUSH4_DEFAULT_FSTYPE=ext3
308QEMUPPC_DEFAULT_KERNEL=vmlinux-qemuppc.bin 309QEMUPPC_DEFAULT_KERNEL=vmlinux-qemuppc.bin
309QEMUPPC_DEFAULT_FSTYPE=ext3 310QEMUPPC_DEFAULT_FSTYPE=ext3
310 311
312QEMUZYNQ_DEFAULT_KERNEL=uImage
313QEMUZYNQ_DEFAULT_FSTYPE=cpio
314
311AKITA_DEFAULT_KERNEL=zImage-akita.bin 315AKITA_DEFAULT_KERNEL=zImage-akita.bin
312AKITA_DEFAULT_FSTYPE=jffs2 316AKITA_DEFAULT_FSTYPE=jffs2
313 317
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index 4f3ba7b..f156c4d 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -59,6 +59,9 @@ else
59 "qemush4") 59 "qemush4")
60 mem_size=1024 60 mem_size=1024
61 ;; 61 ;;
62 "qemuzynq")
63 mem_size=1024
64 ;;
62 *) 65 *)
63 mem_size=64 66 mem_size=64
64 ;; 67 ;;
@@ -270,6 +273,7 @@ case "$MACHINE" in
270 "qemuarmv7") ;; 273 "qemuarmv7") ;;
271 "qemux86") ;; 274 "qemux86") ;;
272 "qemux86-64") ;; 275 "qemux86-64") ;;
276 "qemuzynq") ;;
273 "akita") ;; 277 "akita") ;;
274 "spitz") ;; 278 "spitz") ;;
275 *) 279 *)
@@ -492,6 +496,17 @@ if [ "$MACHINE" = "akita" ]; then
492 fi 496 fi
493fi 497fi
494 498
499if [ "$MACHINE" = "qemuzynq" ]; then
500 QEMU=qemu-system-arm
501 QEMU_SYSTEM_OPTIONS="-M xilinx-zynq-a9 -serial null -serial mon:stdio -dtb $KERNEL-$MACHINE.dtb"
502 # zynq serial ports are named 'ttyPS0' and 'ttyPS1', fixup the default values
503 SCRIPT_KERNEL_OPT=$(echo "$SCRIPT_KERNEL_OPT" | sed 's/console=ttyS/console=ttyPS/g')
504 if [ "${FSTYPE:0:3}" = "ext" -o "${FSTYPE:0:4}" = "cpio" ]; then
505 KERNCMDLINE="earlyprintk root=/dev/ram rw"
506 QEMUOPTIONS="$QEMU_SYSTEM_OPTIONS -initrd $ROOTFS"
507 fi
508fi
509
495if [ "x$RAMFS" = "xtrue" ]; then 510if [ "x$RAMFS" = "xtrue" ]; then
496 QEMUOPTIONS="-initrd $ROOTFS -nographic" 511 QEMUOPTIONS="-initrd $ROOTFS -nographic"
497 KERNCMDLINE="root=/dev/ram0 debugshell" 512 KERNCMDLINE="root=/dev/ram0 debugshell"