diff options
author | Alistair Francis <alistair.francis@xilinx.com> | 2016-06-15 13:43:23 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-08-10 10:46:33 +0100 |
commit | ce8e654e2cb23b49e5ce85e6f2ebbff558b4e537 (patch) | |
tree | 97cbfb801c54d006765efd413728c2555e888313 /scripts | |
parent | 6f2fa0a0186e5bfb823ed033ba4a7fcfff2c7834 (diff) | |
download | poky-ce8e654e2cb23b49e5ce85e6f2ebbff558b4e537.tar.gz |
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>
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/runqemu | 3 | ||||
-rwxr-xr-x | scripts/runqemu-internal | 2 |
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 | |||
350 | QEMUZYNQ_DEFAULT_KERNEL=uImage | 350 | QEMUZYNQ_DEFAULT_KERNEL=uImage |
351 | QEMUZYNQ_DEFAULT_FSTYPE=cpio | 351 | QEMUZYNQ_DEFAULT_FSTYPE=cpio |
352 | 352 | ||
353 | # Default to booting u-boot as a direct Linux boot isn't supported yet. | 353 | QEMUZYNQMP_DEFAULT_KERNEL=Image |
354 | QEMUZYNQMP_DEFAULT_KERNEL=u-boot-qemuzynqmp.elf | ||
355 | QEMUZYNQMP_DEFAULT_FSTYPE=cpio | 354 | QEMUZYNQMP_DEFAULT_FSTYPE=cpio |
356 | 355 | ||
357 | setup_path_vars() { | 356 | 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() { | |||
514 | 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" | 514 | 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" |
515 | QEMU_SYSTEM_OPTIONS="$QEMU_NETWORK_CMD -M xlnx-ep108 -serial mon:stdio -dtb $DEPLOY_DIR_IMAGE/${QEMU_DTB}.dtb" | 515 | QEMU_SYSTEM_OPTIONS="$QEMU_NETWORK_CMD -M xlnx-ep108 -serial mon:stdio -dtb $DEPLOY_DIR_IMAGE/${QEMU_DTB}.dtb" |
516 | 516 | ||
517 | QEMUOPTIONS="$QEMU_SYSTEM_OPTIONS $QEMU_UI_OPTIONS -tftp $DEPLOY_DIR_IMAGE" | 517 | QEMUOPTIONS="$QEMU_SYSTEM_OPTIONS $QEMU_UI_OPTIONS -initrd $ROOTFS" |
518 | } | 518 | } |
519 | 519 | ||
520 | config_qemumicroblaze() { | 520 | config_qemumicroblaze() { |