17 files changed, 171 insertions, 216 deletions

diff --git a/meta-xilinx-core/conf/machine/README b/meta-xilinx-core/conf/machine/README
index f664a2f0..5db8fa8f 100644
--- a/meta-xilinx-core/conf/machine/README
+++ b/meta-xilinx-core/conf/machine/README
@@ -44,7 +44,6 @@ MACHINEOVERRIDES =. "${@['', 'my-example:']['my-example' != '${MACHINE}']}"
 
 require conf/machine/zynqmp-generic.conf
 
-HDF_MACHINE = "zcu102-zynqmp"
 MACHINE_FEATURES += "pci"
 
 #### No additional settings should be after the Postamble
@@ -67,7 +66,6 @@ DEFAULTTUNE ?= "aarch64"
 
 require conf/machine/zynqmp-generic.conf
 
-HDF_MACHINE = "zcu102-zynqmp"
 MACHINE_FEATURES += "pci"
 
 #### No additional settings should be after the Postamble
@@ -88,7 +86,6 @@ TUNE_FEATURES:tune-microblaze ?= "microblaze v8.50 barrel-shift reorder pattern-
 
 require conf/machine/microblaze-generic.conf
 
-HDF_MACHINE = "ml605"
 SERIAL_CONSOLE = "115200,ttyUL0"
 
 #### No additional settings should be after the Postamble
@@ -149,12 +146,17 @@ local.conf
 System wide setting:
 TUNE_FEATURES:tune-<tune> - Specific tune features
 
+XILINX_WITH_ESW = "xsct" or "sdt" - Specify xsct or sdt workflow
+
 external-hdf recipe from meta-xilinx-tools:
