summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlistair Francis <alistair.francis@xilinx.com>2016-06-15 13:43:23 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-08-10 10:45:32 +0100
commite5c6a78db46192800669f1b392351f6b52f3e20c (patch)
treeb29f863743a9e276bd07063ab5c553ce0245d44b
parentcdd9bae381deb15ac84e11a39f9d72f2757c1583 (diff)
downloadopenembedded-core-contrib-e5c6a78db46192800669f1b392351f6b52f3e20c.tar.gz
openembedded-core-contrib-e5c6a78db46192800669f1b392351f6b52f3e20c.tar.bz2
openembedded-core-contrib-e5c6a78db46192800669f1b392351f6b52f3e20c.zip
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>
-rwxr-xr-xscripts/runqemu3
-rwxr-xr-xscripts/runqemu-internal2
2 files changed, 2 insertions, 3 deletions
diff --git a/scripts/runqemu b/scripts/runqemu
index de0503546c..d52ea15936 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 3f413e7788..d10466d35c 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() {