summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorNathan Rossi <nathan.rossi@xilinx.com>2013-07-04 07:47:01 +0000
committerSaul Wold <sgw@linux.intel.com>2013-07-09 07:56:09 -0700
commit1e4b1d95e1f47654e928f38cd091ffe272689844 (patch)
tree98a255808a5eaf214e351a30b626b4349abc46c2 /scripts
parente0ce07010d2e818dc43ffdff6f3cdd94f18d7af5 (diff)
downloadopenembedded-core-1e4b1d95e1f47654e928f38cd091ffe272689844.tar.gz
openembedded-core-1e4b1d95e1f47654e928f38cd091ffe272689844.tar.bz2
openembedded-core-1e4b1d95e1f47654e928f38cd091ffe272689844.zip
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) Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
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 406092be3c..5ad83dd215 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -107,7 +107,8 @@ KVM_ENABLED="no"
while true; do
arg=${1}
case "$arg" in
- "qemux86" | "qemux86-64" | "qemuarm" | "qemumips" | "qemumipsel" | "qemumips64" | "qemush4" | "qemuppc")
+ "qemux86" | "qemux86-64" | "qemuarm" | "qemumips" | "qemumipsel" | \
+ "qemumips64" | "qemush4" | "qemuppc" | "qemuzynq")
[ -z "$MACHINE" ] && MACHINE=$arg || \
error "conflicting MACHINE types [$MACHINE] and [$arg]"
;;
@@ -308,6 +309,9 @@ QEMUSH4_DEFAULT_FSTYPE=ext3
QEMUPPC_DEFAULT_KERNEL=vmlinux-qemuppc.bin
QEMUPPC_DEFAULT_FSTYPE=ext3
+QEMUZYNQ_DEFAULT_KERNEL=uImage
+QEMUZYNQ_DEFAULT_FSTYPE=cpio
+
AKITA_DEFAULT_KERNEL=zImage-akita.bin
AKITA_DEFAULT_FSTYPE=jffs2
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index 4f3ba7b882..f156c4dae5 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -59,6 +59,9 @@ else
"qemush4")
mem_size=1024
;;
+ "qemuzynq")
+ mem_size=1024
+ ;;
*)
mem_size=64
;;
@@ -270,6 +273,7 @@ case "$MACHINE" in
"qemuarmv7") ;;
"qemux86") ;;
"qemux86-64") ;;
+ "qemuzynq") ;;
"akita") ;;
"spitz") ;;
*)
@@ -492,6 +496,17 @@ if [ "$MACHINE" = "akita" ]; then
fi
fi
+if [ "$MACHINE" = "qemuzynq" ]; then
+ QEMU=qemu-system-arm
+ QEMU_SYSTEM_OPTIONS="-M xilinx-zynq-a9 -serial null -serial mon:stdio -dtb $KERNEL-$MACHINE.dtb"
+ # zynq serial ports are named 'ttyPS0' and 'ttyPS1', fixup the default values
+ SCRIPT_KERNEL_OPT=$(echo "$SCRIPT_KERNEL_OPT" | sed 's/console=ttyS/console=ttyPS/g')
+ if [ "${FSTYPE:0:3}" = "ext" -o "${FSTYPE:0:4}" = "cpio" ]; then
+ KERNCMDLINE="earlyprintk root=/dev/ram rw"
+ QEMUOPTIONS="$QEMU_SYSTEM_OPTIONS -initrd $ROOTFS"
+ fi
+fi
+
if [ "x$RAMFS" = "xtrue" ]; then
QEMUOPTIONS="-initrd $ROOTFS -nographic"
KERNCMDLINE="root=/dev/ram0 debugshell"