[gnome-continuous-yocto/gnomeostree-3.28-rocko: 1772/8267] runqemu: qemuzynqmp: Add Linux boot support

[Emmanuele Bassi <ebassi src gnome org>]

commit ce8e654e2cb23b49e5ce85e6f2ebbff558b4e537
Author: Alistair Francis <alistair francis xilinx com>
Date:   Wed Jun 15 13:43:23 2016 -0700

    runqemu: qemuzynqmp: Add Linux boot support
    
    Add support to direct boot Linux instead of just booting u-boot.
    
    (From OE-Core rev: e5c6a78db46192800669f1b392351f6b52f3e20c)
    
    Signed-off-by: Alistair Francis <alistair francis xilinx com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/runqemu          |    3 +--
 scripts/runqemu-internal |    2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/scripts/runqemu b/scripts/runqemu
index de05035..d52ea15 100755
--- 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 3f413e7..d10466d 100755
--- 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() {