From cb4c077942b9d4d15d74c244ff31c6c57f92820f Mon Sep 17 00:00:00 2001 From: Nathan Rossi Date: Wed, 8 Feb 2017 19:40:26 +1000 Subject: zcu102-zynqmp: Default qemuboot to using Xilinx QEMU Currently the mainline QEMU is lacking full support for emulating the ZCU102 board. So use the more functional Xilinx QEMU for this board. Also reformat some of the appends to QB_* variables for clarity. Signed-off-by: Nathan Rossi Reviewed-by: Alistair Francis --- conf/machine/include/machine-xilinx-qemu.inc | 2 +- conf/machine/zcu102-zynqmp.conf | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'conf') diff --git a/conf/machine/include/machine-xilinx-qemu.inc b/conf/machine/include/machine-xilinx-qemu.inc index 0e5c4bf7..79cbd7a4 100644 --- a/conf/machine/include/machine-xilinx-qemu.inc +++ b/conf/machine/include/machine-xilinx-qemu.inc @@ -43,7 +43,7 @@ QB_SYSTEM_NAME ?= "${@qemu_target_binary(d)}" QB_DEFAULT_FSTYPE ?= "cpio" XILINX_QEMUBOOT[doc] = "Set this variable to '1' to enable the generation of qemuboot.conf which uses the Xilinx QEMU." -XILINX_QEMUBOOT ?= "" +XILINX_QEMUBOOT ??= "" # Dependencies for native Xilinx QEMU XILINX_QEMU_DEPENDS ?= "qemu-xilinx-native" diff --git a/conf/machine/zcu102-zynqmp.conf b/conf/machine/zcu102-zynqmp.conf index 083e48d4..c55b536c 100644 --- a/conf/machine/zcu102-zynqmp.conf +++ b/conf/machine/zcu102-zynqmp.conf @@ -1,7 +1,6 @@ #@TYPE: Machine #@NAME: zcu102-zynqmp #@DESCRIPTION: Machine support for ZCU102 Evaluation Board. -# require conf/machine/include/tune-zynqmp.inc require conf/machine/include/machine-xilinx-default.inc @@ -29,20 +28,21 @@ QB_MEM = "-m 2048" QB_OPT_APPEND = "-nographic -serial mon:stdio -serial null" QB_NETWORK_DEVICE = "-net nic -net nic -net nic -net nic,netdev=net0,macaddr=@MAC@" -# Xilinx QEMU options -QB_OPT_APPEND_append_qemuboot-xilinx = " -hw-dtb ${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/zcu102-arm.dtb " +# Xilinx QEMU options, default to using Xilinx QEMU +XILINX_QEMUBOOT ?= "1" -# Reset and unhalt CPU0 -QB_OPT_APPEND_append_qemuboot-xilinx = " -device loader,addr=0xfd1a0104,data=0x8000000e,data-len=4 " - -# Load the boot media -QB_OPT_APPEND_append_qemuboot-xilinx = " -device loader,file=${DEPLOY_DIR_IMAGE}/arm-trusted-firmware-${MACHINE}.elf,cpu-num=0 \ +# Reset and unhalt CPU0, load the boot media. +QB_OPT_APPEND_append_qemuboot-xilinx = " \ + -hw-dtb ${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/zcu102-arm.dtb \ + -device loader,addr=0xfd1a0104,data=0x8000000e,data-len=4 \ + -device loader,file=${DEPLOY_DIR_IMAGE}/arm-trusted-firmware-${MACHINE}.elf,cpu-num=0 \ -device loader,file=${DEPLOY_DIR_IMAGE}/u-boot.elf \ " # Load the kernel image so the user can run 'booti 0x80000 0x6000000 0x4000000' to boot the kernel QB_DEFAULT_FSTYPE_qemuboot-xilinx = "cpio.gz.u-boot" QB_ROOTFS_OPT_qemuboot-xilinx = " -device loader,addr=0x6000000,file=@ROOTFS@,force-raw=true" -QB_OPT_APPEND_append_qemuboot-xilinx = " -device loader,addr=0x4000000,file=${DEPLOY_DIR_IMAGE}/${QB_DTB} \ +QB_OPT_APPEND_append_qemuboot-xilinx = " \ + -device loader,addr=0x4000000,file=${DEPLOY_DIR_IMAGE}/${QB_DTB} \ -device loader,addr=0x80000,file=${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE} \ " -- cgit v1.2.3-54-g00ecf