On Mon, Jan 16, 2017 at 5:27 PM, Nathan Rossi <[email protected]> wrote: > On 17 January 2017 at 11:18, Alistair Francis > <[email protected]> wrote: >> Signed-off-by: Alistair Francis <[email protected]> >> Signed-off-by: Nathan Rossi <[email protected]> >> --- >> conf/machine/zcu102-zynqmp.conf | 19 ++++++++++++++++++- >> 1 file changed, 18 insertions(+), 1 deletion(-) >> >> diff --git a/conf/machine/zcu102-zynqmp.conf >> b/conf/machine/zcu102-zynqmp.conf >> index a38ac4a..52295a9 100644 >> --- a/conf/machine/zcu102-zynqmp.conf >> +++ b/conf/machine/zcu102-zynqmp.conf >> @@ -8,7 +8,7 @@ require conf/machine/include/machine-xilinx-default.inc >> require conf/machine/include/machine-xilinx-board.inc >> require conf/machine/include/machine-xilinx-qemu.inc >> >> -MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost mali" >> +MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost mali qemu-system-xilinx" >> >> UBOOT_MACHINE = "xilinx_zynqmp_zcu102_revB_defconfig" >> >> @@ -30,3 +30,20 @@ QB_OPT_APPEND = "-nographic -serial mon:stdio -serial >> null" >> QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no -net >> nic -net nic -net nic -net nic,netdev=net0,macaddr=@MAC@" >> QB_SLIRP_OPT = "-netdev user,id=net0 -net nic -net nic -net nic -net >> nic,netdev=net0" >> >> +# Xilinx QEMU options >> +QB_OPT_APPEND_append_qemuboot-xilinx = " -hw-dtb >> ${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/zcu102-arm.dtb " >> + >> +# 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=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=0x4000000,file=${DEPLOY_DIR_IMAGE}/${QB_DTB} \ >> + -device loader,addr=0x6000000,file=@ROOTFS@ \ >> + -device >> loader,addr=0x80000,file=${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE} \ > > Mistake here with having dtb/kernel being set in QB_ROOTFS_OPT? should > just be QB_OPT_APPEND no?
For the RootFS auto completion to work the @ROOTFS@ needs to be in the QB_ROOTFS_OPT. I can split them up though. Thanks, Alistair > > Regards, > Nathan > >> + " >> -- >> 2.7.4 >> -- _______________________________________________ meta-xilinx mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-xilinx
