From 092ba4ea3c2e5c88f2f4a5309151f5b189c8a5e8 Mon Sep 17 00:00:00 2001 From: Sandeep Gundlupet Raju Date: Tue, 24 Jan 2023 13:03:18 -0700 Subject: zynqmp-generic: Set variables for QEMU HW PS and PMU DTB Set variables for QEMU DTB PATH, PS DTB and PMU DTB for zynqmp_generic, this allows user to use different QEMU HW DTB to match their board. Signed-off-by: Sandeep Gundlupet Raju Signed-off-by: Mark Hatle --- meta-xilinx-core/conf/machine/zynqmp-generic.conf | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'meta-xilinx-core/conf/machine') diff --git a/meta-xilinx-core/conf/machine/zynqmp-generic.conf b/meta-xilinx-core/conf/machine/zynqmp-generic.conf index 6c01548f..a2d20869 100644 --- a/meta-xilinx-core/conf/machine/zynqmp-generic.conf +++ b/meta-xilinx-core/conf/machine/zynqmp-generic.conf @@ -94,9 +94,15 @@ QB_MEM = "-m 4096" # Iteration appears to be eth3, eth2, eth1, eth0 QB_NETWORK_DEVICE = "-net nic -net nic -net nic -net nic,netdev=net0,macaddr=@MAC@" +# Set variables for QEMU DTB PATH, PS DTB and PMU DTB for zynqmp_generic, this +# allows user to use different QEMU HW DTB to match their board. +QEMU_HW_DTB_PATH = "${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch" +QEMU_HW_DTB_PS = "${QEMU_HW_DTB_PATH}/zcu102-arm.dtb" +QEMU_HW_DTB_PMU = "${QEMU_HW_DTB_PATH}/zynqmp-pmu.dtb" + # Replicate BootROM like behaviour, having loaded SPL and PMU(ROM+FW) QB_OPT_APPEND = " \ - -hw-dtb ${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch/zcu102-arm.dtb \ + -hw-dtb ${QEMU_HW_DTB_PS} \ ${@qemu_zynqmp_unhalt(d, True)} \ -device loader,file=${DEPLOY_DIR_IMAGE}/arm-trusted-firmware.elf,cpu-num=0 \ -device loader,file=${DEPLOY_DIR_IMAGE}/u-boot.elf \ @@ -107,7 +113,7 @@ QB_OPT_APPEND = " \ QB_PMU_OPT = " \ -M microblaze-fdt \ -display none \ - -hw-dtb ${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch/zynqmp-pmu.dtb \ + -hw-dtb ${QEMU_HW_DTB_PMU} \ -kernel ${PMU_ROM} \ -device loader,file=${PMU_FIRMWARE_DEPLOY_DIR}/${PMU_FIRMWARE_IMAGE_NAME}.elf \ -device loader,addr=0xfd1a0074,data=0x1011003,data-len=4 \ -- cgit v1.2.3-54-g00ecf