1 files changed, 5 insertions, 38 deletions

diff --git a/meta-xilinx-core/conf/machine/zynqmp-generic.conf b/meta-xilinx-core/conf/machine/zynqmp-generic.conf
index b5a2f832..15a48102 100644
--- a/meta-xilinx-core/conf/machine/zynqmp-generic.conf
+++ b/meta-xilinx-core/conf/machine/zynqmp-generic.conf
@@ -10,13 +10,6 @@ MACHINEOVERRIDES =. "${@['', 'zynqmp-generic:']['zynqmp-generic' != '${MACHINE}'
 # defined before calling the required inclusion file else pre-expansion value
 # defined in local.conf without machine override will not be reflected.
 
-# Yocto device-tree variables
-YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "psu_uart_0"
-YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "PSU_DDR_0"
-DT_PADDING_SIZE:pn-device-tree ?= "0x1000"
-DTC_FLAGS:pn-device-tree = "-@"
-YAML_DT_BOARD_FLAGS ?= "{BOARD zcu102-rev1.0}"
-
 # Yocto ZynqMP u-boot-xlnx variables
 UBOOT_MACHINE ?= "xilinx_zynqmp_virt_defconfig"
 BOOTMODE ?= "generic.root"
@@ -30,31 +23,17 @@ SPL_BINARY ?= ""
 # Yocto ZynqMP arm-trusted-firmware(TF-A) variables
 TFA_BL33_LOAD ?= "0x8000000"
 
-# Yocto ZynqMP PMUFW variables
-YAML_SERIAL_CONSOLE_STDIN:pn-pmu-firmware ?= "psu_uart_0"
-YAML_SERIAL_CONSOLE_STDOUT:pn-pmu-firmware ?= "psu_uart_0"
-
-# Yocto ZynqMP FSBL variables
-YAML_SERIAL_CONSOLE_STDIN:pn-fsbl-firmware ?= "psu_uart_0"
-YAML_SERIAL_CONSOLE_STDOUT:pn-fsbl-firmware ?= "psu_uart_0"
-
 # Yocto ZynqMP KERNEL Variables
 UBOOT_ENTRYPOINT  ?= "0x200000"
 UBOOT_LOADADDRESS ?= "0x200000"
 
 # ZynqMP Serial Console
 SERIAL_CONSOLES ?= "115200;ttyPS0 115200;ttyPS1"
-YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200"
 
 require conf/machine/include/soc-zynqmp.inc
 require conf/machine/include/machine-xilinx-default.inc
 require conf/machine/include/machine-xilinx-qemu.inc
 
-# zynqmp-generic.conf uses zcu102-zynqmp xsa as reference input.
-# User can override with custom xsa using HDF_BASE and HDF_PATH variables from
-# local.conf.
-HDF_MACHINE = "zcu102-zynqmp"
-
 # Machine features must result in a superset
 # Basic features:
 MACHINE_FEATURES += "rtc ext2 ext3 vfat usbhost usbgadget wifi bluetooth"
@@ -64,40 +43,28 @@ IMAGE_CLASSES += "image-types-xilinx-qemu"
 # Add wic.qemu-sd only if initramfs_image not set due to circular dependecies
 IMAGE_FSTYPES += "${@'wic.qemu-sd' if (d.getVar('INITRAMFS_IMAGE') or '') == '' else 'cpio.gz.u-boot'}"
 
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "${PREFERRED_PROVIDER_virtual/dtb}"
-
 EXTRA_IMAGEDEPENDS += " \
-    libyaml-native \
-    python3-cython-native \
-    python3-pyyaml-native \
-    virtual/fsbl \
-    virtual/pmu-firmware \
-    arm-trusted-firmware \
-    virtual/boot-bin \
     virtual/bootloader \
-    qemu-devicetrees:do_deploy \
     u-boot-xlnx-uenv \
     u-boot-xlnx-scr \
     "
 
 IMAGE_BOOT_FILES += " \
-    boot.bin \
-    ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/dtb', 'device-tree', 'system.dtb', '', d)} \
     boot.scr \
     Image \
     "
 
 # ZynqMP QEMU Configurations
 # This machine has a QEMU model, runqemu setup:
-QB_MEM = "-m 4096"
+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@"
+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"
+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"
 
 # Two total serial ports defined in this model (according to the dts)
 #