-HDF_MACHINE - Machine to load from reference defign xsa using hdf-examples recipe
-HDF_EXT - Only ".xsa" externsion is supported, legacy variable.
-HDF_BASE - Download protocol (file://, git://, http:// or https://) protocol if
-    not using the default external-hdf repository.
-HDF_PATH - Path to the repository or XSA file
+XILINX_XSCT_VERSION - Version of the XSCT tool and associated ESW software
+HDF_URI - URL for the .xsa file
+HDF_URI[sha256sum] - sha256sum of the .xsa
+
+sdt-artifacts recipe from meta-xilinx-standalone-sdt:
+SDT_URI - URI for the system device tree artifacts (usually a tarball)
+SDT_URI[sha256sum] - sha256sum of the SDT artifacts file
+SDT_URI[S] - the 'S' (source) directory where the artifacts are extracted
 
 fs-boot recipe from meta-xilinx-tools:
 YAML_SERIAL_CONSOLE_STDIN:pn-fs-boot - YAML based uart stdin configuration for
@@ -208,15 +210,3 @@ HAS_PLATFORM_INIT - List of defconfig files available for u-boot only for SPL bo
 u-boot-xlnx-scr recipe from meta-xilinx-core:
 DDR_BASEADDR - Base address for DDR used for loading the images from u-boot env.
 SKIP_APPEND_BASEADDR - Skip appending ${DDR_BASEADDR} for image offsets.
-
-Varibable set after required inclusion file:
-Varibables that does not intend to change must be set before required inclusion
-file.
-
-external-hdf recipe from meta-xilinx-tools:
-HDF_MACHINE - Used by the  recipe to find the correct XSA
-HDF_EXT - only xsa is supported, legacy variable
-HDF_BASE - protocol if not using the default external-hdf repository
-HDF_PATH - path to the repository or XSA file
-
-...and more...
diff --git a/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc b/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc
index 9284aa1f..cf890a51 100644
--- a/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc
+++ b/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc
@@ -1,5 +1,3 @@
-# HDF_MACHINE should be set _AFTER_ this has been loaded
-HDF_MACHINE_PRIOR := "${HDF_MACHINE}"
 INHERIT += "xilinx-vars"
 INHERIT += "xilinx-deprecated"
 
@@ -14,7 +12,7 @@ IMAGE_FSTYPES ?= "tar.gz cpio cpio.gz cpio.gz.u-boot"
 PREFERRED_PROVIDER_virtual/kernel ??= "linux-xlnx"
 
 # Device tree Configuration
-PREFERRED_PROVIDER_virtual/dtb ??= "device-tree"
+PREFERRED_PROVIDER_virtual/dtb ??= "${@'device-tree' if d.getVar('XILINX_WITH_ESW') else ''}"
 
 # U-Boot Configuration
 PREFERRED_PROVIDER_virtual/bootloader ??= "u-boot-xlnx"
@@ -82,6 +80,17 @@ IMAGE_BOOT_FILES ?= "${@get_default_image_boot_files(d)}"
 def get_default_image_boot_files(d):
     files = []
 
+    esw_type = d.getVar('XILINX_WITH_ESW') or ''
+    if esw_type:
+        if 'zynq' in d.getVar('OVERRIDES').split(':'):
+            files.append('boot.bin')
+        if 'zynqmp' in d.getVar('OVERRIDES').split(':'):
+            files.append('boot.bin')
+        if 'versal' in d.getVar('OVERRIDES').split(':'):
+            files.append('boot.bin')
+        if 'versal-net' in d.getVar('OVERRIDES').split(':'):
+            files.append('boot.bin')
+
     # kernel images
     kerneltypes = set((d.getVar("KERNEL_IMAGETYPE") or "").split())
     kerneltypes |= set((d.getVar("KERNEL_IMAGETYPES") or "").split())
@@ -95,6 +104,7 @@ def get_default_image_boot_files(d):
 
     # device trees (device-tree only), these are first as they are likely desired over the kernel ones
     if "device-tree" in (d.getVar("PREFERRED_PROVIDER_virtual/dtb") or ""):
+        files.append("system.dtb")
         files.append("devicetree/*.dtb;devicetree/")
         files.append("devicetree/*.dtbo;devicetree/")
 
@@ -107,6 +117,34 @@ def get_default_image_boot_files(d):
 
     return " ".join(files)
 
+EXTRA_IMAGEDEPENDS += "${@get_default_extra_imagedepends(d)}"
+
+def get_default_extra_imagedepends(d):
+    depends = []
+
+    # Add firmware dependencies
+    esw_type = d.getVar('XILINX_WITH_ESW') or ''
+    if esw_type:
+        depends.append('libyaml-native')
+        depends.append('python3-cython-native')
+        depends.append('python3-pyyaml-native')
+        if 'microblaze' in d.getVar('OVERRIDES').split(':'):
+            depends.append('virtual/bitstream')
+        if 'zynq' in d.getVar('OVERRIDES').split(':'):
+            depends.append('virtual/boot-bin')
+        if 'zynqmp' in d.getVar('OVERRIDES').split(':'):
+            depends.append('virtual/boot-bin')
+        if 'versal' in d.getVar('OVERRIDES').split(':'):
+            depends.append('virtual/boot-bin')
+            depends.append('virtual/cdo')
+        if 'versal-net' in d.getVar('OVERRIDES').split(':'):
+            depends.append('virtual/boot-bin')
+            depends.append('virtual/cdo')
+
+    return " ".join(depends)
+
+
+
 XSERVER_EXT ?= ""
 
 FPGA_MNGR_RECONFIG_ENABLE ?= "1"
diff --git a/meta-xilinx-core/conf/machine/include/machine-xilinx-qemu.inc b/meta-xilinx-core/conf/machine/include/machine-xilinx-qemu.inc
index c450b542..e75f556b 100644
--- a/meta-xilinx-core/conf/machine/include/machine-xilinx-qemu.inc
+++ b/meta-xilinx-core/conf/machine/include/machine-xilinx-qemu.inc
@@ -9,7 +9,7 @@ PREFERRED_PROVIDER_nativesdk-qemu = "nativesdk-qemu-xilinx"
 MACHINEOVERRIDES =. "qemuboot-xilinx:"
 
 # depend on qemu-helper-native, which will depend on QEMU
-EXTRA_IMAGEDEPENDS += "qemu-system-native qemu-helper-native:do_addto_recipe_sysroot"
+EXTRA_IMAGEDEPENDS += "qemu-devicetrees-native qemu-system-native qemu-helper-native:do_addto_recipe_sysroot"
 
 # Use the xilinx specific version for these users
 IMAGE_CLASSES += "qemuboot-xilinx"
@@ -21,5 +21,5 @@ IMAGE_CLASSES += "qemuboot-xilinx"
 # QB_XILINX_SERIAL that will allow us to define serial ports for qemu
 # emulated boards that may not match the standard Linux behavior.
 #
-QB_XILINX_SERIAL ?= ""
-QB_OPT_APPEND += "${QB_XILINX_SERIAL}"
+QB_XILINX_SERIAL ??= ""
+QB_OPT_APPEND += "${QB_XILINX_SERIAL} -nodefaults"
diff --git a/meta-xilinx-core/conf/machine/include/soc-tune-include.inc b/meta-xilinx-core/conf/machine/include/soc-tune-include.inc
index b3216426..197a998d 100644
--- a/meta-xilinx-core/conf/machine/include/soc-tune-include.inc
+++ b/meta-xilinx-core/conf/machine/include/soc-tune-include.inc
@@ -7,6 +7,7 @@ TUNEFILE[cortexr5hf] = "conf/machine/include/arm/armv7r/tune-cortexr5.inc"
 TUNEFILE[cortexr52] = "conf/machine/include/arm/armv8r/tune-cortexr52.inc"
 TUNEFILE[cortexr52hf] = "conf/machine/include/arm/armv8r/tune-cortexr52.inc"
 TUNEFILE[cortexa9thf-neon] = "conf/machine/include/arm/armv7a/tune-cortexa9.inc"
+TUNEFILE[cortexa9] = "conf/machine/include/arm/armv7a/tune-cortexa9.inc"
 TUNEFILE[armv8a] = "conf/machine/include/arm/arch-armv8a.inc"
 TUNEFILE[cortexa53] = "conf/machine/include/arm/armv8a/tune-cortexa53.inc"
 TUNEFILE[cortexa72] = "conf/machine/include/arm/armv8a/tune-cortexa72.inc"
diff --git a/meta-xilinx-core/conf/machine/include/soc-zynq.inc b/meta-xilinx-core/conf/machine/include/soc-zynq.inc
index 02220e8a..587a0d5a 100644
--- a/meta-xilinx-core/conf/machine/include/soc-zynq.inc
+++ b/meta-xilinx-core/conf/machine/include/soc-zynq.inc
@@ -9,11 +9,3 @@ KERNEL_IMAGETYPE ?= "uImage"
 KERNEL_IMAGETYPES += "zImage"
 
 UBOOT_ELF ?= "u-boot.elf"
-
-# Default, if multiconfig is off, the fsbl is in the regular deploydir, otherwise
-# it is located under a multiconfig specific deploydir
-FSBL_DEPENDS ?= "${@bb.utils.contains('BBMULTICONFIG', 'fsbl-fw', '', 'fsbl-firmware:do_deploy', d)}"
-FSBL_MCDEPENDS ?= "${@bb.utils.contains('BBMULTICONFIG', 'fsbl-fw', 'mc::fsbl-fw:fsbl-firmware:do_deploy', '', d)}"
-FSBL_DEPLOY_DIR ?= "${@bb.utils.contains('BBMULTICONFIG', 'fsbl-fw', '${TOPDIR}/tmp-fsbl-fw/deploy/images/${MACHINE}', '${DEPLOY_DIR_IMAGE}', d)}"
-FSBL_DEPLOY_DIR[vardepsexclude] += "TOPDIR"
-FSBL_IMAGE_NAME ?= "fsbl-${MACHINE}"
diff --git a/meta-xilinx-core/conf/machine/microblaze-generic.conf b/meta-xilinx-core/conf/machine/microblaze-generic.conf
index 8fb40070..39059511 100644
--- a/meta-xilinx-core/conf/machine/microblaze-generic.conf
+++ b/meta-xilinx-core/conf/machine/microblaze-generic.conf
@@ -2,11 +2,6 @@
 #@NAME: microblaze-generic
 #@DESCRIPTION: Machine configuration for the microblaze-generic devices
 
-# Deprecated board config
-USE_BOARD = "${@"conf/machine/include/xilinx-board-pre.inc" if d.getVar("BOARD") or d.getVar("BOARD_VARIANT") else ""}"
-require ${USE_BOARD}
-unset USE_BOARD
-
 #### Preamble
 MACHINEOVERRIDES =. "${@['', 'microblaze-generic:']['microblaze-generic' != '${MACHINE}']}"
 #### Regular settings follow
@@ -19,21 +14,6 @@ DEFAULTTUNE ?= "microblaze"
 # defined before calling the required inclusion file else pre-expansion value
 # defined in local.conf without machine override will not be reflected.
 
-# Yocto Microblaze device-tree variables
-YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "axi_uartlite_0"
-YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "DDR4_0"
-DT_PADDING_SIZE:pn-device-tree ?= "0x1000"
-DTC_FLAGS:pn-device-tree ?= ""
-XSCTH_PROC:pn-device-tree ?= "microblaze_0"
-YAML_DT_BOARD_FLAGS ?= "{BOARD kcu105}"
-
-# Yocto Microblaze FS-Boot variables
-YAML_SERIAL_CONSOLE_STDIN:pn-fs-boot ?= "axi_uartlite_0"
-YAML_SERIAL_CONSOLE_STDOUT:pn-fs-boot ?= "axi_uartlite_0"
-YAML_MAIN_MEMORY_CONFIG:pn-fs-boot ?= "DDR4_0"
-YAML_FLASH_MEMORY_CONFIG:pn-fs-boot ?= "axi_quad_spi_0"
-XSCTH_PROC:pn-fs-boot ?= "microblaze_0"
-
 # Yocto Microblaze u-boot-xlnx variables
 UBOOT_MACHINE ?= "microblaze-generic_defconfig"
 UBOOT_INITIAL_ENV = ""
@@ -46,7 +26,6 @@ KERNEL_EXTRA_ARGS += "UIMAGE_LOADADDR=${UBOOT_ENTRYPOINT}"
 
 # Microblaze Serial Console settings
 SERIAL_CONSOLES ?= "115200;ttyUL0"
-YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200"
 
 require conf/machine/include/soc-tune-include.inc
 require conf/machine/include/machine-xilinx-default.inc
@@ -60,27 +39,12 @@ MB_MACHINE_ARCH = "${@[d.getVar('TUNE_PKGARCH'), d.getVar('TUNE_PKGARCH') + '-ge
 
 MACHINE_ARCH = "${@['${MB_MACHINE_ARCH}', '${DEF_MACHINE_ARCH}']['microblaze-generic' != "${MACHINE}"]}"
 
-# microblaze-generic.conf uses kcu105-microblazeel xsa as reference input.
-# User can override with custom xsa using HDF_BASE and HDF_PATH variables from
-# local.conf.
-HDF_MACHINE = "kcu105-microblazeel"
-
 MACHINE_FEATURES = ""
 
 KERNEL_IMAGETYPE ?= "linux.bin.ub"
 KERNEL_IMAGETYPES = ""
 
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "${PREFERRED_PROVIDER_virtual/dtb}"
-
-IMAGE_BOOT_FILES += " \
-    ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/dtb', 'device-tree', 'system.dtb', '', d)} \
-    "
-
 EXTRA_IMAGEDEPENDS += " \
-    libyaml-native \
-    python3-cython-native \
-    python3-pyyaml-native \
-    virtual/bitstream \
     virtual/bootloader \
     virtual/elfrealloc \
     u-boot-xlnx-scr \
@@ -89,9 +53,9 @@ EXTRA_IMAGEDEPENDS += " \
 IMAGE_FSTYPES += "cpio.gz"
 
 # Microblaze QEMU Configurations
-QB_MEM = "-m 2G"
-QB_KERNEL_CMDLINE_APPEND = "console=ttyUL0,115200 root=/dev/ram0 rw"
-QB_NETWORK_DEVICE = "-net nic,netdev=net0,macaddr=@MAC@"
+QB_MEM ?= "-m 2G"
+QB_KERNEL_CMDLINE_APPEND ?= "console=ttyUL0,115200 root=/dev/ram0 rw"
+QB_NETWORK_DEVICE ?= "-net nic,netdev=net0,macaddr=@MAC@"
 
 # This will work with the default runqemu, as the first serial port is the
 # correct console
@@ -99,13 +63,8 @@ QB_NETWORK_DEVICE = "-net nic,netdev=net0,macaddr=@MAC@"
 # One total serial port defined in this model (according to the generated dts)
 #
 # hw serial0 axi_uartlite_0 (40600000) - linux serial0 (ttyUL0)
-QB_XILINX_SERIAL = ""
+QB_XILINX_SERIAL ?= ""
 
 #### No additional settings should be after the Postamble
 #### Postamble
 PACKAGE_EXTRA_ARCHS:append = "${@['', ' ${MB_MACHINE_ARCH}']['microblaze-generic' != "${MACHINE}"]}"
-
-# Deprecated board config
-USE_BOARD = "${@"conf/machine/include/xilinx-board-post.inc" if d.getVar("BOARD") or d.getVar("BOARD_VARIANT") else ""}"
-require ${USE_BOARD}
-unset USE_BOARD
diff --git a/meta-xilinx-core/conf/machine/versal-ai-edge-generic.conf b/meta-xilinx-core/conf/machine/versal-ai-edge-generic.conf
index 2b4f94d2..0d7f3223 100644
--- a/meta-xilinx-core/conf/machine/versal-ai-edge-generic.conf
+++ b/meta-xilinx-core/conf/machine/versal-ai-edge-generic.conf
@@ -8,9 +8,9 @@ MACHINE_FEATURES += "aie vdu"
 
 # VEK280 board has 12GB memory only but default versal-generic has QB_MEM set to
 # 8G, Hence we need set 12G in QB_MEM.
-QB_MEM = "-m 12G"
+QB_MEM ?= "-m 12G"
 
-QEMU_HW_DTB_PS = "${QEMU_HW_DTB_PATH}/board-versal-ps-vek280.dtb"
+QEMU_HW_DTB_PS ?= "${QEMU_HW_DTB_PATH}/board-versal-ps-vek280.dtb"
 
 #### No additional settings should be after the Postamble
 #### Postamble
diff --git a/meta-xilinx-core/conf/machine/versal-common.conf b/meta-xilinx-core/conf/machine/versal-common.conf
new file mode 100644
index 00000000..bc530d63
--- /dev/null
+++ b/meta-xilinx-core/conf/machine/versal-common.conf
@@ -0,0 +1,17 @@
+#@TYPE: Machine
+#@NAME: versal-common
+#@DESCRIPTION: Machine configuration for a common Versal filesystem devices
+
+#### Preamble
+MACHINEOVERRIDES =. "${@['', 'versal-common:']['versal-common' != '${MACHINE}']}"
+#### Regular settings follow
+
+DEFAULTTUNE = "cortexa72"
+
+require conf/machine/versal-generic.conf
+
+MACHINE_FEATURES += "aie vdu"
+
+#### No additional settings should be after the Postamble
+#### Postamble
+PACKAGE_EXTRA_ARCHS:append = "${@['', ' versal_common']['versal-common' != "${MACHINE}"]}"
diff --git a/meta-xilinx-core/conf/machine/versal-generic.conf b/meta-xilinx-core/conf/machine/versal-generic.conf
index aea77598..9aa47892 100644
--- a/meta-xilinx-core/conf/machine/versal-generic.conf
+++ b/meta-xilinx-core/conf/machine/versal-generic.conf
@@ -10,12 +10,6 @@ MACHINEOVERRIDES =. "${@['', 'versal-generic:']['versal-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 Versal device-tree variables
-YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "CIPS_0_pspmc_0_psv_sbsauart_0"
-DT_PADDING_SIZE:pn-device-tree ?= "0x1000"
-DTC_FLAGS:pn-device-tree = "-@"
-YAML_DT_BOARD_FLAGS ?= "{BOARD versal-vck190-reva-x-ebm-01-reva}"
-
 # Yocto Versal u-boot-xlnx variables
 UBOOT_MACHINE ?= "xilinx_versal_virt_defconfig"
 BOOTMODE ?= "generic.root"
@@ -23,64 +17,44 @@ BOOTMODE ?= "generic.root"
 # Yocto Versal arm-trusted-firmware(TF-A) variables
 TFA_BL33_LOAD ?= "0x8000000"
 
-# Yocto Versal PLM variables
-YAML_SERIAL_CONSOLE_STDIN:pn-plm-firmware ?= "CIPS_0_pspmc_0_psv_sbsauart_0"
-YAML_SERIAL_CONSOLE_STDOUT:pn-plm-firmware ?= "CIPS_0_pspmc_0_psv_sbsauart_0"
-
 # Yocto Versal KERNEL Variables
 UBOOT_ENTRYPOINT  ?= "0x200000"
 UBOOT_LOADADDRESS ?= "0x200000"
 
 # Versal Serial Console
 SERIAL_CONSOLES ?= "115200;ttyAMA0"
-YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200"
 
 require conf/machine/include/soc-versal.inc
 require conf/machine/include/machine-xilinx-default.inc
 require conf/machine/include/machine-xilinx-qemu.inc
 
-# versal-generic.conf uses vck190-versal xsa as reference input.
-# User can override with custom xsa using HDF_BASE and HDF_PATH variables from
-# local.conf.
-HDF_MACHINE = "vck190-versal"
-
 MACHINE_FEATURES += "rtc ext2 ext3 vfat usbhost"
 
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "${PREFERRED_PROVIDER_virtual/dtb}"
-
 # Default SD image build onfiguration, use qemu-sd to pad
 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.qemu-sd-fatimg'}"
 
 EXTRA_IMAGEDEPENDS += " \
-    libyaml-native \
-    python3-cython-native \
-    python3-pyyaml-native \
-    virtual/boot-bin \
     u-boot-xlnx-scr \
-    qemu-devicetrees:do_deploy \
-    virtual/cdo:do_deploy \
     "
 
 IMAGE_BOOT_FILES += " \
-    boot.bin \
-    ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/dtb', 'device-tree', 'system.dtb', '', d)} \
     Image \
     boot.scr \
     "
 
 # Versal QEMU Configurations
 # This machine has a QEMU model, runqemu setup:
-QB_MEM = "-m 8G"
-QB_DEFAULT_KERNEL = "none"
+QB_MEM ?= "-m 8G"
+QB_DEFAULT_KERNEL ?= "none"
 # Iteration appears to be eth0 then eth1
-QB_NETWORK_DEVICE = "-net nic,netdev=net0,macaddr=@MAC@ -net nic"
+QB_NETWORK_DEVICE ?= "-net nic,netdev=net0,macaddr=@MAC@ -net nic"
 QB_KERNEL_CMDLINE_APPEND ?= ""
 
-QEMU_HW_DTB_PATH = "${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch"
-QEMU_HW_DTB_PS = "${QEMU_HW_DTB_PATH}/board-versal-ps-vck190.dtb"
-QEMU_HW_DTB_PMC = "${QEMU_HW_DTB_PATH}/board-versal-pmc-virt.dtb"
+QEMU_HW_DTB_PATH ?= "${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch"
+QEMU_HW_DTB_PS ?= "${QEMU_HW_DTB_PATH}/board-versal-ps-vck190.dtb"
+QEMU_HW_DTB_PMC ?= "${QEMU_HW_DTB_PATH}/board-versal-pmc-virt.dtb"
 
 # Four total serial ports defined in this model (according to the dts)
 #
@@ -89,7 +63,7 @@ QEMU_HW_DTB_PMC = "${QEMU_HW_DTB_PATH}/board-versal-pmc-virt.dtb"
 # hw serial2 pl011 (ff000000)              - linux serial0 (ttyAMA0)
 # hw serial3 pl011 (ff010000)              - linux serial1 (ttyAMA1) (disabled)
 # ? dcc ?                                  - linux serial2 (????)
-QB_XILINX_SERIAL = "-serial null -serial null -serial mon:stdio -serial null"
+QB_XILINX_SERIAL ?= "-serial null -serial null -serial mon:stdio -serial null"
 
 QB_OSPI_FILE ??= ""
 
@@ -115,7 +89,7 @@ QB_FW_FILES = " \
     -device loader,file=${DEPLOY_DIR_IMAGE}/CDO/pmc_cdo.bin,addr=0xf2000000,force-raw \
     -device loader,file=${DEPLOY_DIR_IMAGE}/plm-${MACHINE}.elf,cpu-num=1 \
 "
-QB_PLM_OPT += "${@'' if d.getVar('QB_OSPI_FILE') else d.getVar('QB_FW_FILES')}"
+QB_PLM_OPT += "${@d.getVar('QB_FW_FILES') if d.getVar('QB_OSPI_FILE') == '' else ''}"
 
 QB_OPT_APPEND += " -plm-args '${QB_PLM_OPT}'"
 
diff --git a/meta-xilinx-core/conf/machine/versal-hbm-generic.conf b/meta-xilinx-core/conf/machine/versal-hbm-generic.conf
index 9fef78f3..805df7fc 100644
--- a/meta-xilinx-core/conf/machine/versal-hbm-generic.conf
+++ b/meta-xilinx-core/conf/machine/versal-hbm-generic.conf
@@ -6,9 +6,9 @@ require conf/machine/versal-generic.conf
 
 # VHK158 has 32GB memory only but default versal-generic has QB_MEM set to 8G,
 # Since versal-vhk158-reva.dts has 32GB set, we need set same in QB_MEM
-QB_MEM = "-m 32G"
+QB_MEM ?= "-m 32G"
 
-QEMU_HW_DTB_PS =  "${QEMU_HW_DTB_PATH}/board-versal-ps-vhk158.dtb"
+QEMU_HW_DTB_PS ?=  "${QEMU_HW_DTB_PATH}/board-versal-ps-vhk158.dtb"
 
 #### No additional settings should be after the Postamble
 #### Postamble
diff --git a/meta-xilinx-core/conf/machine/versal-net-common.conf b/meta-xilinx-core/conf/machine/versal-net-common.conf
new file mode 100644
index 00000000..efde0bbb
--- /dev/null
+++ b/meta-xilinx-core/conf/machine/versal-net-common.conf
@@ -0,0 +1,15 @@
+#@TYPE: Machine
+#@NAME: versal-net-common
+#@DESCRIPTION: Machine configuration for a common versal-net filesystem devices
+
+#### Preamble
+MACHINEOVERRIDES =. "${@['', 'versal-net-common:']['versal-net-common' != '${MACHINE}']}"
+#### Regular settings follow
+
+DEFAULTTUNE = "cortexa78"
+
+require conf/machine/versal-net-generic.conf
+
+#### No additional settings should be after the Postamble
+#### Postamble
+PACKAGE_EXTRA_ARCHS:append = "${@['', ' versal_net_common']['versal-net-common' != "${MACHINE}"]}"
diff --git a/meta-xilinx-core/conf/machine/versal-net-generic.conf b/meta-xilinx-core/conf/machine/versal-net-generic.conf
index 4895c5d0..b26fb5e1 100644
--- a/meta-xilinx-core/conf/machine/versal-net-generic.conf
+++ b/meta-xilinx-core/conf/machine/versal-net-generic.conf
@@ -10,12 +10,6 @@ MACHINEOVERRIDES =. "${@['', 'versal-net-generic:']['versal-net-generic' != '${M
 # defined before calling the required inclusion file else pre-expansion value
 # defined in local.conf without machine override will not be reflected.
 
-# Yocto Versal device-tree variables
-YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "psx_wizard_0_psxl_0_psx_sbsauart_0"
-DT_PADDING_SIZE:pn-device-tree ?= "0x1000"
-DTC_FLAGS:pn-device-tree = "-@"
-YAML_DT_BOARD_FLAGS ?= "{BOARD versal-net-ipp-rev1.9}"
-
 # Yocto Versal u-boot-xlnx variables
 UBOOT_MACHINE ?= "xilinx_versal_net_virt_defconfig"
 BOOTMODE ?= "generic.root"
@@ -23,64 +17,44 @@ BOOTMODE ?= "generic.root"
 # Yocto Versal arm-trusted-firmware(TF-A) variables
 TFA_BL33_LOAD ?= "0x8000000"
 
-# Yocto Versal PLM variables
-YAML_SERIAL_CONSOLE_STDIN:pn-plm-firmware ?= "psx_wizard_0_psxl_0_psx_sbsauart_0"
-YAML_SERIAL_CONSOLE_STDOUT:pn-plm-firmware ?= "psx_wizard_0_psxl_0_psx_sbsauart_0"
-
 # Yocto Versal KERNEL Variables
 UBOOT_ENTRYPOINT  ?= "0x200000"
 UBOOT_LOADADDRESS ?= "0x200000"
 
 # Versal Serial Console
 SERIAL_CONSOLES ?= "115200;ttyAMA0 115200;ttyAMA1"
-YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200"
 
 require conf/machine/include/soc-versal-net.inc
 require conf/machine/include/machine-xilinx-default.inc
 require conf/machine/include/machine-xilinx-qemu.inc
 
-# versal-net-generic.conf uses a qemu only xsa as reference input.
-# User can override with custom xsa using HDF_BASE and HDF_PATH variables from
-# local.conf.
-HDF_MACHINE = "versal-net-generic"
-
 MACHINE_FEATURES += "rtc ext2 ext3 vfat usbhost"
 
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "${PREFERRED_PROVIDER_virtual/dtb}"
-
 # Default SD image build onfiguration, use qemu-sd to pad
 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.qemu-sd-fatimg'}"
 
 EXTRA_IMAGEDEPENDS += " \
-    libyaml-native \
-    python3-cython-native \
-    python3-pyyaml-native \
-    virtual/boot-bin \
     u-boot-xlnx-scr \
-    qemu-devicetrees:do_deploy \
-    virtual/cdo:do_deploy \
     "
 
 IMAGE_BOOT_FILES += " \
-    boot.bin \
-    ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/dtb', 'device-tree', 'system.dtb', '', d)} \
     Image \
     boot.scr \
     "
 
 # Versal QEMU Configurations
 # This machine has a QEMU model, runqemu setup:
-QB_MEM = "-m 8G"
-QB_DEFAULT_KERNEL = "none"
+QB_MEM ?= "-m 8G"
+QB_DEFAULT_KERNEL ?= "none"
 # Iteration appears to be eth0 then eth1
-QB_NETWORK_DEVICE = "-net nic,netdev=net0,macaddr=@MAC@ -net nic"
+QB_NETWORK_DEVICE ?= "-net nic,netdev=net0,macaddr=@MAC@ -net nic"
 QB_KERNEL_CMDLINE_APPEND ?= ""
 
-QEMU_HW_DTB_PATH = "${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch"
-QEMU_HW_DTB_PS =  "${QEMU_HW_DTB_PATH}/board-versal-net-psx-spp-1.4.dtb"
-QEMU_HW_DTB_PMC = "${QEMU_HW_DTB_PATH}/board-versal-pmx-virt.dtb"
+QEMU_HW_DTB_PATH ?= "${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch"
+QEMU_HW_DTB_PS ?=  "${QEMU_HW_DTB_PATH}/board-versal-net-psx-spp-1.4.dtb"
+QEMU_HW_DTB_PMC ?= "${QEMU_HW_DTB_PATH}/board-versal-pmx-virt.dtb"
 
 # Four total serial ports defined in this model (according to the dts)
 #
@@ -88,7 +62,7 @@ QEMU_HW_DTB_PMC = "${QEMU_HW_DTB_PATH}/board-versal-pmx-virt.dtb"
 # hw serial1 xps-uartlite (0xf0310000) - 
 # hw serial2 pl011 (0xf1920000)        - linux serial0 (ttyAMA0)
 # hw serial3 pl011 (0xf1930000)        - linux serial1 (ttyAMA1)
-QB_XILINX_SERIAL = "-serial null -serial null -serial mon:stdio -serial null"
+QB_XILINX_SERIAL ?= "-serial null -serial null -serial mon:stdio -serial null"
 
 QB_OSPI_FILE ??= ""
 
@@ -110,11 +84,11 @@ QB_PLM_OPT = " \
     "
 
 QB_FW_FILES = " \
-    -device loader,file=${DEPLOY_DIR_IMAGE}/BOOT-${MACHINE}_bh.bin,addr=0xF201E000,force-raw \
-    -device loader,file=${DEPLOY_DIR_IMAGE}/CDO/pmc_cdo.bin,addr=0xf2000000,force-raw \
+    -device loader,file=${DEPLOY_DIR_IMAGE}/BOOT-${MACHINE}_bh.bin,addr=0xF201E000,force-raw=on \
+    -device loader,file=${DEPLOY_DIR_IMAGE}/CDO/pmc_cdo.bin,addr=0xf2000000,force-raw=on \
     -device loader,file=${DEPLOY_DIR_IMAGE}/plm-${MACHINE}.elf,cpu-num=1 \
 "
-QB_PLM_OPT += "${@'' if d.getVar('QB_OSPI_FILE') else d.getVar('QB_FW_FILES')}"
+QB_PLM_OPT += "${@d.getVar('QB_FW_FILES') if d.getVar('QB_OSPI_FILE') == '' else ''}"
 
 QB_OPT_APPEND += " -plm-args '${QB_PLM_OPT}'"
 
diff --git a/meta-xilinx-core/conf/machine/zynq-common.conf b/meta-xilinx-core/conf/machine/zynq-common.conf
new file mode 100644
index 00000000..f54b6e5b
--- /dev/null
+++ b/meta-xilinx-core/conf/machine/zynq-common.conf
@@ -0,0 +1,15 @@
+#@TYPE: Machine
+#@NAME: zynq-common
+#@DESCRIPTION: Machine configuration for a common Zynq7 filesystem devices
+
+#### Preamble
+MACHINEOVERRIDES =. "${@['', 'zynq-common:']['zynq-common' != '${MACHINE}']}"
+#### Regular settings follow
+
+DEFAULTTUNE = "cortexa9thf-neon"
+
+require conf/machine/zynq-generic.conf
+
+#### No additional settings should be after the Postamble
+#### Postamble
+PACKAGE_EXTRA_ARCHS:append = "${@['', ' zynq_common']['zynq-common' != "${MACHINE}"]}"
diff --git a/meta-xilinx-core/conf/machine/zynq-generic.conf b/meta-xilinx-core/conf/machine/zynq-generic.conf
index 27b10833..8442e4e3 100644
--- a/meta-xilinx-core/conf/machine/zynq-generic.conf
+++ b/meta-xilinx-core/conf/machine/zynq-generic.conf
@@ -10,21 +10,10 @@ MACHINEOVERRIDES =. "${@['', 'zynq-generic:']['zynq-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 Zynq-7000 device-tree variables
-YAML_CONSOLE_DEVICE_CONFIG:pn-device-tree ?= "ps7_uart_1"
-YAML_MAIN_MEMORY_CONFIG:pn-device-tree ?= "PS7_DDR_0"
-DT_PADDING_SIZE:pn-device-tree ?= "0x1000"
-DTC_FLAGS:pn-device-tree = "-@"
-YAML_DT_BOARD_FLAGS ?= "{BOARD zc702}"
-
 # Yocto Zynq-7000 u-boot-xlnx variables
 UBOOT_MACHINE ?= "xilinx_zynq_virt_defconfig"
 BOOTMODE ?= "generic.root"
 
-# Yocto Zynq-7000 FSBL variables
-YAML_SERIAL_CONSOLE_STDIN:pn-fsbl-firmware ?= "ps7_uart_1"
-YAML_SERIAL_CONSOLE_STDOUT:pn-fsbl-firmware ?= "ps7_uart_1"
-
 # Yocto KERNEL Variables
 UBOOT_ENTRYPOINT  ?= "0x200000"
 UBOOT_LOADADDRESS ?= "0x200000"
@@ -32,31 +21,18 @@ KERNEL_EXTRA_ARGS += "UIMAGE_LOADADDR=${UBOOT_ENTRYPOINT}"
 
 # Zynq-7000 Serial Console settings
 SERIAL_CONSOLES ?= "115200;ttyPS0"
-YAML_SERIAL_CONSOLE_BAUDRATE ?= "115200"
 
 require conf/machine/include/soc-zynq.inc
 require conf/machine/include/machine-xilinx-default.inc
 require conf/machine/include/machine-xilinx-qemu.inc
 
-# zynq-generic.conf uses zc702-zynq7 xsa as reference input.
-# User can override with custom xsa using HDF_BASE and HDF_PATH variables from
-# local.conf.
-HDF_MACHINE = "zc702-zynq7"
-
 MACHINE_FEATURES += "rtc ext2 ext3 vfat usbhost usbgadget"
 
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "${PREFERRED_PROVIDER_virtual/dtb}"
-
 EXTRA_IMAGEDEPENDS += " \
-    libyaml-native \
-    python3-cython-native \
-    python3-pyyaml-native \
     u-boot-xlnx-scr \
     "
 
 IMAGE_BOOT_FILES += " \
-    boot.bin \
-    ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/dtb', 'device-tree', 'system.dtb', '', d)} \
     boot.scr \
     uImage \
     "
@@ -67,10 +43,10 @@ IMAGE_FSTYPES += "${@'wic.qemu-sd' if (d.getVar('INITRAMFS_IMAGE') or '') == ''
 
 # Zynq-7000 QEMU Configurations
 # This machine has a QEMU model, runqemu setup:
-QB_MEM = "-m 1024"
-QB_NETWORK_DEVICE = "-net nic,netdev=net0,macaddr=@MAC@"
+QB_MEM ?= "-m 1024"
+QB_NETWORK_DEVICE ?= "-net nic,netdev=net0,macaddr=@MAC@"
 
-QB_KERNEL_ROOT = "/dev/mmcblk0p2"
+QB_KERNEL_ROOT ?= "/dev/mmcblk0p2"
 
 # Side effect of not-enabled serial port is we have to lock
 # the second (console) to mon:stdio.
@@ -79,7 +55,7 @@ QB_KERNEL_ROOT = "/dev/mmcblk0p2"
 #
 # hw uart0 xuartps (e0000000) -
 # hw uart1 xuartps (e0001000) - linux serial0 (ttyPS0)
-QB_XILINX_SERIAL = "-serial null -serial mon:stdio"
+QB_XILINX_SERIAL ?= "-serial null -serial mon:stdio"
 
 # Replicate BootROM like behaviour, having loaded SPL and PMU(ROM+FW)
 QB_OPT_APPEND += " \
diff --git a/meta-xilinx-core/conf/machine/zynqmp-common.conf b/meta-xilinx-core/conf/machine/zynqmp-common.conf
new file mode 100644
index 00000000..e2e112f9
--- /dev/null
+++ b/meta-xilinx-core/conf/machine/zynqmp-common.conf
@@ -0,0 +1,17 @@
+#@TYPE: Machine
+#@NAME: zynqmp-common
+#@DESCRIPTION: Machine configuration for a common ZynqMP (MPSOC) filesystem devices w/o mali400
+
+#### Preamble
+MACHINEOVERRIDES =. "${@['', 'zynqmp-common:']['zynqmp-common' != '${MACHINE}']}"
+#### Regular settings follow
+
+DEFAULTTUNE = "cortexa53"
+
+require conf/machine/zynqmp-generic.conf
+
+MACHINE_FEATURES += "vcu rfsoc"
+
+#### No additional settings should be after the Postamble
+#### Postamble
+PACKAGE_EXTRA_ARCHS:append = "${@['', ' zynqmp_common']['zynqmp-common' != "${MACHINE}"]}"
diff --git a/meta-xilinx-core/conf/machine/zynqmp-generic.conf b/meta-xilinx-core/conf/machine/zynqmp-generic.conf
index c69fcd1d..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,37 +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/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)
 #
diff --git a/meta-xilinx-core/conf/machine/zynqmp-mali-common.conf b/meta-xilinx-core/conf/machine/zynqmp-mali-common.conf
new file mode 100644
index 00000000..7b5dc68c
--- /dev/null
+++ b/meta-xilinx-core/conf/machine/zynqmp-mali-common.conf
@@ -0,0 +1,17 @@
+#@TYPE: Machine
+#@NAME: zynqmp-mali-common
+#@DESCRIPTION: Machine configuration for a common ZynqMP (MPSOC) filesystem devices w/ mali400
+
+#### Preamble
+MACHINEOVERRIDES =. "${@['', 'zynqmp-mali-common:']['zynqmp-mali-common' != '${MACHINE}']}"
+#### Regular settings follow
+
+DEFAULTTUNE = "cortexa53"
+
+require conf/machine/zynqmp-generic.conf
+
+MACHINE_FEATURES += "mali400 vcu"
+
+#### No additional settings should be after the Postamble
+#### Postamble
+PACKAGE_EXTRA_ARCHS:append = "${@['', ' zynqmp_mali_common']['zynqmp-mali-common' != "${MACHINE}"]}"