runqemu: qemuzynqmp: Add Linux boot support

Add support to direct boot Linux instead of just booting u-boot.

Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>

diff --git a/scripts/runqemu b/scripts/runqemu
index de0503546c8d3e7054a03213b821cbd20c45c8c0..d52ea15936731ea00cd4ca297b521b5386499676 100755 (executable)
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -350,8 +350,7 @@ QEMUMICROBLAZE_DEFAULT_FSTYPE=cpio
 QEMUZYNQ_DEFAULT_KERNEL=uImage
 QEMUZYNQ_DEFAULT_FSTYPE=cpio
 
-# Default to booting u-boot as a direct Linux boot isn't supported yet.
-QEMUZYNQMP_DEFAULT_KERNEL=u-boot-qemuzynqmp.elf
+QEMUZYNQMP_DEFAULT_KERNEL=Image
 QEMUZYNQMP_DEFAULT_FSTYPE=cpio
 
 setup_path_vars() {

diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index 3f413e77880b1bd68eb9d7ae76ddb7c6c555da10..d10466d35cce62d2481a412f5f10c1575824e421 100755 (executable)
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -514,7 +514,7 @@ config_qemuzynqmp() {
     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"
     QEMU_SYSTEM_OPTIONS="$QEMU_NETWORK_CMD -M xlnx-ep108 -serial mon:stdio -dtb $DEPLOY_DIR_IMAGE/${QEMU_DTB}.dtb"
 
-    QEMUOPTIONS="$QEMU_SYSTEM_OPTIONS $QEMU_UI_OPTIONS -tftp $DEPLOY_DIR_IMAGE"
+    QEMUOPTIONS="$QEMU_SYSTEM_OPTIONS $QEMU_UI_OPTIONS -initrd $ROOTFS"
 }
 
 config_qemumicroblaze() {