Sorry for the top post, I’m replying from my phone. Once that change is made you can add my reviewed by.
Thanks, Alistair From: Nathan Rossi Sent: Saturday, 11 February 2017 1:00 AM To: Alistair Francis Cc: [email protected] Subject: Re: [meta-xilinx] [PATCH 5/7] zcu102-zynqmp: Default qemuboot tousing Xilinx QEMU On 11 February 2017 at 08:10, Alistair Francis <[email protected]> wrote: > On Fri, Feb 10, 2017 at 8:44 AM, Nathan Rossi <[email protected]> wrote: >> 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 <[email protected]> >> --- >> conf/machine/zcu102-zynqmp.conf | 18 +++++++++--------- >> 1 file changed, 9 insertions(+), 9 deletions(-) >> >> diff --git a/conf/machine/zcu102-zynqmp.conf >> b/conf/machine/zcu102-zynqmp.conf >> index 10b8575425..3f38296c77 100644 >> --- a/conf/machine/zcu102-zynqmp.conf >> +++ b/conf/machine/zcu102-zynqmp.conf >> @@ -1,7 +1,6 @@ >> #@TYPE: Machine >> #@NAME: zynqmp-zcu102 >> #@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" > > Shouldn't this be a ?= or something so that users can override this in > the local.conf? Yes good idea, will make that change before merging it. Thanks, Nathan > > Otherwise the patch looks good. > > Thanks, > > Alistair > >> >> -# 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} \ >> " >> -- >> 2.11.0 >> >> -- >> _______________________________________________ >> meta-xilinx mailing list >> [email protected] >> https://lists.yoctoproject.org/listinfo/meta-xilinx
-- _______________________________________________ meta-xilinx mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-xilinx
