Initial restructure/split of meta-xilinx-bsp

Create a new meta-xilinx-core, move core functionality to the core, keeping
board specific files in the bsp layer.

zynqmp-generic changed from require <board> to include, so if meta-xilinx-bsp
is not available it will not fail.

Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>

198 files changed, 343 insertions, 223 deletions

diff --git a/meta-xilinx-bsp/README.building.md b/README.building.md
index 230037c1..230037c1 100644
--- a/meta-xilinx-bsp/README.building.md
+++ b/README.building.md
diff --git a/meta-microblaze/recipes-core/newlib/microblaze-newlib.inc b/meta-microblaze/recipes-core/newlib/microblaze-newlib.inc
index a32bb1d1..a1e3b92f 100644
--- a/meta-microblaze/recipes-core/newlib/microblaze-newlib.inc
+++ b/meta-microblaze/recipes-core/newlib/microblaze-newlib.inc
@@ -14,6 +14,6 @@ SRC_URI:append:microblaze = " \
     file://0011-Fixed-the-bug-in-crtinit.s-for-MB-64.patch \
     "
 
-EXTRA_OECONF:append_xilinx-standalone:microblaze = " \
+EXTRA_OECONF:append:xilinx-standalone:microblaze = " \
     --disable-newlib-reent-check-verify \
 "
diff --git a/meta-xilinx-bsp/conf/0001-local.conf.sample-PMU_ROM-to-use-pmu-rom.elf-from-pr.patch b/meta-xilinx-bsp/conf/0001-local.conf.sample-PMU_ROM-to-use-pmu-rom.elf-from-pr.patch
deleted file mode 100644
index f7d487fe..00000000
--- a/meta-xilinx-bsp/conf/0001-local.conf.sample-PMU_ROM-to-use-pmu-rom.elf-from-pr.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 4694f1ef8bdb40f5aa82597a62f2a8a8a5a38969 Mon Sep 17 00:00:00 2001
-From: Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com>
-Date: Thu, 13 Aug 2020 16:56:12 -0700
-Subject: [meta-xilinx-bsp][master-upstream][PATCH] local.conf.sample: PMU_ROM
- to use pmu-rom.elf from /proj/yocto
-
-Users have to manually copy pmu-rom.elf to DEPLOY_DIR when using runqemu.
-Enable PMU_ROM line within local.conf to use pmu from /proj/yocto/pmu-rom/
-
-Signed-off-by: Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com>
----
- meta-xilinx-bsp/conf/local.conf.sample | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/meta-xilinx-bsp/conf/local.conf.sample b/meta-xilinx-bsp/conf/local.conf.sample
-index 377a519..5d567af 100644
---- a/meta-xilinx-bsp/conf/local.conf.sample
-+++ b/meta-xilinx-bsp/conf/local.conf.sample
-@@ -231,3 +231,5 @@ PMU_FIRMWARE_IMAGE_NAME = "pmu-firmware-${MACHINE}"
- # this doesn't mean anything to you.
- CONF_VERSION = "1"
- 
-+#Enable the below line to use pmu-rom.elf from a specific path
-+#PMU_ROM = "/proj/yocto/pmu-rom/pmu-rom.elf"
--- 
-2.7.4
-
diff --git a/meta-xilinx-bsp/conf/layer.conf b/meta-xilinx-bsp/conf/layer.conf
index 7d414c0a..cee8b3c8 100644
--- a/meta-xilinx-bsp/conf/layer.conf
+++ b/meta-xilinx-bsp/conf/layer.conf
@@ -5,38 +5,10 @@ BBPATH .= ":${LAYERDIR}"
 BBFILES += "${LAYERDIR}/recipes-*/*/*.bb"
 BBFILES += "${LAYERDIR}/recipes-*/*/*.bbappend"
 
-BBFILE_COLLECTIONS += "xilinx"
-BBFILE_PATTERN_xilinx = "^${LAYERDIR}/"
-BBFILE_PRIORITY_xilinx = "5"
+BBFILE_COLLECTIONS += "xilinx-bsp"
+BBFILE_PATTERN_xilinx-bsp = "^${LAYERDIR}/"
+BBFILE_PRIORITY_xilinx-bsp = "5"
 
-BBFILES_DYNAMIC += " \
-openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/recipes-*/*/*.bb \
-openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/recipes-*/*/*.bbappend \
-chromium-browser-layer:${LAYERDIR}/dynamic-layers/chromium-browser-layer/recipes-*/*/*.bb \
-chromium-browser-layer:${LAYERDIR}/dynamic-layers/chromium-browser-layer/recipes-*/*/*.bbappend \
-"
+LAYERDEPENDS_xilinx-bsp = "xilinx"
 
-LAYERDEPENDS_xilinx = "core"
-
-LAYERSERIES_COMPAT_xilinx = " gatesgarth honister hardknott"
-
-SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
-  *->zocl \
-  *->cairo \
-  *->libepoxy \
-  *->gstreamer1.0-plugins-base \
-  *->gtk+ \
-  *->gtk+3 \
-  *->libglu \
-  *->libsdl \
-  *->libsdl2 \
-  *->mesa \
-  *->mesa-gl \
-  *->qemu \
-  *->virglrenderer \
-  *->xserver-xorg \
-"
-
-XILINX_RELEASE_VERSION = "v2021.2"
-
-HOSTTOOLS += "xxd"
+LAYERSERIES_COMPAT_xilinx-bsp = "honister"
diff --git a/meta-xilinx-bsp/conf/machine/include/board/ultra96.inc b/meta-xilinx-bsp/conf/machine/include/board/ultra96.inc
index d028336a..0ff5e3d5 100644
--- a/meta-xilinx-bsp/conf/machine/include/board/ultra96.inc
+++ b/meta-xilinx-bsp/conf/machine/include/board/ultra96.inc
@@ -3,5 +3,5 @@ PACKAGE_ARCH:pn-linux-xlnx:ultra96 = "${BOARDVARIANT_ARCH}"
 KERNEL_DEVICETREE:ultra96 = "xilinx/zynqmp-zcu100-revC.dtb"
 
 # Enable bluetooth and wifi module
-MACHINE_ESSENTIAL_EXTRA_RDEPENDS:append:ultra96 = " linux-firmware-wl18xx linux-firmware-ti-bt-wl180x"
+#MACHINE_ESSENTIAL_EXTRA_RDEPENDS:append:ultra96 = " linux-firmware-wl18xx linux-firmware-ti-bt-wl181x"
 
diff --git a/meta-xilinx-bsp/conf/machine/qemu-zynq7.conf b/meta-xilinx-bsp/conf/machine/qemu-zynq7.conf
index 5f25600f..8697293d 100644
--- a/meta-xilinx-bsp/conf/machine/qemu-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/qemu-zynq7.conf
@@ -20,12 +20,12 @@ FILESOVERRIDES:append:pn-init-ifupdown = ":qemuarm"
 
 QB_MEM = "-m 1024"
 QB_NETWORK_DEVICE = "-net nic,netdev=eth0 -netdev user,id=eth0,tftp=/tftpboot -net nic"
-QB_DEFAULT_KERNEL_qemuboot-xilinx = "zImage"
+QB_DEFAULT_KERNEL:qemuboot-xilinx = "zImage"
 
 QB_SYSTEM_NAME ?= "${@qemu_target_binary(d)}"
 QB_DEFAULT_FSTYPE = "cpio.gz.u-boot"
 QB_DTB = "system.dtb"
-QB_ROOTFS_OPT_qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw"
+QB_ROOTFS_OPT:qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw"
 
 # Replicate BootROM like behaviour, having loaded SPL and PMU(ROM+FW)
 QB_OPT_APPEND = " \
diff --git a/meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf b/meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf
index 558cc85e..8603098e 100644
--- a/meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/vc-p-a2197-00-versal.conf
@@ -43,14 +43,14 @@ QB_NETWORK_DEVICE = ""
 QB_KERNEL_CMDLINE_APPEND ?= ""
 QB_NET = "none"
 
-QB_DEFAULT_FSTYPE_qemuboot-xilinx = "wic.qemu-sd"
-QB_OPT_APPEND:append_qemuboot-xilinx = " -boot mode=5"
-QB_ROOTFS_OPT_qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw"
+QB_DEFAULT_FSTYPE:qemuboot-xilinx = "wic.qemu-sd"
+QB_OPT_APPEND:append:qemuboot-xilinx = " -boot mode=5"
+QB_ROOTFS_OPT:qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw"
 
 # Use booti 80000 6000000 4000000 to launch
 QB_OPT_APPEND ?= " -serial null -serial null -serial mon:stdio -display none"
 
-QB_OPT_APPEND:append_qemuboot-xilinx = " \
+QB_OPT_APPEND:append:qemuboot-xilinx = " \
     -hw-dtb ${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch/board-versal-ps-vc-p-a2197-00.dtb \
     -display none \
     -net nic -net user,tftp=${DEPLOY_DIR_IMAGE} \
@@ -68,5 +68,5 @@ QB_PLM_OPT = " \
     -hw-dtb ${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch/board-versal-pmc-vc-p-a2197-00.dtb \
     -display none \
     "
-QB_OPT_APPEND:append_qemuboot-xilinx = " -plm-args '${QB_PLM_OPT}'"
+QB_OPT_APPEND:append:qemuboot-xilinx = " -plm-args '${QB_PLM_OPT}'"
 
diff --git a/meta-xilinx-bsp/conf/machine/vck190-versal.conf b/meta-xilinx-bsp/conf/machine/vck190-versal.conf
index 62c9bc04..054bff88 100644
--- a/meta-xilinx-bsp/conf/machine/vck190-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/vck190-versal.conf
@@ -44,14 +44,14 @@ QB_NETWORK_DEVICE = ""
 QB_KERNEL_CMDLINE_APPEND ?= ""
 QB_NET = "none"
 
-QB_DEFAULT_FSTYPE_qemuboot-xilinx = "wic.qemu-sd"
-QB_OPT_APPEND:append_qemuboot-xilinx = " -boot mode=5"
-QB_ROOTFS_OPT_qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw"
+QB_DEFAULT_FSTYPE:qemuboot-xilinx = "wic.qemu-sd"
+QB_OPT_APPEND:append:qemuboot-xilinx = " -boot mode=5"
+QB_ROOTFS_OPT:qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw"
 
 # Use booti 80000 6000000 4000000 to launch
 QB_OPT_APPEND ?= " -serial null -serial null -serial mon:stdio -display none"
 
-QB_OPT_APPEND:append_qemuboot-xilinx = " \
+QB_OPT_APPEND:append:qemuboot-xilinx = " \
     -hw-dtb ${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch/board-versal-ps-vc-p-a2197-00.dtb \
     -display none \
     -net nic -net user,tftp=${DEPLOY_DIR_IMAGE} \
@@ -70,4 +70,4 @@ QB_PLM_OPT = " \
     -hw-dtb ${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch/board-versal-pmc-vc-p-a2197-00.dtb \
     -display none \
     "
-QB_OPT_APPEND:append_qemuboot-xilinx = " -plm-args '${QB_PLM_OPT}'"
+QB_OPT_APPEND:append:qemuboot-xilinx = " -plm-args '${QB_PLM_OPT}'"
diff --git a/meta-xilinx-bsp/conf/machine/vmk180-versal.conf b/meta-xilinx-bsp/conf/machine/vmk180-versal.conf
index 39801e22..1996a36e 100644
--- a/meta-xilinx-bsp/conf/machine/vmk180-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/vmk180-versal.conf
@@ -41,14 +41,14 @@ QB_NETWORK_DEVICE = ""
 QB_KERNEL_CMDLINE_APPEND ?= ""
 QB_NET = "none"
 
-QB_DEFAULT_FSTYPE_qemuboot-xilinx = "wic.qemu-sd"
-QB_OPT_APPEND:append_qemuboot-xilinx = " -boot mode=5"
-QB_ROOTFS_OPT_qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw"
+QB_DEFAULT_FSTYPE:qemuboot-xilinx = "wic.qemu-sd"
+QB_OPT_APPEND:append:qemuboot-xilinx = " -boot mode=5"
+QB_ROOTFS_OPT:qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw"
 
 # Use booti 80000 6000000 4000000 to launch
 QB_OPT_APPEND ?= " -serial null -serial null -serial mon:stdio -display none"
 
-QB_OPT_APPEND:append_qemuboot-xilinx = " \
+QB_OPT_APPEND:append:qemuboot-xilinx = " \
     -hw-dtb ${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch/board-versal-ps-vc-p-a2197-00.dtb \
     -display none \
     -net nic -net user,tftp=${DEPLOY_DIR_IMAGE} \
@@ -67,4 +67,4 @@ QB_PLM_OPT = " \
     -hw-dtb ${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch/board-versal-pmc-vc-p-a2197-00.dtb \
     -display none \
     "
-QB_OPT_APPEND:append_qemuboot-xilinx = " -plm-args '${QB_PLM_OPT}'"
+QB_OPT_APPEND:append:qemuboot-xilinx = " -plm-args '${QB_PLM_OPT}'"
diff --git a/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf b/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf
index 82d47cb4..224365fa 100644
--- a/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf
@@ -38,12 +38,12 @@ IMAGE_BOOT_FILES += " \
 
 QB_MEM = "-m 1024"
 QB_NETWORK_DEVICE = "-net nic,netdev=eth0 -netdev user,id=eth0,tftp=/tftpboot -net nic"
-QB_DEFAULT_KERNEL_qemuboot-xilinx = "zImage"
+QB_DEFAULT_KERNEL:qemuboot-xilinx = "zImage"
 
 QB_SYSTEM_NAME ?= "${@qemu_target_binary(d)}"
 QB_DEFAULT_FSTYPE = "cpio.gz.u-boot"
 QB_DTB = "system.dtb"
-QB_ROOTFS_OPT_qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw"
+QB_ROOTFS_OPT:qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw"
 
 # Replicate BootROM like behaviour, having loaded SPL and PMU(ROM+FW)
 QB_OPT_APPEND = " \
diff --git a/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf b/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf
index b5268689..3a182217 100644
--- a/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf
@@ -38,12 +38,12 @@ IMAGE_BOOT_FILES += " \
 
 QB_MEM = "-m 1024"
 QB_NETWORK_DEVICE = "-net nic,netdev=eth0 -netdev user,id=eth0,tftp=/tftpboot -net nic"
-QB_DEFAULT_KERNEL_qemuboot-xilinx = "zImage"
+QB_DEFAULT_KERNEL:qemuboot-xilinx = "zImage"
 
 QB_SYSTEM_NAME ?= "${@qemu_target_binary(d)}"
 QB_DEFAULT_FSTYPE = "cpio.gz.u-boot"
 QB_DTB = "system.dtb"
-QB_ROOTFS_OPT_qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw"
+QB_ROOTFS_OPT:qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw"
 
 # Replicate BootROM like behaviour, having loaded SPL and PMU(ROM+FW)
 QB_OPT_APPEND = " \
diff --git a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
index 57570531..89c997f1 100644
--- a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
@@ -42,7 +42,7 @@ QB_OPT_APPEND ?= "-nographic -serial mon:stdio -serial null"
 QB_NETWORK_DEVICE = "-net nic -net nic -net nic -net nic,netdev=net0,macaddr=@MAC@"
 
 # Replicate BootROM like behaviour, having loaded SPL and PMU(ROM+FW)
-QB_OPT_APPEND:append_qemuboot-xilinx = " \
+QB_OPT_APPEND:append:qemuboot-xilinx = " \
                 -hw-dtb ${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch/zcu102-arm.dtb \
                 ${@qemu_zynqmp_unhalt(d, True)} \
                 -device loader,file=${DEPLOY_DIR_IMAGE}/arm-trusted-firmware.elf,cpu-num=0 \
@@ -51,9 +51,9 @@ QB_OPT_APPEND:append_qemuboot-xilinx = " \
                 "
 
 # Attach the rootfs disk image to the second SD interface of QEMU (which is SD0)
-QB_DEFAULT_FSTYPE_qemuboot-xilinx = "wic.qemu-sd"
-QB_OPT_APPEND:append_qemuboot-xilinx = " -boot mode=5"
-QB_ROOTFS_OPT_qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw"
+QB_DEFAULT_FSTYPE:qemuboot-xilinx = "wic.qemu-sd"
+QB_OPT_APPEND:append:qemuboot-xilinx = " -boot mode=5"
+QB_ROOTFS_OPT:qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw"
 
 QB_PMU_OPT = " \
                 -M microblaze-fdt \
@@ -64,6 +64,6 @@ QB_PMU_OPT = " \
                 -device loader,addr=0xfd1a0074,data=0x1011003,data-len=4 \
                 -device loader,addr=0xfd1a007C,data=0x1010f03,data-len=4 \
                 "
-QB_OPT_APPEND:append_qemuboot-xilinx = " -pmu-args '${QB_PMU_OPT}'"
+QB_OPT_APPEND:append:qemuboot-xilinx = " -pmu-args '${QB_PMU_OPT}'"
 
 do_write_qemuboot_conf[depends] += "u-boot-zynq-uenv:do_deploy"
diff --git a/meta-xilinx-bsp/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-x11_%.bbappend b/meta-xilinx-bsp/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-x11_%.bbappend
deleted file mode 100644
index c3f773d6..00000000
--- a/meta-xilinx-bsp/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-x11_%.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-# Has a dependency on libmali
-PACKAGE_ARCH_mali400 = "${SOC_VARIANT_ARCH}"
diff --git a/meta-xilinx-bsp/recipes-devtools/qemu/qemu_%.bbappend b/meta-xilinx-bsp/recipes-devtools/qemu/qemu_%.bbappend
deleted file mode 100644
index c3f773d6..00000000
--- a/meta-xilinx-bsp/recipes-devtools/qemu/qemu_%.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-# Has a dependency on libmali
-PACKAGE_ARCH_mali400 = "${SOC_VARIANT_ARCH}"
diff --git a/meta-xilinx-bsp/recipes-gnome/gtk+/gtk+3_%.bbappend b/meta-xilinx-bsp/recipes-gnome/gtk+/gtk+3_%.bbappend
deleted file mode 100644
index c3f773d6..00000000
--- a/meta-xilinx-bsp/recipes-gnome/gtk+/gtk+3_%.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-# Has a dependency on libmali
-PACKAGE_ARCH_mali400 = "${SOC_VARIANT_ARCH}"
diff --git a/meta-xilinx-bsp/recipes-graphics/cairo/cairo_%.bbappend b/meta-xilinx-bsp/recipes-graphics/cairo/cairo_%.bbappend
deleted file mode 100644
index 6343c38f..00000000
--- a/meta-xilinx-bsp/recipes-graphics/cairo/cairo_%.bbappend
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGECONFIG_mali400 = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xcb', '', d)} \
-                         egl glesv2"
-
-# OpenGL comes from libmali
-DEPENDS:append_mali400 = " libmali-xlnx"
-
-PACKAGE_ARCH_mali400 = "${SOC_VARIANT_ARCH}"
diff --git a/meta-xilinx-bsp/recipes-graphics/libepoxy/libepoxy_%.bbappend b/meta-xilinx-bsp/recipes-graphics/libepoxy/libepoxy_%.bbappend
deleted file mode 100644
index c3f773d6..00000000
--- a/meta-xilinx-bsp/recipes-graphics/libepoxy/libepoxy_%.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-# Has a dependency on libmali
-PACKAGE_ARCH_mali400 = "${SOC_VARIANT_ARCH}"
diff --git a/meta-xilinx-bsp/recipes-graphics/libglu/libglu_%.bbappend b/meta-xilinx-bsp/recipes-graphics/libglu/libglu_%.bbappend
deleted file mode 100644
index 47cefc74..00000000
--- a/meta-xilinx-bsp/recipes-graphics/libglu/libglu_%.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-# OpenGL comes from libmali, adjust parameters
-DEPENDS:append_mali400 =  " virtual/libgles2"
-PACKAGE_ARCH_mali400 = "${SOC_VARIANT_ARCH}"
diff --git a/meta-xilinx-bsp/recipes-graphics/libsdl2/libsdl2_%.bbappend b/meta-xilinx-bsp/recipes-graphics/libsdl2/libsdl2_%.bbappend
deleted file mode 100644
index fd8a07e2..00000000
--- a/meta-xilinx-bsp/recipes-graphics/libsdl2/libsdl2_%.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-# Has a dependency on libmali
-PACKAGE_ARCH_mali400 = "${SOC_VARIANT_ARCH}"
-
diff --git a/meta-xilinx-contrib/recipes-bsp/device-tree/device-tree.bbappend b/meta-xilinx-contrib/recipes-bsp/device-tree/device-tree.bbappend
index 330548a8..57c08620 100644
--- a/meta-xilinx-contrib/recipes-bsp/device-tree/device-tree.bbappend
+++ b/meta-xilinx-contrib/recipes-bsp/device-tree/device-tree.bbappend
@@ -1,6 +1,6 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
 # device tree sources for MiniZed
-COMPATIBLE_MACHINE_minized-zynq7 = ".*"
-SRC_URI:append_minized-zynq7 = " file://minized-zynq7.dts"
+COMPATIBLE_MACHINE:minized-zynq7 = ".*"
+SRC_URI:append:minized-zynq7 = " file://minized-zynq7.dts"
 
diff --git a/meta-xilinx-contrib/recipes-kernel/linux-firmware/linux-firmware_%.bbappend b/meta-xilinx-contrib/recipes-kernel/linux-firmware/linux-firmware_%.bbappend
index b205d00d..e3072cbc 100644
--- a/meta-xilinx-contrib/recipes-kernel/linux-firmware/linux-firmware_%.bbappend
+++ b/meta-xilinx-contrib/recipes-kernel/linux-firmware/linux-firmware_%.bbappend
@@ -1,5 +1,5 @@
 
-SRC_URI:append_minized-zynq7 = " \
+SRC_URI:append:minized-zynq7 = " \
        git://github.com/murata-wireless/cyw-fmac-nvram;protocol=git;branch=orga;destsuffix=cyw-fmac-nvram;name=cyw-fmac-nvram \
        git://github.com/murata-wireless/cyw-bt-patch;protocol=git;branch=morty-orga;destsuffix=cyw-bt-patch;name=cyw-bt-patch \
        git://github.com/murata-wireless/cyw-fmac-utils-imx32;protocol=git;branch=orga;destsuffix=cyw-fmac-utils-imx32;name=cyw-fmac-utils-imx32 \
@@ -10,7 +10,7 @@ SRCREV_cyw-bt-patch = "9216e0d9f778009b5667d032886dfd49174c4b3a"
 SRCREV_cyw-fmac-utils-imx32 = "060688dfe76df98751207c8146268ce7fd80b6ab"
 SRCREV_FORMAT = "default+cyw-fmac-nvram+cyw-bt-patch+cyw-fmac-utils-imx32"
 
-do_install:append_minized-zynq7() {
+do_install:append:minized-zynq7() {
 
        install -d ${D}${bindir}
 
@@ -19,16 +19,16 @@ do_install:append_minized-zynq7() {
        install -m 0644 ${WORKDIR}/cyw-fmac-utils-imx32/wl ${D}${bindir}
 }
 
-PACKAGES:prepend_minized-zynq7 = "\
+PACKAGES:prepend:minized-zynq7 = "\
     ${PN}-bcm43430a1-hcd \
     ${PN}-mfgtest \
 "
 
-FILES:${PN}-mfgtest_minized-zynq7 = " \
+FILES:${PN}-mfgtest:minized-zynq7 = " \
        ${bindir}/wl \
 "
 
-FILES:${PN}-bcm43430:append_minized-zynq7 = " \
+FILES:${PN}-bcm43430:append:minized-zynq7 = " \
        ${nonarch_base_libdir}/firmware/brcm/ brcmfmac43430-sdio.txt \
 "
 
diff --git a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx_2021.2.bbappend b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx_2021.2.bbappend
index 6cba54df..2ce919ac 100644
--- a/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx_2021.2.bbappend
+++ b/meta-xilinx-contrib/recipes-kernel/linux/linux-xlnx_2021.2.bbappend
@@ -1,9 +1,9 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/linux-xlnx:"
 
-SRC_URI:append_zybo-linux-bd-zynq7 = " \
+SRC_URI:append:zybo-linux-bd-zynq7 = " \
         file://0001-drm-xilinx-Add-encoder-for-Digilent-boards.patch \
         file://0002-clk-Add-driver-for-axi_dynclk-IP-Core.patch \
         file://0003-drm-xilinx-Fix-DPMS-transition-to-on.patch \
         "
 
-SRC_URI:append_minized-zynq7 = " file://0004-minized-wifi-bluetooth.cfg"
+SRC_URI:append:minized-zynq7 = " file://0004-minized-wifi-bluetooth.cfg"
diff --git a/meta-xilinx-core/COPYING.MIT b/meta-xilinx-core/COPYING.MIT
new file mode 100644
index 00000000..89de3547
--- /dev/null
+++ b/meta-xilinx-core/COPYING.MIT
@@ -0,0 +1,17 @@
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/meta-xilinx-core/README.md b/meta-xilinx-core/README.md
new file mode 100644
index 00000000..cb6c06c8
--- /dev/null
+++ b/meta-xilinx-core/README.md
@@ -0,0 +1,56 @@
+meta-xilinx-core
+================
+
+This layer provides support for MicroBlaze, Zynq and ZynqMP.
+
+
+Maintainers, Mailing list, Patches
+==================================
+
+Please send any patches, pull requests, comments or questions for this layer to
+the [meta-xilinx mailing list](https://lists.yoctoproject.org/listinfo/meta-xilinx):
+
+        meta-xilinx@lists.yoctoproject.org
+
+Maintainers:
+
+        Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com>
+        Mark Hatle <mark.hatle@xilinx.com>
+
+Dependencies
+============
+
+This layer depends on:
+
+        URI: git://git.openembedded.org/bitbake
+
+        URI: git://git.openembedded.org/openembedded-core
+        layers: meta
+
+Recipe Licenses
+===============
+
+Due to licensing restrictions some recipes in this layer rely on closed source
+or restricted content provided by Xilinx. In order to use these recipes you must
+accept or agree to the licensing terms (e.g. EULA, Export Compliance, NDA,
+Redistribution, etc). This layer **does not enforce** any legal requirement, it
+is the **responsibility of the user** the ensure that they are in compliance
+with any licenses or legal requirements for content used.
+
+In order to use recipes that rely on restricted content the `xilinx` license
+flag must be white-listed in the build configuration (e.g. `local.conf`). This
+can be done on a per package basis:
+
+        LICENSE_FLAGS_WHITELIST += "xilinx_pmu-rom"
+
+or generally:
+
+        LICENSE_FLAGS_WHITELIST += "xilinx"
+
+Generally speaking Xilinx content that is provided as a restricted download
+cannot be obtained without a Xilinx account, in order to use this content you
+must first download it with your Xilinx account and place the downloaded content
+in the `downloads/` directory of your build or on a `PREMIRROR`. Attempting to
+fetch the content using bitbake will fail, indicating the URL from which to
+acquire the content.
+
diff --git a/meta-xilinx-bsp/README.qemu.md b/meta-xilinx-core/README.qemu.md
index 992e0618..992e0618 100644
--- a/meta-xilinx-bsp/README.qemu.md
+++ b/meta-xilinx-core/README.qemu.md
diff --git a/meta-xilinx-bsp/classes/fpgamanager_custom.bbclass b/meta-xilinx-core/classes/fpgamanager_custom.bbclass
index 0b5fa249..0b5fa249 100644
--- a/meta-xilinx-bsp/classes/fpgamanager_custom.bbclass
+++ b/meta-xilinx-core/classes/fpgamanager_custom.bbclass
diff --git a/meta-xilinx-bsp/classes/image-types-xilinx-qemu.bbclass b/meta-xilinx-core/classes/image-types-xilinx-qemu.bbclass
index 63318087..63318087 100644
--- a/meta-xilinx-bsp/classes/image-types-xilinx-qemu.bbclass
+++ b/meta-xilinx-core/classes/image-types-xilinx-qemu.bbclass
diff --git a/meta-xilinx-bsp/classes/image-wic-utils.bbclass b/meta-xilinx-core/classes/image-wic-utils.bbclass
index 562f3263..562f3263 100644
--- a/meta-xilinx-bsp/classes/image-wic-utils.bbclass
+++ b/meta-xilinx-core/classes/image-wic-utils.bbclass
diff --git a/meta-xilinx-bsp/classes/kernel-simpleimage.bbclass b/meta-xilinx-core/classes/kernel-simpleimage.bbclass
index 110ee254..110ee254 100644
--- a/meta-xilinx-bsp/classes/kernel-simpleimage.bbclass
+++ b/meta-xilinx-core/classes/kernel-simpleimage.bbclass
diff --git a/meta-xilinx-bsp/classes/qemuboot-xilinx.bbclass b/meta-xilinx-core/classes/qemuboot-xilinx.bbclass
index 48dfa6e2..48dfa6e2 100644
--- a/meta-xilinx-bsp/classes/qemuboot-xilinx.bbclass
+++ b/meta-xilinx-core/classes/qemuboot-xilinx.bbclass
diff --git a/meta-xilinx-bsp/classes/xilinx-fetch-restricted.bbclass b/meta-xilinx-core/classes/xilinx-fetch-restricted.bbclass
index a778ec7d..a778ec7d 100644
--- a/meta-xilinx-bsp/classes/xilinx-fetch-restricted.bbclass
+++ b/meta-xilinx-core/classes/xilinx-fetch-restricted.bbclass
diff --git a/meta-xilinx-bsp/classes/xilinx-platform-init.bbclass b/meta-xilinx-core/classes/xilinx-platform-init.bbclass
index 99f7863a..99f7863a 100644
--- a/meta-xilinx-bsp/classes/xilinx-platform-init.bbclass
+++ b/meta-xilinx-core/classes/xilinx-platform-init.bbclass
diff --git a/meta-xilinx-bsp/classes/xilinx-testimage.bbclass b/meta-xilinx-core/classes/xilinx-testimage.bbclass
index 99519637..99519637 100644
--- a/meta-xilinx-bsp/classes/xilinx-testimage.bbclass
+++ b/meta-xilinx-core/classes/xilinx-testimage.bbclass
diff --git a/meta-xilinx-bsp/classes/xlnx-standalone.bbclass b/meta-xilinx-core/classes/xlnx-standalone.bbclass
index 9232b1ef..9232b1ef 100644
--- a/meta-xilinx-bsp/classes/xlnx-standalone.bbclass
+++ b/meta-xilinx-core/classes/xlnx-standalone.bbclass
diff --git a/meta-xilinx-bsp/conf/bblayers.conf.sample b/meta-xilinx-core/conf/bblayers.conf.sample
index e29e9274..890ef3b6 100644
--- a/meta-xilinx-bsp/conf/bblayers.conf.sample
+++ b/meta-xilinx-core/conf/bblayers.conf.sample
@@ -18,6 +18,7 @@ BBLAYERS ?= " \
     ##OEROOT##/../meta-openembedded/meta-oe \
     ##OEROOT##/../meta-browser/meta-chromium \
     ##OEROOT##/../meta-qt5 \
+    ##OEROOT##/../meta-xilinx/meta-xilinx-core \
     ##OEROOT##/../meta-xilinx/meta-xilinx-bsp \
     ##OEROOT##/../meta-xilinx/meta-xilinx-pynq \
     ##OEROOT##/../meta-xilinx/meta-xilinx-standalone \
diff --git a/meta-xilinx-core/conf/layer.conf b/meta-xilinx-core/conf/layer.conf
new file mode 100644
index 00000000..c505501f
--- /dev/null
+++ b/meta-xilinx-core/conf/layer.conf
@@ -0,0 +1,42 @@
+# We have a conf and classes directory, add to BBPATH
+BBPATH .= ":${LAYERDIR}"
+
+# We have a packages directory, add to BBFILES
+BBFILES += "${LAYERDIR}/recipes-*/*/*.bb"
+BBFILES += "${LAYERDIR}/recipes-*/*/*.bbappend"
+
+BBFILE_COLLECTIONS += "xilinx"
+BBFILE_PATTERN_xilinx = "^${LAYERDIR}/"
+BBFILE_PRIORITY_xilinx = "5"
+
+BBFILES_DYNAMIC += " \
+openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/recipes-*/*/*.bb \
+openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/recipes-*/*/*.bbappend \
+chromium-browser-layer:${LAYERDIR}/dynamic-layers/chromium-browser-layer/recipes-*/*/*.bb \
+chromium-browser-layer:${LAYERDIR}/dynamic-layers/chromium-browser-layer/recipes-*/*/*.bbappend \
+"
+
+LAYERDEPENDS_xilinx = "core"
+
+LAYERSERIES_COMPAT_xilinx = " gatesgarth honister hardknott"
+
+SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
+  *->zocl \
+  *->cairo \
+  *->libepoxy \
+  *->gstreamer1.0-plugins-base \
+  *->gtk+ \
+  *->gtk+3 \
+  *->libglu \
+  *->libsdl \
+  *->libsdl2 \
+  *->mesa \
+  *->mesa-gl \
+  *->qemu \
+  *->virglrenderer \
+  *->xserver-xorg \
+"
+
+XILINX_RELEASE_VERSION = "v2022.1"
+
+HOSTTOOLS += "xxd"
diff --git a/meta-xilinx-bsp/conf/local.conf.sample b/meta-xilinx-core/conf/local.conf.sample
index caaa2083..5518196e 100644
--- a/meta-xilinx-bsp/conf/local.conf.sample
+++ b/meta-xilinx-core/conf/local.conf.sample
@@ -11,16 +11,24 @@
 # the option is a question of removing the # character and making any change to the
 # variable as required.
 
-# BASE = "${COREBASE}/../.."
-
 #
 # Machine Selection
 #
 # You need to select a specific machine to target the build with. There are a selection
 # of emulated machines available which can boot and run in the QEMU emulator:
 #
+#MACHINE ?= "microblazeel-v11.0-bs-cmp-mh-div-generic.conf"
+#MACHINE ?= "zynq-generic"
+#MACHINE ?= "zynqmp-generic"
+#MACHINE ?= "versal-generic"
+#
+# There are also the following hardware board target machines included for 
+# demonstration purposes:
+#
+#MACHINE ?= "ultra96-zynqmp"
+#
 # This sets the default machine if no other machine is selected:
-MACHINE ??= "qemuzynq"
+MACHINE ??= "zynqmp-generic"
 
 #
 # Where to place downloads
@@ -33,7 +41,7 @@ MACHINE ??= "qemuzynq"
 #
 # The default is a downloads directory under TOPDIR which is the build directory.
 #
-# DL_DIR ?= "${BASE}/downloads"
+#DL_DIR ?= "${TOPDIR}/downloads"
 
 #
 # Where to place shared-state files
@@ -49,7 +57,7 @@ MACHINE ??= "qemuzynq"
 #
 # The default is a sstate-cache directory under TOPDIR.
 #
-# SSTATE_DIR ?= "${BASE}/sstate-cache"
+#SSTATE_DIR ?= "${TOPDIR}/sstate-cache"
 
 #
 # Where to place the build output
@@ -62,8 +70,6 @@ MACHINE ??= "qemuzynq"
 # The default is a tmp directory under TOPDIR.
 #
 #TMPDIR = "${TOPDIR}/tmp"
-#
-#TMPDIR:versal = "${TOPDIR}/tmp-versal"
 
 #
 # Default policy config
@@ -90,12 +96,12 @@ DISTRO ?= "petalinux"
 PACKAGE_CLASSES ?= "package_rpm"
 
 #
-# SDK/ADT target architecture
+# SDK target architecture
 #
-# This variable specifies the architecture to build SDK/ADT items for and means
+# This variable specifies the architecture to build SDK items for and means
 # you can build the SDK packages for architectures other than the machine you are
 # running the build on (i.e. building i686 packages on an x86_64 host).
-# Supported values are i686 and x86_64
+# Supported values are i686, x86_64, aarch64
 #SDKMACHINE ?= "i686"
 
 #
@@ -106,6 +112,8 @@ PACKAGE_CLASSES ?= "package_rpm"
 # variable can contain the following options:
 #  "dbg-pkgs"       - add -dbg packages for all installed packages
 #                     (adds symbol information for debugging/profiling)
+#  "src-pkgs"       - add -src packages for all installed packages
+#                     (adds source code for debugging)
 #  "dev-pkgs"       - add -dev packages for all installed packages
 #                     (useful if you want to develop against libs in the image)
 #  "ptest-pkgs"     - add -ptest packages for all ptest-enabled packages
@@ -113,14 +121,14 @@ PACKAGE_CLASSES ?= "package_rpm"
 #  "tools-sdk"      - add development tools (gcc, make, pkgconfig etc.)
 #  "tools-debug"    - add debugging tools (gdb, strace)
 #  "eclipse-debug"  - add Eclipse remote debugging support
-#  "tools-profile"  - add profiling tools (oprofile, exmap, lttng, valgrind)
+#  "tools-profile"  - add profiling tools (oprofile, lttng, valgrind)
 #  "tools-testapps" - add useful testing tools (ts_print, aplay, arecord etc.)
 #  "debug-tweaks"   - make an image suitable for development
 #                     e.g. ssh root access has a blank password
 # There are other application targets that can be used here too, see
 # meta/classes/image.bbclass and meta/classes/core-image.bbclass for more details.
 # We default to enabling the debugging tweaks.
-EXTRA_IMAGE_FEATURES = "debug-tweaks"
+EXTRA_IMAGE_FEATURES ?= "debug-tweaks"
 
 #
 # Additional image features
@@ -135,10 +143,12 @@ USER_CLASSES ?= "buildstats"
 # Runtime testing of images
 #
 # The build system can test booting virtual machine images under qemu (an emulator)
-# after any root filesystems are created and run tests against those images. To
-# enable this uncomment this line. See classes/testimage(-auto).bbclass for
-# further details.
-#TEST_IMAGE = "1"
+# after any root filesystems are created and run tests against those images. It can also
+# run tests against any SDK that are built. To enable this uncomment these lines.
+# See classes/test{image,sdk}.bbclass for further details.
+#IMAGE_CLASSES += "testimage testsdk"
+#TESTIMAGE_AUTO:qemuall = "1"
+
 #
 # Interactive shell configuration
 #
@@ -161,14 +171,14 @@ PATCHRESOLVE = "noop"
 #
 # Disk Space Monitoring during the build
 #
-# Monitor the disk space during the build. If there is less that 1GB of space or less
+# Monitor the disk space during the build. If there is less than 1GB of space or less
 # than 100K inodes in any key build location (TMPDIR, DL_DIR, SSTATE_DIR), gracefully
-# shutdown the build. If there is less that 100MB or 1K inodes, perform a hard abort
+# shutdown the build. If there is less than 100MB or 1K inodes, perform a hard abort
 # of the build. The reason for this is that running completely out of space can corrupt
 # files and damages the build in ways which may not be easily recoverable.
-# It's necesary to monitor /tmp, if there is no space left the build will fail
+# It's necessary to monitor /tmp, if there is no space left the build will fail
 # with very exotic errors.
-BB_DISKMON_DIRS = "\
+BB_DISKMON_DIRS ??= "\
     STOPTASKS,${TMPDIR},1G,100K \
     STOPTASKS,${DL_DIR},1G,100K \
     STOPTASKS,${SSTATE_DIR},1G,100K \
@@ -181,7 +191,7 @@ BB_DISKMON_DIRS = "\
 #
 # Shared-state files from other locations
 #
-# As mentioned above, shared state files are prebuilt cache data objects which can
+# As mentioned above, shared state files are prebuilt cache data objects which can be
 # used to accelerate build time. This variable can be used to configure the system
 # to search other mirror locations for these objects before it builds the data itself.
 #
@@ -199,32 +209,70 @@ BB_DISKMON_DIRS = "\
 XILINX_VER_MAIN = "2021.2"
 
 # Uncomment below lines to provide path for custom xsct trim
-# This is required for building Versal based devices, please fetch the
-# xsct-trim from Xilinx lounge area
 #
 #EXTERNAL_XSCT_TARBALL = "/proj/yocto/xsct-trim/2021.2_xsct_daily_latest"
 #VALIDATE_XSCT_CHECKSUM = '0'
 
-# XILINX_VIVADO_DESIGN_SUIT should point to the Vivado installation directly if you are using xilinx-mcs recipe in meta-xilinx-tools
-#XILINX_VIVADO_DESIGN_SUIT = "/proj/xbuilds/2018.3_daily_latest/installs/lin64/Vivado/2018.3"
+#
+# Yocto Project SState Mirror
+#
+# The Yocto Project has prebuilt artefacts available for its releases, you can enable
+# use of these by uncommenting the following lines. This will mean the build uses
+# the network to check for artefacts at the start of builds, which does slow it down
+# equally, it will also speed up the builds by not having to build things if they are
+# present in the cache. It assumes you can download something faster than you can build it
+# which will depend on your network.
+# Note: For this to work you also need hash-equivalence passthrough to the matching server
+#
+#BB_HASHSERVE_UPSTREAM = "typhoon.yocto.io:8687"
+#SSTATE_MIRRORS ?= "file://.* http://sstate.yoctoproject.org/3.4/PATH;downloadfilename=PATH"
 
-# INHERIT += "externalsrc"
-# PREFERRED_PROVIDER_virtual/kernel = "linux-xlnx-dev"
-# EXTERNALSRC:pn-linux-xlnx-dev = "${BASE}/sources/linux"
-# RM_WORK_EXCLUDE += "linux-xlnx-dev"
+#
+# Qemu configuration
+#
+# By default native qemu will build with a builtin VNC server where graphical output can be
+# seen. The line below enables the SDL UI frontend too.
+PACKAGECONFIG:append:pn-qemu-system-native = " sdl"
+# By default libsdl2-native will be built, if you want to use your host's libSDL instead of 
+# the minimal libsdl built by libsdl2-native then uncomment the ASSUME_PROVIDED line below.
+#ASSUME_PROVIDED += "libsdl2-native"
 
-# PREFERRED_PROVIDER_virtual/bootloader = "u-boot-xlnx-dev"
-# EXTERNALSRC:pn-u-boot-xlnx-dev = "${BASE}/sources/u-boot"
-# RM_WORK_EXCLUDE += "u-boot-xlnx-dev"
+# You can also enable the Gtk UI frontend, which takes somewhat longer to build, but adds
+# a handy set of menus for controlling the emulator.
+#PACKAGECONFIG:append:pn-qemu-system-native = " gtk+"
 
 #Add below lines to use runqemu for ZU+ machines
 PMU_FIRMWARE_DEPLOY_DIR ??= "${DEPLOY_DIR_IMAGE}"
 PMU_FIRMWARE_IMAGE_NAME ??= "pmu-firmware-${MACHINE}"
 
+#Enable the below line to use pmu-rom.elf from a specific path
+#PMU_ROM = "/proj/yocto/pmu-rom/pmu-rom.elf"
+
+#
+# Hash Equivalence
+#
+# Enable support for automatically running a local hash equivalence server and
+# instruct bitbake to use a hash equivalence aware signature generator. Hash
+# equivalence improves reuse of sstate by detecting when a given sstate
+# artifact can be reused as equivalent, even if the current task hash doesn't
+# match the one that generated the artifact.
+#
+# A shared hash equivalent server can be set with "<HOSTNAME>:<PORT>" format
+#
+#BB_HASHSERVE = "auto"
+#BB_SIGNATURE_HANDLER = "OEEquivHash"
+
+#
+# Memory Resident Bitbake
+#
+# Bitbake's server component can stay in memory after the UI for the current command
+# has completed. This means subsequent commands can run faster since there is no need
+# for bitbake to reload cache files and so on. Number is in seconds, after which the
+# server will shut down.
+#
+#BB_SERVER_TIMEOUT = "60"
+
 # CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to
 # track the version of this file when it was generated. This can safely be ignored if
 # this doesn't mean anything to you.
-CONF_VERSION = "1"
-
-#Enable the below line to use pmu-rom.elf from a specific path
-#PMU_ROM = "/proj/yocto/pmu-rom/pmu-rom.elf"
+CONF_VERSION = "2"
diff --git a/meta-xilinx-bsp/conf/machine/include/README b/meta-xilinx-core/conf/machine/include/README
index 89a25faf..89a25faf 100644
--- a/meta-xilinx-bsp/conf/machine/include/README
+++ b/meta-xilinx-core/conf/machine/include/README
diff --git a/meta-xilinx-bsp/conf/machine/include/machine-xilinx-default.inc b/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc
index d8b1e2d9..d8b1e2d9 100644
--- a/meta-xilinx-bsp/conf/machine/include/machine-xilinx-default.inc
+++ b/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc
diff --git a/meta-xilinx-bsp/conf/machine/include/machine-xilinx-qemu.inc b/meta-xilinx-core/conf/machine/include/machine-xilinx-qemu.inc
index c2093ca6..c2093ca6 100644
--- a/meta-xilinx-bsp/conf/machine/include/machine-xilinx-qemu.inc
+++ b/meta-xilinx-core/conf/machine/include/machine-xilinx-qemu.inc
diff --git a/meta-xilinx-bsp/conf/machine/include/soc-tune-include.inc b/meta-xilinx-core/conf/machine/include/soc-tune-include.inc
index 539879d4..539879d4 100644
--- a/meta-xilinx-bsp/conf/machine/include/soc-tune-include.inc
+++ b/meta-xilinx-core/conf/machine/include/soc-tune-include.inc
diff --git a/meta-xilinx-bsp/conf/machine/include/soc-versal.inc b/meta-xilinx-core/conf/machine/include/soc-versal.inc
index f2a033ad..f2a033ad 100644
--- a/meta-xilinx-bsp/conf/machine/include/soc-versal.inc
+++ b/meta-xilinx-core/conf/machine/include/soc-versal.inc
diff --git a/meta-xilinx-bsp/conf/machine/include/soc-zynq.inc b/meta-xilinx-core/conf/machine/include/soc-zynq.inc
index 88d48a92..88d48a92 100644
--- a/meta-xilinx-bsp/conf/machine/include/soc-zynq.inc
+++ b/meta-xilinx-core/conf/machine/include/soc-zynq.inc
diff --git a/meta-xilinx-bsp/conf/machine/include/soc-zynqmp.inc b/meta-xilinx-core/conf/machine/include/soc-zynqmp.inc
index e32fd617..e32fd617 100644
--- a/meta-xilinx-bsp/conf/machine/include/soc-zynqmp.inc
+++ b/meta-xilinx-core/conf/machine/include/soc-zynqmp.inc
diff --git a/meta-xilinx-bsp/conf/machine/include/xilinx-board.inc b/meta-xilinx-core/conf/machine/include/xilinx-board.inc
index 18b04742..18b04742 100644
--- a/meta-xilinx-bsp/conf/machine/include/xilinx-board.inc
+++ b/meta-xilinx-core/conf/machine/include/xilinx-board.inc
diff --git a/meta-xilinx-bsp/conf/machine/include/xilinx-microblaze.inc b/meta-xilinx-core/conf/machine/include/xilinx-microblaze.inc
index 76d77cd1..76d77cd1 100644
--- a/meta-xilinx-bsp/conf/machine/include/xilinx-microblaze.inc
+++ b/meta-xilinx-core/conf/machine/include/xilinx-microblaze.inc
diff --git a/meta-xilinx-bsp/conf/machine/include/xilinx-soc-family.inc b/meta-xilinx-core/conf/machine/include/xilinx-soc-family.inc
index dd54f5c6..dd54f5c6 100644
--- a/meta-xilinx-bsp/conf/machine/include/xilinx-soc-family.inc
+++ b/meta-xilinx-core/conf/machine/include/xilinx-soc-family.inc
diff --git a/meta-xilinx-bsp/conf/machine/microblaze-generic.conf b/meta-xilinx-core/conf/machine/microblaze-generic.conf
index 6dfa9997..6dfa9997 100644
--- a/meta-xilinx-bsp/conf/machine/microblaze-generic.conf
+++ b/meta-xilinx-core/conf/machine/microblaze-generic.conf
diff --git a/meta-xilinx-bsp/conf/machine/versal-generic.conf b/meta-xilinx-core/conf/machine/versal-generic.conf
index 99dc140d..2b0cd495 100644
--- a/meta-xilinx-bsp/conf/machine/versal-generic.conf
+++ b/meta-xilinx-core/conf/machine/versal-generic.conf
@@ -50,9 +50,9 @@ QB_NETWORK_DEVICE = ""
 QB_KERNEL_CMDLINE_APPEND ?= ""
 QB_NET = "none"
 
-QB_DEFAULT_FSTYPE_qemuboot-xilinx = "wic.qemu-sd"
-QB_OPT_APPEND:append_qemuboot-xilinx = " -boot mode=5"
-QB_ROOTFS_OPT_qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw"
+QB_DEFAULT_FSTYPE:qemuboot-xilinx = "wic.qemu-sd"
+QB_OPT_APPEND:append:qemuboot-xilinx = " -boot mode=5"
+QB_ROOTFS_OPT:qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw"
 
 # Use booti 80000 6000000 4000000 to launch
 QB_OPT_APPEND ?= " -serial null -serial null -serial mon:stdio -display none"
@@ -64,7 +64,7 @@ QEMU_HW_DTB_PMC ?="${QEMU_HW_DTB_PATH}/board-versal-pmc-vc-p-a2197-00.dtb"
 QEMU_HW_DTB_PS_vp1202-versal = "${QEMU_HW_DTB_PATH}/board-versal-vp1202-ps-virt.dtb"
 QEMU_HW_DTB_PMC_vp1202-versal = "${QEMU_HW_DTB_PATH}/board-versal-vp1202-pmc-virt.dtb"
 
-QB_OPT_APPEND:append_qemuboot-xilinx = " \
+QB_OPT_APPEND:append:qemuboot-xilinx = " \
     -hw-dtb ${QEMU_HW_DTB_PS} \
     -display none \
     -net nic -net user,tftp=${DEPLOY_DIR_IMAGE} \
@@ -83,4 +83,4 @@ QB_PLM_OPT = " \
     -hw-dtb ${QEMU_HW_DTB_PMC} \
     -display none \
     "
-QB_OPT_APPEND:append_qemuboot-xilinx = " -plm-args '${QB_PLM_OPT}'"
+QB_OPT_APPEND:append:qemuboot-xilinx = " -plm-args '${QB_PLM_OPT}'"
diff --git a/meta-xilinx-bsp/conf/machine/zynq-generic.conf b/meta-xilinx-core/conf/machine/zynq-generic.conf
index fc32906e..2fc6d27b 100644
--- a/meta-xilinx-bsp/conf/machine/zynq-generic.conf
+++ b/meta-xilinx-core/conf/machine/zynq-generic.conf
@@ -21,12 +21,12 @@ HDF_MACHINE = "zc702-zynq7"
 
 QB_MEM = "-m 1024"
 QB_NETWORK_DEVICE = "-net nic,netdev=eth0 -netdev user,id=eth0,tftp=/tftpboot -net nic"
-QB_DEFAULT_KERNEL_qemuboot-xilinx = "zImage"
+QB_DEFAULT_KERNEL:qemuboot-xilinx = "zImage"
 
 QB_SYSTEM_NAME ?= "${@qemu_target_binary(d)}"
 QB_DEFAULT_FSTYPE = "cpio.gz.u-boot"
 QB_DTB = "system.dtb"
-QB_ROOTFS_OPT_qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw"
+QB_ROOTFS_OPT:qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw"
 
 # Replicate BootROM like behaviour, having loaded SPL and PMU(ROM+FW)
 QB_OPT_APPEND = " \
diff --git a/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf b/meta-xilinx-core/conf/machine/zynqmp-generic.conf
index c5d5259a..eb9d4bc4 100644
--- a/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf
+++ b/meta-xilinx-core/conf/machine/zynqmp-generic.conf
@@ -55,7 +55,7 @@ QB_OPT_APPEND ?= "-nographic -serial mon:stdio -serial null"
 QB_NETWORK_DEVICE = "-net nic -net nic -net nic -net nic,netdev=net0,macaddr=@MAC@"
 
 # Replicate BootROM like behaviour, having loaded SPL and PMU(ROM+FW)
-QB_OPT_APPEND:append_qemuboot-xilinx = " \
+QB_OPT_APPEND:append:qemuboot-xilinx = " \
                 -hw-dtb ${DEPLOY_DIR_IMAGE}/qemu-hw-devicetrees/multiarch/zcu102-arm.dtb \
                 ${@qemu_zynqmp_unhalt(d, True)} \
                 -device loader,file=${DEPLOY_DIR_IMAGE}/arm-trusted-firmware.elf,cpu-num=0 \
@@ -64,9 +64,9 @@ QB_OPT_APPEND:append_qemuboot-xilinx = " \
                 "
 
 # Attach the rootfs disk image to the second SD interface of QEMU (which is SD0)
-QB_DEFAULT_FSTYPE_qemuboot-xilinx = "wic.qemu-sd"
-QB_OPT_APPEND:append_qemuboot-xilinx = " -boot mode=5"
-QB_ROOTFS_OPT_qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw"
+QB_DEFAULT_FSTYPE:qemuboot-xilinx = "wic.qemu-sd"
+QB_OPT_APPEND:append:qemuboot-xilinx = " -boot mode=5"
+QB_ROOTFS_OPT:qemuboot-xilinx = " -drive if=sd,index=1,file=@ROOTFS@,format=raw"
 
 QB_PMU_OPT = " \
                 -M microblaze-fdt \
@@ -77,9 +77,9 @@ QB_PMU_OPT = " \
                 -device loader,addr=0xfd1a0074,data=0x1011003,data-len=4 \
                 -device loader,addr=0xfd1a007C,data=0x1010f03,data-len=4 \
                 "
-QB_OPT_APPEND:append_qemuboot-xilinx = " -pmu-args '${QB_PMU_OPT}'"
+QB_OPT_APPEND:append:qemuboot-xilinx = " -pmu-args '${QB_PMU_OPT}'"
 
 do_write_qemuboot_conf[depends] += "u-boot-zynq-uenv:do_deploy"
 
 # Board specific overrides
-require conf/machine/include/board/ultra96.inc
+include conf/machine/include/board/ultra96.inc
diff --git a/meta-xilinx-core/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-x11_%.bbappend b/meta-xilinx-core/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-x11_%.bbappend
new file mode 100644
index 00000000..bb792de2
--- /dev/null
+++ b/meta-xilinx-core/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-x11_%.bbappend
@@ -0,0 +1,2 @@
+# Has a dependency on libmali
+PACKAGE_ARCH:mali400 = "${SOC_VARIANT_ARCH}"
diff --git a/meta-xilinx-bsp/dynamic-layers/openembedded-layer/recipes-core/opencl-headers/opencl-headers_%.bbappend b/meta-xilinx-core/dynamic-layers/openembedded-layer/recipes-core/opencl-headers/opencl-headers_%.bbappend
index b90c754d..b90c754d 100644
--- a/meta-xilinx-bsp/dynamic-layers/openembedded-layer/recipes-core/opencl-headers/opencl-headers_%.bbappend
+++ b/meta-xilinx-core/dynamic-layers/openembedded-layer/recipes-core/opencl-headers/opencl-headers_%.bbappend
diff --git a/meta-xilinx-bsp/dynamic-layers/openembedded-layer/recipes-graphics/xorg-driver/xf86-video-armsoc/0001-armsoc_driver.c-Bypass-the-exa-layer-to-free-the-roo.patch b/meta-xilinx-core/dynamic-layers/openembedded-layer/recipes-graphics/xorg-driver/xf86-video-armsoc/0001-armsoc_driver.c-Bypass-the-exa-layer-to-free-the-roo.patch
index 2e024794..2e024794 100644
--- a/meta-xilinx-bsp/dynamic-layers/openembedded-layer/recipes-graphics/xorg-driver/xf86-video-armsoc/0001-armsoc_driver.c-Bypass-the-exa-layer-to-free-the-roo.patch
+++ b/meta-xilinx-core/dynamic-layers/openembedded-layer/recipes-graphics/xorg-driver/xf86-video-armsoc/0001-armsoc_driver.c-Bypass-the-exa-layer-to-free-the-roo.patch
diff --git a/meta-xilinx-bsp/dynamic-layers/openembedded-layer/recipes-graphics/xorg-driver/xf86-video-armsoc/0001-src-drmmode_xilinx-Add-the-dumb-gem-support-for-Xili.patch b/meta-xilinx-core/dynamic-layers/openembedded-layer/recipes-graphics/xorg-driver/xf86-video-armsoc/0001-src-drmmode_xilinx-Add-the-dumb-gem-support-for-Xili.patch
index bf2169ee..bf2169ee 100644
--- a/meta-xilinx-bsp/dynamic-layers/openembedded-layer/recipes-graphics/xorg-driver/xf86-video-armsoc/0001-src-drmmode_xilinx-Add-the-dumb-gem-support-for-Xili.patch
+++ b/meta-xilinx-core/dynamic-layers/openembedded-layer/recipes-graphics/xorg-driver/xf86-video-armsoc/0001-src-drmmode_xilinx-Add-the-dumb-gem-support-for-Xili.patch
diff --git a/meta-xilinx-bsp/dynamic-layers/openembedded-layer/recipes-graphics/xorg-driver/xf86-video-armsoc_%.bbappend b/meta-xilinx-core/dynamic-layers/openembedded-layer/recipes-graphics/xorg-driver/xf86-video-armsoc_%.bbappend
index f7b52f58..f7b52f58 100644
--- a/meta-xilinx-bsp/dynamic-layers/openembedded-layer/recipes-graphics/xorg-driver/xf86-video-armsoc_%.bbappend
+++ b/meta-xilinx-core/dynamic-layers/openembedded-layer/recipes-graphics/xorg-driver/xf86-video-armsoc_%.bbappend
diff --git a/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc
index 281ce765..94925fa9 100644
--- a/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc
+++ b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc
@@ -69,7 +69,7 @@ EXTRA_OEMAKE:zynqmp:append = "${@' ZYNQMP_ATF_MEM_SIZE=${ATF_MEM_SIZE}' if d.get
 
 EXTRA_OEMAKE:append:versal = "${@' VERSAL_ATF_MEM_BASE=${ATF_MEM_BASE}' if d.getVar('ATF_MEM_BASE', True) != '' else ''}"
 EXTRA_OEMAKE:append:versal = "${@' VERSAL_ATF_MEM_SIZE=${ATF_MEM_SIZE}' if d.getVar('ATF_MEM_SIZE', True) != '' else ''}"
-EXTRA_OEMAKE:append_vc-p-a2197-00-versal =" VERSAL_PLATFORM=silicon"
+EXTRA_OEMAKE:append:vc-p-a2197-00-versal =" VERSAL_PLATFORM=silicon"
 
 do_configure() {
         oe_runmake clean -C ${S} BUILD_BASE=${B} PLAT=${PLATFORM}
diff --git a/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2021.2.bb b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2021.2.bb
index f69ed50c..f69ed50c 100644
--- a/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2021.2.bb
+++ b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2021.2.bb
diff --git a/meta-xilinx-bsp/recipes-bsp/base-pdi/base-pdi_1.0.bb b/meta-xilinx-core/recipes-bsp/base-pdi/base-pdi_1.0.bb
index 4e940642..4e940642 100644
--- a/meta-xilinx-bsp/recipes-bsp/base-pdi/base-pdi_1.0.bb
+++ b/meta-xilinx-core/recipes-bsp/base-pdi/base-pdi_1.0.bb
diff --git a/meta-xilinx-bsp/recipes-bsp/bootbin/machine-xilinx-versal.inc b/meta-xilinx-core/recipes-bsp/bootbin/machine-xilinx-versal.inc
index a9c58aa2..a9c58aa2 100644
--- a/meta-xilinx-bsp/recipes-bsp/bootbin/machine-xilinx-versal.inc
+++ b/meta-xilinx-core/recipes-bsp/bootbin/machine-xilinx-versal.inc
diff --git a/meta-xilinx-bsp/recipes-bsp/bootbin/machine-xilinx-zynq.inc b/meta-xilinx-core/recipes-bsp/bootbin/machine-xilinx-zynq.inc
index b8d75c4f..b8d75c4f 100644
--- a/meta-xilinx-bsp/recipes-bsp/bootbin/machine-xilinx-zynq.inc
+++ b/meta-xilinx-core/recipes-bsp/bootbin/machine-xilinx-zynq.inc
diff --git a/meta-xilinx-bsp/recipes-bsp/bootbin/machine-xilinx-zynqmp.inc b/meta-xilinx-core/recipes-bsp/bootbin/machine-xilinx-zynqmp.inc
index 4eb404c1..4eb404c1 100644
--- a/meta-xilinx-bsp/recipes-bsp/bootbin/machine-xilinx-zynqmp.inc
+++ b/meta-xilinx-core/recipes-bsp/bootbin/machine-xilinx-zynqmp.inc
diff --git a/meta-xilinx-bsp/recipes-bsp/bootbin/xilinx-bootbin_1.0.bb b/meta-xilinx-core/recipes-bsp/bootbin/xilinx-bootbin_1.0.bb
index 532da106..532da106 100644
--- a/meta-xilinx-bsp/recipes-bsp/bootbin/xilinx-bootbin_1.0.bb
+++ b/meta-xilinx-core/recipes-bsp/bootbin/xilinx-bootbin_1.0.bb
diff --git a/meta-xilinx-bsp/recipes-bsp/bootbin/xilinx-mcs_1.0.bb b/meta-xilinx-core/recipes-bsp/bootbin/xilinx-mcs_1.0.bb
index a729c07b..bcfe900d 100644
--- a/meta-xilinx-bsp/recipes-bsp/bootbin/xilinx-mcs_1.0.bb
+++ b/meta-xilinx-core/recipes-bsp/bootbin/xilinx-mcs_1.0.bb
@@ -19,7 +19,7 @@ do_unpack[noexec] = "1"
 do_patch[noexec] = "1"
 
 PROC ??= "kc705_i/microblaze_0"
-PROC_kc705 = "kc705_i/microblaze_0"
+PROC:kc705 = "kc705_i/microblaze_0"
 
 FLASH_SIZE ??= "0x80"
 FLASH_INTERFACE ??= "BPIx16"
diff --git a/meta-xilinx-bsp/recipes-bsp/bootgen/bootgen_1.0.bb b/meta-xilinx-core/recipes-bsp/bootgen/bootgen_1.0.bb
index 236da302..236da302 100644
--- a/meta-xilinx-bsp/recipes-bsp/bootgen/bootgen_1.0.bb
+++ b/meta-xilinx-core/recipes-bsp/bootgen/bootgen_1.0.bb
diff --git a/meta-xilinx-bsp/recipes-bsp/cdo/extract-cdo_1.0.bb b/meta-xilinx-core/recipes-bsp/cdo/extract-cdo_1.0.bb
index 37c284ad..37c284ad 100644
--- a/meta-xilinx-bsp/recipes-bsp/cdo/extract-cdo_1.0.bb
+++ b/meta-xilinx-core/recipes-bsp/cdo/extract-cdo_1.0.bb
diff --git a/meta-xilinx-bsp/recipes-bsp/device-tree/device-tree.bb b/meta-xilinx-core/recipes-bsp/device-tree/device-tree.bb
index c73e5fb1..3e71eeaf 100644
--- a/meta-xilinx-bsp/recipes-bsp/device-tree/device-tree.bb
+++ b/meta-xilinx-core/recipes-bsp/device-tree/device-tree.bb
@@ -32,21 +32,21 @@ PROVIDES = "virtual/dtb"
 SRC_URI:append:zynq = " file://zynq-7000-qspi-dummy.dtsi"
 
 # device tree sources for the various machines
-COMPATIBLE_MACHINE_picozed-zynq7 = ".*"
-SRC_URI:append_picozed-zynq7 = " file://picozed-zynq7.dts"
+COMPATIBLE_MACHINE:picozed-zynq7 = ".*"
+SRC_URI:append:picozed-zynq7 = " file://picozed-zynq7.dts"
 
-COMPATIBLE_MACHINE_qemu-zynq7 = ".*"
-SRC_URI:append_qemu-zynq7 = " file://qemu-zynq7.dts"
+COMPATIBLE_MACHINE:qemu-zynq7 = ".*"
+SRC_URI:append:qemu-zynq7 = " file://qemu-zynq7.dts"
 
-COMPATIBLE_MACHINE_zybo-linux-bd-zynq7 = ".*"
-SRC_URI:append_zybo-linux-bd-zynq7 = " \
+COMPATIBLE_MACHINE:zybo-linux-bd-zynq7 = ".*"
+SRC_URI:append:zybo-linux-bd-zynq7 = " \
                 file://zybo-linux-bd-zynq7.dts \
                 file://pcw.dtsi \
                 file://pl.dtsi \
                 "
 
-COMPATIBLE_MACHINE_kc705-microblazeel = ".*"
-SRC_URI:append_kc705-microblazeel = " \
+COMPATIBLE_MACHINE:kc705-microblazeel = ".*"
+SRC_URI:append:kc705-microblazeel = " \
                 file://kc705-microblazeel.dts \
                 file://pl.dtsi \
                 file://system-conf.dtsi \
diff --git a/meta-xilinx-bsp/recipes-bsp/device-tree/files/kc705-microblazeel/kc705-microblazeel.dts b/meta-xilinx-core/recipes-bsp/device-tree/files/kc705-microblazeel/kc705-microblazeel.dts
index 45e488c1..45e488c1 100644
--- a/meta-xilinx-bsp/recipes-bsp/device-tree/files/kc705-microblazeel/kc705-microblazeel.dts
+++ b/meta-xilinx-core/recipes-bsp/device-tree/files/kc705-microblazeel/kc705-microblazeel.dts
diff --git a/meta-xilinx-bsp/recipes-bsp/device-tree/files/kc705-microblazeel/pl.dtsi b/meta-xilinx-core/recipes-bsp/device-tree/files/kc705-microblazeel/pl.dtsi
index 43bc2ab7..43bc2ab7 100644
--- a/meta-xilinx-bsp/recipes-bsp/device-tree/files/kc705-microblazeel/pl.dtsi
+++ b/meta-xilinx-core/recipes-bsp/device-tree/files/kc705-microblazeel/pl.dtsi
diff --git a/meta-xilinx-bsp/recipes-bsp/device-tree/files/kc705-microblazeel/system-conf.dtsi b/meta-xilinx-core/recipes-bsp/device-tree/files/kc705-microblazeel/system-conf.dtsi
index 09b26c6a..09b26c6a 100644
--- a/meta-xilinx-bsp/recipes-bsp/device-tree/files/kc705-microblazeel/system-conf.dtsi
+++ b/meta-xilinx-core/recipes-bsp/device-tree/files/kc705-microblazeel/system-conf.dtsi
diff --git a/meta-xilinx-bsp/recipes-bsp/device-tree/files/picozed-zynq7.dts b/meta-xilinx-core/recipes-bsp/device-tree/files/picozed-zynq7.dts
index 6f9b653a..6f9b653a 100644
--- a/meta-xilinx-bsp/recipes-bsp/device-tree/files/picozed-zynq7.dts
+++ b/meta-xilinx-core/recipes-bsp/device-tree/files/picozed-zynq7.dts
diff --git a/meta-xilinx-bsp/recipes-bsp/device-tree/files/qemu-zynq7.dts b/meta-xilinx-core/recipes-bsp/device-tree/files/qemu-zynq7.dts
index cd0694d6..cd0694d6 100644
--- a/meta-xilinx-bsp/recipes-bsp/device-tree/files/qemu-zynq7.dts
+++ b/meta-xilinx-core/recipes-bsp/device-tree/files/qemu-zynq7.dts
diff --git a/meta-xilinx-bsp/recipes-bsp/device-tree/files/zybo-linux-bd-zynq7/pcw.dtsi b/meta-xilinx-core/recipes-bsp/device-tree/files/zybo-linux-bd-zynq7/pcw.dtsi
index 0f678d39..0f678d39 100644
--- a/meta-xilinx-bsp/recipes-bsp/device-tree/files/zybo-linux-bd-zynq7/pcw.dtsi
+++ b/meta-xilinx-core/recipes-bsp/device-tree/files/zybo-linux-bd-zynq7/pcw.dtsi
diff --git a/meta-xilinx-bsp/recipes-bsp/device-tree/files/zybo-linux-bd-zynq7/pl.dtsi b/meta-xilinx-core/recipes-bsp/device-tree/files/zybo-linux-bd-zynq7/pl.dtsi
index 32bc7688..32bc7688 100644
--- a/meta-xilinx-bsp/recipes-bsp/device-tree/files/zybo-linux-bd-zynq7/pl.dtsi
+++ b/meta-xilinx-core/recipes-bsp/device-tree/files/zybo-linux-bd-zynq7/pl.dtsi
diff --git a/meta-xilinx-bsp/recipes-bsp/device-tree/files/zybo-linux-bd-zynq7/zybo-linux-bd-zynq7.dts b/meta-xilinx-core/recipes-bsp/device-tree/files/zybo-linux-bd-zynq7/zybo-linux-bd-zynq7.dts
index 19654392..19654392 100644
--- a/meta-xilinx-bsp/recipes-bsp/device-tree/files/zybo-linux-bd-zynq7/zybo-linux-bd-zynq7.dts
+++ b/meta-xilinx-core/recipes-bsp/device-tree/files/zybo-linux-bd-zynq7/zybo-linux-bd-zynq7.dts
diff --git a/meta-xilinx-bsp/recipes-bsp/device-tree/files/zynq-7000-qspi-dummy.dtsi b/meta-xilinx-core/recipes-bsp/device-tree/files/zynq-7000-qspi-dummy.dtsi
index d059a2da..d059a2da 100644
--- a/meta-xilinx-bsp/recipes-bsp/device-tree/files/zynq-7000-qspi-dummy.dtsi
+++ b/meta-xilinx-core/recipes-bsp/device-tree/files/zynq-7000-qspi-dummy.dtsi
diff --git a/meta-xilinx-bsp/recipes-bsp/embeddedsw/fsbl.bb b/meta-xilinx-core/recipes-bsp/embeddedsw/fsbl.bb
index 2fa71309..2fa71309 100644
--- a/meta-xilinx-bsp/recipes-bsp/embeddedsw/fsbl.bb
+++ b/meta-xilinx-core/recipes-bsp/embeddedsw/fsbl.bb
diff --git a/meta-xilinx-bsp/recipes-bsp/embeddedsw/plmfw.bb b/meta-xilinx-core/recipes-bsp/embeddedsw/plmfw.bb
index 70d234c9..70d234c9 100644
--- a/meta-xilinx-bsp/recipes-bsp/embeddedsw/plmfw.bb
+++ b/meta-xilinx-core/recipes-bsp/embeddedsw/plmfw.bb
diff --git a/meta-xilinx-bsp/recipes-bsp/embeddedsw/pmufw.bb b/meta-xilinx-core/recipes-bsp/embeddedsw/pmufw.bb
index 7371127c..7371127c 100644
--- a/meta-xilinx-bsp/recipes-bsp/embeddedsw/pmufw.bb
+++ b/meta-xilinx-core/recipes-bsp/embeddedsw/pmufw.bb
diff --git a/meta-xilinx-bsp/recipes-bsp/embeddedsw/psmfw.bb b/meta-xilinx-core/recipes-bsp/embeddedsw/psmfw.bb
index 5a885b3b..5a885b3b 100644
--- a/meta-xilinx-bsp/recipes-bsp/embeddedsw/psmfw.bb
+++ b/meta-xilinx-core/recipes-bsp/embeddedsw/psmfw.bb
diff --git a/meta-xilinx-bsp/recipes-bsp/platform-init/platform-init.bb b/meta-xilinx-core/recipes-bsp/platform-init/platform-init.bb
index cac8bbfc..cac8bbfc 100644
--- a/meta-xilinx-bsp/recipes-bsp/platform-init/platform-init.bb
+++ b/meta-xilinx-core/recipes-bsp/platform-init/platform-init.bb
diff --git a/meta-xilinx-bsp/recipes-bsp/platform-init/platform-init/picozed-zynq7/ps7_init_gpl.c b/meta-xilinx-core/recipes-bsp/platform-init/platform-init/picozed-zynq7/ps7_init_gpl.c
index 5587ab25..5587ab25 100644
--- a/meta-xilinx-bsp/recipes-bsp/platform-init/platform-init/picozed-zynq7/ps7_init_gpl.c
+++ b/meta-xilinx-core/recipes-bsp/platform-init/platform-init/picozed-zynq7/ps7_init_gpl.c
diff --git a/meta-xilinx-bsp/recipes-bsp/platform-init/platform-init/picozed-zynq7/ps7_init_gpl.h b/meta-xilinx-core/recipes-bsp/platform-init/platform-init/picozed-zynq7/ps7_init_gpl.h
index df5205e8..df5205e8 100644
--- a/meta-xilinx-bsp/recipes-bsp/platform-init/platform-init/picozed-zynq7/ps7_init_gpl.h
+++ b/meta-xilinx-core/recipes-bsp/platform-init/platform-init/picozed-zynq7/ps7_init_gpl.h
diff --git a/meta-xilinx-bsp/recipes-bsp/pmu-firmware/pmu-rom_2018.1.bb b/meta-xilinx-core/recipes-bsp/pmu-firmware/pmu-rom_2018.1.bb
index 195c6309..195c6309 100644
--- a/meta-xilinx-bsp/recipes-bsp/pmu-firmware/pmu-rom_2018.1.bb
+++ b/meta-xilinx-core/recipes-bsp/pmu-firmware/pmu-rom_2018.1.bb
diff --git a/meta-xilinx-bsp/recipes-bsp/reference-design/kc705-bitstream_2021.2.bb b/meta-xilinx-core/recipes-bsp/reference-design/kc705-bitstream_2021.2.bb
index e512777c..e512777c 100644
--- a/meta-xilinx-bsp/recipes-bsp/reference-design/kc705-bitstream_2021.2.bb
+++ b/meta-xilinx-core/recipes-bsp/reference-design/kc705-bitstream_2021.2.bb
diff --git a/meta-xilinx-bsp/recipes-bsp/u-boot/files/0001-Remove-redundant-YYLOC-global-declaration.patch b/meta-xilinx-core/recipes-bsp/u-boot/files/0001-Remove-redundant-YYLOC-global-declaration.patch
index 7091098c..7091098c 100644
--- a/meta-xilinx-bsp/recipes-bsp/u-boot/files/0001-Remove-redundant-YYLOC-global-declaration.patch
+++ b/meta-xilinx-core/recipes-bsp/u-boot/files/0001-Remove-redundant-YYLOC-global-declaration.patch
diff --git a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-spl-zynq-init.inc b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-spl-zynq-init.inc
index 6638c9e5..6638c9e5 100644
--- a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-spl-zynq-init.inc
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-spl-zynq-init.inc
diff --git a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx-dev.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-dev.bb
index 3e40bfa1..3e40bfa1 100644
--- a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx-dev.bb
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-dev.bb
diff --git a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx.inc b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx.inc
index 893b8f6c..893b8f6c 100644
--- a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx.inc
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx.inc
diff --git a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2021.2.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2021.2.bb
index a4fedbe2..a4fedbe2 100644
--- a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2021.2.bb
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx_2021.2.bb
diff --git a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-zynq-scr.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-zynq-scr.bb
index a75484a8..a75484a8 100644
--- a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-zynq-scr.bb
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-zynq-scr.bb
diff --git a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-zynq-scr/boot.cmd.generic b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-zynq-scr/boot.cmd.generic
index 0249a8a0..0249a8a0 100644
--- a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-zynq-scr/boot.cmd.generic
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-zynq-scr/boot.cmd.generic
diff --git a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-zynq-scr/boot.cmd.qspi.versal b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-zynq-scr/boot.cmd.qspi.versal
index d56b7c8c..d56b7c8c 100644
--- a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-zynq-scr/boot.cmd.qspi.versal
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-zynq-scr/boot.cmd.qspi.versal
diff --git a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-zynq-scr/boot.cmd.sd.versal b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-zynq-scr/boot.cmd.sd.versal
index 10e83cd0..10e83cd0 100644
--- a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-zynq-scr/boot.cmd.sd.versal
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-zynq-scr/boot.cmd.sd.versal
diff --git a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-zynq-scr/boot.cmd.sd.zynq b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-zynq-scr/boot.cmd.sd.zynq
index bbd2e01e..bbd2e01e 100644
--- a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-zynq-scr/boot.cmd.sd.zynq
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-zynq-scr/boot.cmd.sd.zynq
diff --git a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-zynq-scr/boot.cmd.sd.zynqmp b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-zynq-scr/boot.cmd.sd.zynqmp
index b234a8df..b234a8df 100644
--- a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-zynq-scr/boot.cmd.sd.zynqmp
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-zynq-scr/boot.cmd.sd.zynqmp
diff --git a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-zynq-scr/boot.cmd.ubifs b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-zynq-scr/boot.cmd.ubifs
index 60c48eda..60c48eda 100644
--- a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-zynq-scr/boot.cmd.ubifs
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-zynq-scr/boot.cmd.ubifs
diff --git a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-zynq-scr/pxeboot.pxe b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-zynq-scr/pxeboot.pxe
index 40796545..40796545 100644
--- a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-zynq-scr/pxeboot.pxe
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-zynq-scr/pxeboot.pxe
diff --git a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-zynq-uenv.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-zynq-uenv.bb
index 52ae09f0..52ae09f0 100644
--- a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-zynq-uenv.bb
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-zynq-uenv.bb
diff --git a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot_%.bbappend b/meta-xilinx-core/recipes-bsp/u-boot/u-boot_%.bbappend
index b8522369..b8522369 100644
--- a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot_%.bbappend
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot_%.bbappend
diff --git a/meta-xilinx-bsp/recipes-core/glibc/glibc-locale_%.bbappend b/meta-xilinx-core/recipes-core/glibc/glibc-locale_%.bbappend
index 1702b75d..1702b75d 100644
--- a/meta-xilinx-bsp/recipes-core/glibc/glibc-locale_%.bbappend
+++ b/meta-xilinx-core/recipes-core/glibc/glibc-locale_%.bbappend
diff --git a/meta-xilinx-bsp/recipes-devtools/python/python3-anytree_2.8.0.bb b/meta-xilinx-core/recipes-devtools/python/python3-anytree_2.8.0.bb
index f5070be7..f5070be7 100644
--- a/meta-xilinx-bsp/recipes-devtools/python/python3-anytree_2.8.0.bb
+++ b/meta-xilinx-core/recipes-devtools/python/python3-anytree_2.8.0.bb
diff --git a/meta-xilinx-bsp/recipes-devtools/python/python3-flask-restful_%.bbappend b/meta-xilinx-core/recipes-devtools/python/python3-flask-restful_%.bbappend
index 608377e3..608377e3 100644
--- a/meta-xilinx-bsp/recipes-devtools/python/python3-flask-restful_%.bbappend
+++ b/meta-xilinx-core/recipes-devtools/python/python3-flask-restful_%.bbappend
diff --git a/meta-xilinx-bsp/recipes-devtools/python/python3-flask_%.bbappend b/meta-xilinx-core/recipes-devtools/python/python3-flask_%.bbappend
index 608377e3..608377e3 100644
--- a/meta-xilinx-bsp/recipes-devtools/python/python3-flask_%.bbappend
+++ b/meta-xilinx-core/recipes-devtools/python/python3-flask_%.bbappend
diff --git a/meta-xilinx-bsp/recipes-devtools/python/python3-itsdangerous_%.bbappend b/meta-xilinx-core/recipes-devtools/python/python3-itsdangerous_%.bbappend
index 608377e3..608377e3 100644
--- a/meta-xilinx-bsp/recipes-devtools/python/python3-itsdangerous_%.bbappend
+++ b/meta-xilinx-core/recipes-devtools/python/python3-itsdangerous_%.bbappend
diff --git a/meta-xilinx-bsp/recipes-devtools/python/python3-pandas_%.bbappend b/meta-xilinx-core/recipes-devtools/python/python3-pandas_%.bbappend
index 608377e3..608377e3 100644
--- a/meta-xilinx-bsp/recipes-devtools/python/python3-pandas_%.bbappend
+++ b/meta-xilinx-core/recipes-devtools/python/python3-pandas_%.bbappend
diff --git a/meta-xilinx-bsp/recipes-devtools/python/python3-werkzeug_%.bbappend b/meta-xilinx-core/recipes-devtools/python/python3-werkzeug_%.bbappend
index 608377e3..608377e3 100644
--- a/meta-xilinx-bsp/recipes-devtools/python/python3-werkzeug_%.bbappend
+++ b/meta-xilinx-core/recipes-devtools/python/python3-werkzeug_%.bbappend
diff --git a/meta-xilinx-bsp/recipes-devtools/qemu/files/0001-Add-enable-disable-udev.patch b/meta-xilinx-core/recipes-devtools/qemu/files/0001-Add-enable-disable-udev.patch
index 32c33385..32c33385 100644
--- a/meta-xilinx-bsp/recipes-devtools/qemu/files/0001-Add-enable-disable-udev.patch
+++ b/meta-xilinx-core/recipes-devtools/qemu/files/0001-Add-enable-disable-udev.patch
diff --git a/meta-xilinx-bsp/recipes-devtools/qemu/files/0010-configure-Add-pkg-config-handling-for-libgcrypt.patch b/meta-xilinx-core/recipes-devtools/qemu/files/0010-configure-Add-pkg-config-handling-for-libgcrypt.patch
index a8ab7daa..a8ab7daa 100644
--- a/meta-xilinx-bsp/recipes-devtools/qemu/files/0010-configure-Add-pkg-config-handling-for-libgcrypt.patch
+++ b/meta-xilinx-core/recipes-devtools/qemu/files/0010-configure-Add-pkg-config-handling-for-libgcrypt.patch
diff --git a/meta-xilinx-bsp/recipes-devtools/qemu/files/flash_stripe.c b/meta-xilinx-core/recipes-devtools/qemu/files/flash_stripe.c
index a9a6e76a..a9a6e76a 100644
--- a/meta-xilinx-bsp/recipes-devtools/qemu/files/flash_stripe.c
+++ b/meta-xilinx-core/recipes-devtools/qemu/files/flash_stripe.c
diff --git a/meta-xilinx-bsp/recipes-devtools/qemu/files/qemu-system-aarch64-multiarch b/meta-xilinx-core/recipes-devtools/qemu/files/qemu-system-aarch64-multiarch
index 6f7fb522..6f7fb522 100644
--- a/meta-xilinx-bsp/recipes-devtools/qemu/files/qemu-system-aarch64-multiarch
+++ b/meta-xilinx-core/recipes-devtools/qemu/files/qemu-system-aarch64-multiarch
diff --git a/meta-xilinx-bsp/recipes-devtools/qemu/flashstrip_1.0.bb b/meta-xilinx-core/recipes-devtools/qemu/flashstrip_1.0.bb
index e1dcc5ae..e1dcc5ae 100644
--- a/meta-xilinx-bsp/recipes-devtools/qemu/flashstrip_1.0.bb
+++ b/meta-xilinx-core/recipes-devtools/qemu/flashstrip_1.0.bb
diff --git a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-devicetrees.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees.inc
index 6d834297..6d834297 100644
--- a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-devicetrees.inc
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees.inc
diff --git a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-devicetrees/0001-Makefile-Use-python3-instead-of-python.patch b/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees/0001-Makefile-Use-python3-instead-of-python.patch
index 425145d0..425145d0 100644
--- a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-devicetrees/0001-Makefile-Use-python3-instead-of-python.patch
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees/0001-Makefile-Use-python3-instead-of-python.patch
diff --git a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-devicetrees_2021.2.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2021.2.bb
index 98785e7e..98785e7e 100644
--- a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-devicetrees_2021.2.bb
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees_2021.2.bb
diff --git a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx-helper-native_1.0.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-helper-native_1.0.bb
index efd23d50..efd23d50 100644
--- a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx-helper-native_1.0.bb
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-helper-native_1.0.bb
diff --git a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx-multiarch-helper-native_1.0.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-multiarch-helper-native_1.0.bb
index 1eec0163..1eec0163 100644
--- a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx-multiarch-helper-native_1.0.bb
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-multiarch-helper-native_1.0.bb
diff --git a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx-native.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native.inc
index 3faabe5b..3faabe5b 100644
--- a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx-native.inc
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native.inc
diff --git a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx-native_2021.2.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2021.2.bb
index f657186f..f657186f 100644
--- a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx-native_2021.2.bb
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-native_2021.2.bb
diff --git a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx-system-native_2021.2.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2021.2.bb
index b30777d2..b30777d2 100644
--- a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx-system-native_2021.2.bb
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_2021.2.bb
diff --git a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx.inc
index dcdf520f..dcdf520f 100644
--- a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx.inc
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx.inc
diff --git a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx_2021.2.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2021.2.bb
index 5189595a..5189595a 100644
--- a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx_2021.2.bb
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx_2021.2.bb
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu_%.bbappend b/meta-xilinx-core/recipes-devtools/qemu/qemu_%.bbappend
new file mode 100644
index 00000000..bb792de2
--- /dev/null
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu_%.bbappend
@@ -0,0 +1,2 @@
+# Has a dependency on libmali
+PACKAGE_ARCH:mali400 = "${SOC_VARIANT_ARCH}"
diff --git a/meta-xilinx-bsp/recipes-devtools/run-postinsts/run-postinsts_%.bbappend b/meta-xilinx-core/recipes-devtools/run-postinsts/run-postinsts_%.bbappend
index cb5a912b..cb5a912b 100644
--- a/meta-xilinx-bsp/recipes-devtools/run-postinsts/run-postinsts_%.bbappend
+++ b/meta-xilinx-core/recipes-devtools/run-postinsts/run-postinsts_%.bbappend
diff --git a/meta-xilinx-core/recipes-gnome/gtk+/gtk+3_%.bbappend b/meta-xilinx-core/recipes-gnome/gtk+/gtk+3_%.bbappend
new file mode 100644
index 00000000..bb792de2
--- /dev/null
+++ b/meta-xilinx-core/recipes-gnome/gtk+/gtk+3_%.bbappend
@@ -0,0 +1,2 @@
+# Has a dependency on libmali
+PACKAGE_ARCH:mali400 = "${SOC_VARIANT_ARCH}"
diff --git a/meta-xilinx-core/recipes-graphics/cairo/cairo_%.bbappend b/meta-xilinx-core/recipes-graphics/cairo/cairo_%.bbappend
new file mode 100644
index 00000000..68805315
--- /dev/null
+++ b/meta-xilinx-core/recipes-graphics/cairo/cairo_%.bbappend
@@ -0,0 +1,7 @@
+PACKAGECONFIG:mali400 = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xcb', '', d)} \
+                         egl glesv2"
+
+# OpenGL comes from libmali
+DEPENDS:append:mali400 = " libmali-xlnx"
+
+PACKAGE_ARCH:mali400 = "${SOC_VARIANT_ARCH}"
diff --git a/meta-xilinx-core/recipes-graphics/libepoxy/libepoxy_%.bbappend b/meta-xilinx-core/recipes-graphics/libepoxy/libepoxy_%.bbappend
new file mode 100644
index 00000000..bb792de2
--- /dev/null
+++ b/meta-xilinx-core/recipes-graphics/libepoxy/libepoxy_%.bbappend
@@ -0,0 +1,2 @@
+# Has a dependency on libmali
+PACKAGE_ARCH:mali400 = "${SOC_VARIANT_ARCH}"
diff --git a/meta-xilinx-bsp/recipes-graphics/libgles/files/egl.pc b/meta-xilinx-core/recipes-graphics/libgles/files/egl.pc
index 65c4c1f3..65c4c1f3 100644
--- a/meta-xilinx-bsp/recipes-graphics/libgles/files/egl.pc
+++ b/meta-xilinx-core/recipes-graphics/libgles/files/egl.pc
diff --git a/meta-xilinx-bsp/recipes-graphics/libgles/files/gbm.pc b/meta-xilinx-core/recipes-graphics/libgles/files/gbm.pc
index c40b5f4f..c40b5f4f 100644
--- a/meta-xilinx-bsp/recipes-graphics/libgles/files/gbm.pc
+++ b/meta-xilinx-core/recipes-graphics/libgles/files/gbm.pc
diff --git a/meta-xilinx-bsp/recipes-graphics/libgles/files/glesv1.pc b/meta-xilinx-core/recipes-graphics/libgles/files/glesv1.pc
index 39467f33..39467f33 100644
--- a/meta-xilinx-bsp/recipes-graphics/libgles/files/glesv1.pc
+++ b/meta-xilinx-core/recipes-graphics/libgles/files/glesv1.pc
diff --git a/meta-xilinx-bsp/recipes-graphics/libgles/files/glesv1_cm.pc b/meta-xilinx-core/recipes-graphics/libgles/files/glesv1_cm.pc
index 1547b4c8..1547b4c8 100644
--- a/meta-xilinx-bsp/recipes-graphics/libgles/files/glesv1_cm.pc
+++ b/meta-xilinx-core/recipes-graphics/libgles/files/glesv1_cm.pc
diff --git a/meta-xilinx-bsp/recipes-graphics/libgles/files/glesv2.pc b/meta-xilinx-core/recipes-graphics/libgles/files/glesv2.pc
index a0a84f23..a0a84f23 100644
--- a/meta-xilinx-bsp/recipes-graphics/libgles/files/glesv2.pc
+++ b/meta-xilinx-core/recipes-graphics/libgles/files/glesv2.pc
diff --git a/meta-xilinx-bsp/recipes-graphics/libgles/libmali-xlnx.bb b/meta-xilinx-core/recipes-graphics/libgles/libmali-xlnx.bb
index 79e0d90b..79e0d90b 100644
--- a/meta-xilinx-bsp/recipes-graphics/libgles/libmali-xlnx.bb
+++ b/meta-xilinx-core/recipes-graphics/libgles/libmali-xlnx.bb
diff --git a/meta-xilinx-core/recipes-graphics/libglu/libglu_%.bbappend b/meta-xilinx-core/recipes-graphics/libglu/libglu_%.bbappend
new file mode 100644
index 00000000..54fb4298
--- /dev/null
+++ b/meta-xilinx-core/recipes-graphics/libglu/libglu_%.bbappend
@@ -0,0 +1,3 @@
+# OpenGL comes from libmali, adjust parameters
+DEPENDS:append:mali400 =  " virtual/libgles2"
+PACKAGE_ARCH:mali400 = "${SOC_VARIANT_ARCH}"
diff --git a/meta-xilinx-core/recipes-graphics/libsdl2/libsdl2_%.bbappend b/meta-xilinx-core/recipes-graphics/libsdl2/libsdl2_%.bbappend
new file mode 100644
index 00000000..c3b20716
--- /dev/null
+++ b/meta-xilinx-core/recipes-graphics/libsdl2/libsdl2_%.bbappend
@@ -0,0 +1,3 @@
+# Has a dependency on libmali
+PACKAGE_ARCH:mali400 = "${SOC_VARIANT_ARCH}"
+
diff --git a/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali.bb b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali.bb
index 1e584241..1e584241 100644
--- a/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali.bb
+++ b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali.bb
diff --git a/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali/0001-Change-Makefile-to-be-compatible-with-Yocto.patch b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0001-Change-Makefile-to-be-compatible-with-Yocto.patch
index 3c82f602..3c82f602 100644
--- a/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali/0001-Change-Makefile-to-be-compatible-with-Yocto.patch
+++ b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0001-Change-Makefile-to-be-compatible-with-Yocto.patch
diff --git a/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali/0002-staging-mali-r8p0-01rel0-Add-the-ZYNQ-ZYNQMP-platfor.patch b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0002-staging-mali-r8p0-01rel0-Add-the-ZYNQ-ZYNQMP-platfor.patch
index 0a7b6736..0a7b6736 100644
--- a/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali/0002-staging-mali-r8p0-01rel0-Add-the-ZYNQ-ZYNQMP-platfor.patch
+++ b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0002-staging-mali-r8p0-01rel0-Add-the-ZYNQ-ZYNQMP-platfor.patch
diff --git a/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali/0003-staging-mali-r8p0-01rel0-Remove-unused-trace-macros.patch b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0003-staging-mali-r8p0-01rel0-Remove-unused-trace-macros.patch
index 98aa6ac9..98aa6ac9 100644
--- a/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali/0003-staging-mali-r8p0-01rel0-Remove-unused-trace-macros.patch
+++ b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0003-staging-mali-r8p0-01rel0-Remove-unused-trace-macros.patch
diff --git a/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali/0004-staging-mali-r8p0-01rel0-Don-t-include-mali_read_phy.patch b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0004-staging-mali-r8p0-01rel0-Don-t-include-mali_read_phy.patch
index c5c49679..c5c49679 100644
--- a/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali/0004-staging-mali-r8p0-01rel0-Don-t-include-mali_read_phy.patch
+++ b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0004-staging-mali-r8p0-01rel0-Don-t-include-mali_read_phy.patch
diff --git a/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali/0005-linux-mali_kernel_linux.c-Handle-clock-when-probed-a.patch b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0005-linux-mali_kernel_linux.c-Handle-clock-when-probed-a.patch
index 3d784604..3d784604 100644
--- a/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali/0005-linux-mali_kernel_linux.c-Handle-clock-when-probed-a.patch
+++ b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0005-linux-mali_kernel_linux.c-Handle-clock-when-probed-a.patch
diff --git a/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali/0006-arm.c-global-variable-dma_ops-is-removed-from-the-ke.patch b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0006-arm.c-global-variable-dma_ops-is-removed-from-the-ke.patch
index 3e1745fd..3e1745fd 100644
--- a/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali/0006-arm.c-global-variable-dma_ops-is-removed-from-the-ke.patch
+++ b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0006-arm.c-global-variable-dma_ops-is-removed-from-the-ke.patch
diff --git a/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali/0010-common-mali_pm.c-Add-PM-runtime-barrier-after-removi.patch b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0010-common-mali_pm.c-Add-PM-runtime-barrier-after-removi.patch
index 98a86c88..98a86c88 100644
--- a/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali/0010-common-mali_pm.c-Add-PM-runtime-barrier-after-removi.patch
+++ b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0010-common-mali_pm.c-Add-PM-runtime-barrier-after-removi.patch
diff --git a/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali/0011-linux-mali_kernel_linux.c-Enable-disable-clock-for-r.patch b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0011-linux-mali_kernel_linux.c-Enable-disable-clock-for-r.patch
index 38ab4042..38ab4042 100644
--- a/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali/0011-linux-mali_kernel_linux.c-Enable-disable-clock-for-r.patch
+++ b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0011-linux-mali_kernel_linux.c-Enable-disable-clock-for-r.patch
diff --git a/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali/0012-linux-mali_memory_os_alloc-Remove-__GFP_COLD.patch b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0012-linux-mali_memory_os_alloc-Remove-__GFP_COLD.patch
index 24f0a22c..24f0a22c 100644
--- a/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali/0012-linux-mali_memory_os_alloc-Remove-__GFP_COLD.patch
+++ b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0012-linux-mali_memory_os_alloc-Remove-__GFP_COLD.patch
diff --git a/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali/0013-linux-mali_memory_secure-Add-header-file-dma-direct..patch b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0013-linux-mali_memory_secure-Add-header-file-dma-direct..patch
index c28a83f4..c28a83f4 100644
--- a/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali/0013-linux-mali_memory_secure-Add-header-file-dma-direct..patch
+++ b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0013-linux-mali_memory_secure-Add-header-file-dma-direct..patch
diff --git a/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali/0014-linux-mali_-timer-Get-rid-of-init_timer.patch b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0014-linux-mali_-timer-Get-rid-of-init_timer.patch
index a7c1d5cc..a7c1d5cc 100644
--- a/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali/0014-linux-mali_-timer-Get-rid-of-init_timer.patch
+++ b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0014-linux-mali_-timer-Get-rid-of-init_timer.patch
diff --git a/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali/0015-fix-driver-failed-to-check-map-error.patch b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0015-fix-driver-failed-to-check-map-error.patch
index 5363c37e..5363c37e 100644
--- a/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali/0015-fix-driver-failed-to-check-map-error.patch
+++ b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0015-fix-driver-failed-to-check-map-error.patch
diff --git a/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali/0016-mali_memory_secure-Kernel-5.0-onwards-access_ok-API-.patch b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0016-mali_memory_secure-Kernel-5.0-onwards-access_ok-API-.patch
index dc8bbebf..dc8bbebf 100644
--- a/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali/0016-mali_memory_secure-Kernel-5.0-onwards-access_ok-API-.patch
+++ b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0016-mali_memory_secure-Kernel-5.0-onwards-access_ok-API-.patch
diff --git a/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali/0017-Support-for-vm_insert_pfn-deprecated-from-kernel-4.2.patch b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0017-Support-for-vm_insert_pfn-deprecated-from-kernel-4.2.patch
index 9c4bbee9..9c4bbee9 100644
--- a/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali/0017-Support-for-vm_insert_pfn-deprecated-from-kernel-4.2.patch
+++ b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0017-Support-for-vm_insert_pfn-deprecated-from-kernel-4.2.patch
diff --git a/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali/0018-Change-return-type-to-vm_fault_t-for-fault-handler.patch b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0018-Change-return-type-to-vm_fault_t-for-fault-handler.patch
index 9797db62..9797db62 100644
--- a/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali/0018-Change-return-type-to-vm_fault_t-for-fault-handler.patch
+++ b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0018-Change-return-type-to-vm_fault_t-for-fault-handler.patch
diff --git a/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali/0019-get_monotonic_boottime-ts-deprecated-from-kernel-4.2.patch b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0019-get_monotonic_boottime-ts-deprecated-from-kernel-4.2.patch
index 154bb673..154bb673 100644
--- a/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali/0019-get_monotonic_boottime-ts-deprecated-from-kernel-4.2.patch
+++ b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0019-get_monotonic_boottime-ts-deprecated-from-kernel-4.2.patch
diff --git a/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali/0020-Fix-ioremap_nocache-deprecation-in-kernel-5.6.patch b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0020-Fix-ioremap_nocache-deprecation-in-kernel-5.6.patch
index ff86091f..ff86091f 100644
--- a/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali/0020-Fix-ioremap_nocache-deprecation-in-kernel-5.6.patch
+++ b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0020-Fix-ioremap_nocache-deprecation-in-kernel-5.6.patch
diff --git a/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali/0021-Use-updated-timekeeping-functions-in-kernel-5.6.patch b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0021-Use-updated-timekeeping-functions-in-kernel-5.6.patch
index adef8e18..adef8e18 100644
--- a/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali/0021-Use-updated-timekeeping-functions-in-kernel-5.6.patch
+++ b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0021-Use-updated-timekeeping-functions-in-kernel-5.6.patch
diff --git a/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali/0022-Set-HAVE_UNLOCKED_IOCTL-default-to-true.patch b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0022-Set-HAVE_UNLOCKED_IOCTL-default-to-true.patch
index 181df7b7..181df7b7 100644
--- a/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali/0022-Set-HAVE_UNLOCKED_IOCTL-default-to-true.patch
+++ b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0022-Set-HAVE_UNLOCKED_IOCTL-default-to-true.patch
diff --git a/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali/0023-Use-PTR_ERR_OR_ZERO-instead-of-PTR_RET.patch b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0023-Use-PTR_ERR_OR_ZERO-instead-of-PTR_RET.patch
index bab2bd37..bab2bd37 100644
--- a/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali/0023-Use-PTR_ERR_OR_ZERO-instead-of-PTR_RET.patch
+++ b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali/0023-Use-PTR_ERR_OR_ZERO-instead-of-PTR_RET.patch
diff --git a/meta-xilinx-bsp/recipes-graphics/mesa/mesa-demos_%.bbappend b/meta-xilinx-core/recipes-graphics/mesa/mesa-demos_%.bbappend
index af5dec9e..ca910830 100644
--- a/meta-xilinx-bsp/recipes-graphics/mesa/mesa-demos_%.bbappend
+++ b/meta-xilinx-core/recipes-graphics/mesa/mesa-demos_%.bbappend
@@ -1,4 +1,4 @@
 # OpenGL comes from libmali on ev/eg, when egl is enabled
-DEPENDS:append_mali400 = "${@bb.utils.contains('PACKAGECONFIG', 'egl', ' libmali-xlnx', '', d)}"
+DEPENDS:append:mali400 = "${@bb.utils.contains('PACKAGECONFIG', 'egl', ' libmali-xlnx', '', d)}"
 
-PACKAGE_ARCH_mali400 = "${@bb.utils.contains('PACKAGECONFIG', 'egl', '${SOC_VARIANT_ARCH}', '${TUNE_PKGARCH}', d)}"
+PACKAGE_ARCH:mali400 = "${@bb.utils.contains('PACKAGECONFIG', 'egl', '${SOC_VARIANT_ARCH}', '${TUNE_PKGARCH}', d)}"
diff --git a/meta-xilinx-bsp/recipes-graphics/mesa/mesa-gl_%.bbappend b/meta-xilinx-core/recipes-graphics/mesa/mesa-gl_%.bbappend
index a5a1eeb2..a5a1eeb2 100644
--- a/meta-xilinx-bsp/recipes-graphics/mesa/mesa-gl_%.bbappend
+++ b/meta-xilinx-core/recipes-graphics/mesa/mesa-gl_%.bbappend
diff --git a/meta-xilinx-bsp/recipes-graphics/virglrenderer/virglrenderer_%.bbappend b/meta-xilinx-core/recipes-graphics/virglrenderer/virglrenderer_%.bbappend
index c3f773d6..c3f773d6 100644
--- a/meta-xilinx-bsp/recipes-graphics/virglrenderer/virglrenderer_%.bbappend
+++ b/meta-xilinx-core/recipes-graphics/virglrenderer/virglrenderer_%.bbappend
diff --git a/meta-xilinx-bsp/recipes-graphics/wayland/files/0001-libweston-Remove-substitute-format-for-ARGB8888.patch b/meta-xilinx-core/recipes-graphics/wayland/files/0001-libweston-Remove-substitute-format-for-ARGB8888.patch
index 33d33b0f..33d33b0f 100644
--- a/meta-xilinx-bsp/recipes-graphics/wayland/files/0001-libweston-Remove-substitute-format-for-ARGB8888.patch
+++ b/meta-xilinx-core/recipes-graphics/wayland/files/0001-libweston-Remove-substitute-format-for-ARGB8888.patch
diff --git a/meta-xilinx-bsp/recipes-graphics/wayland/files/weston.ini b/meta-xilinx-core/recipes-graphics/wayland/files/weston.ini
index 2ff81795..2ff81795 100644
--- a/meta-xilinx-bsp/recipes-graphics/wayland/files/weston.ini
+++ b/meta-xilinx-core/recipes-graphics/wayland/files/weston.ini
diff --git a/meta-xilinx-bsp/recipes-graphics/wayland/weston-init%.bbappend b/meta-xilinx-core/recipes-graphics/wayland/weston-init%.bbappend
index ba570d44..ba570d44 100644
--- a/meta-xilinx-bsp/recipes-graphics/wayland/weston-init%.bbappend
+++ b/meta-xilinx-core/recipes-graphics/wayland/weston-init%.bbappend
diff --git a/meta-xilinx-bsp/recipes-graphics/wayland/weston_%.bbappend b/meta-xilinx-core/recipes-graphics/wayland/weston_%.bbappend
index 26b3d389..caa49063 100644
--- a/meta-xilinx-bsp/recipes-graphics/wayland/weston_%.bbappend
+++ b/meta-xilinx-core/recipes-graphics/wayland/weston_%.bbappend
@@ -3,12 +3,12 @@ FILESEXTRAPATHS:prepend:zynqmp := "${THISDIR}/files:"
 SRC_URI:append:zynqmp = " file://0001-libweston-Remove-substitute-format-for-ARGB8888.patch"
 
 # OpenGL comes from libmali on ev/eg, when egl is enabled
-DEPENDS:append_mali400 = "${@bb.utils.contains('PACKAGECONFIG', 'egl', ' libmali-xlnx', '', d)}"
+DEPENDS:append:mali400 = "${@bb.utils.contains('PACKAGECONFIG', 'egl', ' libmali-xlnx', '', d)}"
 
 # Due to the SRC_URI zynqmp specific change, this needs to be SOC_FAMILY_ARCH specific
 SOC_FAMILY_ARCH ??= "${TUNE_PKGARCH}"
 ZYNQMP_PKGARCH = "${SOC_FAMILY_ARCH}"
 # But if egl is enabled, we also need to be SOC_VARIANT_ARCH specific due to libmali
-ZYNQMP_PKGARCH_mali400 = "${@bb.utils.contains('PACKAGECONFIG', 'egl', '${SOC_VARIANT_ARCH}', '${SOC_FAMILY_ARCH}', d)}"
+ZYNQMP_PKGARCH:mali400 = "${@bb.utils.contains('PACKAGECONFIG', 'egl', '${SOC_VARIANT_ARCH}', '${SOC_FAMILY_ARCH}', d)}"
 
 PACKAGE_ARCH:zynqmp = "${ZYNQMP_PKGARCH}"
diff --git a/meta-xilinx-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config/zynqmp/xorg.conf b/meta-xilinx-core/recipes-graphics/xorg-xserver/xserver-xf86-config/zynqmp/xorg.conf
index 9ef39462..9ef39462 100644
--- a/meta-xilinx-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config/zynqmp/xorg.conf
+++ b/meta-xilinx-core/recipes-graphics/xorg-xserver/xserver-xf86-config/zynqmp/xorg.conf
diff --git a/meta-xilinx-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config_%.bbappend b/meta-xilinx-core/recipes-graphics/xorg-xserver/xserver-xf86-config_%.bbappend
index 4fc41d05..4fc41d05 100644
--- a/meta-xilinx-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config_%.bbappend
+++ b/meta-xilinx-core/recipes-graphics/xorg-xserver/xserver-xf86-config_%.bbappend
diff --git a/meta-xilinx-bsp/recipes-kernel/dp/kernel-module-dp_git.bb b/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_git.bb
index 4d8bd265..4d8bd265 100755
--- a/meta-xilinx-bsp/recipes-kernel/dp/kernel-module-dp_git.bb
+++ b/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_git.bb
diff --git a/meta-xilinx-bsp/recipes-kernel/dtc/python3-dtc_1.6.0.bb b/meta-xilinx-core/recipes-kernel/dtc/python3-dtc_1.6.0.bb
index f57b2b19..f57b2b19 100644
--- a/meta-xilinx-bsp/recipes-kernel/dtc/python3-dtc_1.6.0.bb
+++ b/meta-xilinx-core/recipes-kernel/dtc/python3-dtc_1.6.0.bb
diff --git a/meta-xilinx-bsp/recipes-kernel/hdmi/kernel-module-hdmi_git.bb b/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_git.bb
index 65484fca..65484fca 100644
--- a/meta-xilinx-bsp/recipes-kernel/hdmi/kernel-module-hdmi_git.bb
+++ b/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_git.bb
diff --git a/meta-xilinx-bsp/recipes-kernel/linux-firmware/linux-firmware-ti-bt.bb b/meta-xilinx-core/recipes-kernel/linux-firmware/linux-firmware-ti-bt.bb
index 1ad8ae2e..1ad8ae2e 100644
--- a/meta-xilinx-bsp/recipes-kernel/linux-firmware/linux-firmware-ti-bt.bb
+++ b/meta-xilinx-core/recipes-kernel/linux-firmware/linux-firmware-ti-bt.bb
diff --git a/meta-xilinx-bsp/recipes-kernel/linux/linux-microblaze.inc b/meta-xilinx-core/recipes-kernel/linux/linux-microblaze.inc
index 4555bc28..4555bc28 100644
--- a/meta-xilinx-bsp/recipes-kernel/linux/linux-microblaze.inc
+++ b/meta-xilinx-core/recipes-kernel/linux/linux-microblaze.inc
diff --git a/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx-dev.bb b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx-dev.bb
index acb9938f..acb9938f 100644
--- a/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx-dev.bb
+++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx-dev.bb
diff --git a/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx.inc b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx.inc
index 53fe83b0..31cde189 100644
--- a/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx.inc
+++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx.inc
@@ -54,7 +54,7 @@ KBUILD_DEFCONFIG:versal ?= "xilinx_defconfig"
 KERNEL_MODULE_AUTOLOAD:k26 += "usb5744"
 
 # MicroBlaze BSP fragments
-KERNEL_FEATURES:append_kc705-microblazeel = " bsp/xilinx/kc705-microblazeel-features/kc705-microblazeel-features.scc"
+KERNEL_FEATURES:append:kc705-microblazeel = " bsp/xilinx/kc705-microblazeel-features/kc705-microblazeel-features.scc"
 
 KERNEL_FEATURES:append:zynqmp = "${@bb.utils.contains('DISTRO_FEATURES', 'xen', ' features/xen/xen.scc', '', d)}"
 
diff --git a/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx/0001-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx/0001-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch
index d5b96c2d..d5b96c2d 100644
--- a/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx/0001-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch
+++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx/0001-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch
diff --git a/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx/mb-no-tree-loop-distribute-patterns.patch b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx/mb-no-tree-loop-distribute-patterns.patch
index 5a4d203d..5a4d203d 100644
--- a/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx/mb-no-tree-loop-distribute-patterns.patch
+++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx/mb-no-tree-loop-distribute-patterns.patch
diff --git a/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx_2021.2.bb b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2021.2.bb
index 660f6037..660f6037 100644
--- a/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx_2021.2.bb
+++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2021.2.bb
diff --git a/meta-xilinx-bsp/recipes-kernel/linux/linux-yocto-dev.bbappend b/meta-xilinx-core/recipes-kernel/linux/linux-yocto-dev.bbappend
index 05c39951..05c39951 100644
--- a/meta-xilinx-bsp/recipes-kernel/linux/linux-yocto-dev.bbappend
+++ b/meta-xilinx-core/recipes-kernel/linux/linux-yocto-dev.bbappend
diff --git a/meta-xilinx-bsp/recipes-kernel/linux/linux-yocto-tiny_%.bbappend b/meta-xilinx-core/recipes-kernel/linux/linux-yocto-tiny_%.bbappend
index 05c39951..05c39951 100644
--- a/meta-xilinx-bsp/recipes-kernel/linux/linux-yocto-tiny_%.bbappend
+++ b/meta-xilinx-core/recipes-kernel/linux/linux-yocto-tiny_%.bbappend
diff --git a/meta-xilinx-bsp/recipes-kernel/linux/linux-yocto-xilinx.inc b/meta-xilinx-core/recipes-kernel/linux/linux-yocto-xilinx.inc
index 51eab948..708c99f0 100644
--- a/meta-xilinx-bsp/recipes-kernel/linux/linux-yocto-xilinx.inc
+++ b/meta-xilinx-core/recipes-kernel/linux/linux-yocto-xilinx.inc
@@ -11,13 +11,13 @@ COMPATIBLE_MACHINE:zynqmp = "zynqmp"
 KMACHINE:zynqmp = "zynqmp"
 
 # MicroBlaze KMACHINEs
-KMACHINE_ml605-qemu-microblazeel = "qemumicroblazeel"
-KMACHINE_s3adsp1800-qemu-microblazeeb = "qemumicroblazeeb"
+KMACHINE:ml605-qemu-microblazeel = "qemumicroblazeel"
+KMACHINE:s3adsp1800-qemu-microblazeeb = "qemumicroblazeeb"
 
 # MicroBlaze default generic KMACHINE
 KMACHINE:microblaze = "microblaze"
 COMPATIBLE_MACHINE:microblaze = "microblaze"
 
 # Default kernel config fragements for specific machines
-KERNEL_FEATURES:append_kc705-microblazeel = " bsp/xilinx/kc705-microblazeel-features/kc705-microblazeel-features.scc"
+KERNEL_FEATURES:append:kc705-microblazeel = " bsp/xilinx/kc705-microblazeel-features/kc705-microblazeel-features.scc"
 
diff --git a/meta-xilinx-bsp/recipes-kernel/linux/linux-yocto_%.bbappend b/meta-xilinx-core/recipes-kernel/linux/linux-yocto_%.bbappend
index 05c39951..05c39951 100644
--- a/meta-xilinx-bsp/recipes-kernel/linux/linux-yocto_%.bbappend
+++ b/meta-xilinx-core/recipes-kernel/linux/linux-yocto_%.bbappend
diff --git a/meta-xilinx-bsp/recipes-kernel/lopper/lopper.bbappend b/meta-xilinx-core/recipes-kernel/lopper/lopper.bbappend
index aa552fe5..aa552fe5 100644
--- a/meta-xilinx-bsp/recipes-kernel/lopper/lopper.bbappend
+++ b/meta-xilinx-core/recipes-kernel/lopper/lopper.bbappend
diff --git a/meta-xilinx-bsp/recipes-kernel/lopper/xilinx-lops.bb b/meta-xilinx-core/recipes-kernel/lopper/xilinx-lops.bb
index 77456376..77456376 100644
--- a/meta-xilinx-bsp/recipes-kernel/lopper/xilinx-lops.bb
+++ b/meta-xilinx-core/recipes-kernel/lopper/xilinx-lops.bb
diff --git a/meta-xilinx-bsp/recipes-kernel/lopper/xilinx-lops/lop-microblaze-yocto.dts b/meta-xilinx-core/recipes-kernel/lopper/xilinx-lops/lop-microblaze-yocto.dts
index 72eb4665..72eb4665 100644
--- a/meta-xilinx-bsp/recipes-kernel/lopper/xilinx-lops/lop-microblaze-yocto.dts
+++ b/meta-xilinx-core/recipes-kernel/lopper/xilinx-lops/lop-microblaze-yocto.dts
diff --git a/meta-xilinx-bsp/recipes-kernel/lopper/xilinx-lops/lop-xilinx-id-cpus.dts b/meta-xilinx-core/recipes-kernel/lopper/xilinx-lops/lop-xilinx-id-cpus.dts
index 67d68bba..67d68bba 100644
--- a/meta-xilinx-bsp/recipes-kernel/lopper/xilinx-lops/lop-xilinx-id-cpus.dts
+++ b/meta-xilinx-core/recipes-kernel/lopper/xilinx-lops/lop-xilinx-id-cpus.dts
diff --git a/meta-xilinx-bsp/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_%.bbappend b/meta-xilinx-core/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_%.bbappend
index af5dec9e..ca910830 100644
--- a/meta-xilinx-bsp/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_%.bbappend
+++ b/meta-xilinx-core/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_%.bbappend
@@ -1,4 +1,4 @@
 # OpenGL comes from libmali on ev/eg, when egl is enabled
-DEPENDS:append_mali400 = "${@bb.utils.contains('PACKAGECONFIG', 'egl', ' libmali-xlnx', '', d)}"
+DEPENDS:append:mali400 = "${@bb.utils.contains('PACKAGECONFIG', 'egl', ' libmali-xlnx', '', d)}"
 
-PACKAGE_ARCH_mali400 = "${@bb.utils.contains('PACKAGECONFIG', 'egl', '${SOC_VARIANT_ARCH}', '${TUNE_PKGARCH}', d)}"
+PACKAGE_ARCH:mali400 = "${@bb.utils.contains('PACKAGECONFIG', 'egl', '${SOC_VARIANT_ARCH}', '${TUNE_PKGARCH}', d)}"
diff --git a/meta-xilinx-bsp/recipes-multimedia/vcu/kernel-module-vcu.bb b/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu.bb
index 93733631..93733631 100644
--- a/meta-xilinx-bsp/recipes-multimedia/vcu/kernel-module-vcu.bb
+++ b/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu.bb
diff --git a/meta-xilinx-bsp/recipes-multimedia/vcu/libomxil-xlnx.bb b/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx.bb
index 7d37c66a..7d37c66a 100644
--- a/meta-xilinx-bsp/recipes-multimedia/vcu/libomxil-xlnx.bb
+++ b/meta-xilinx-core/recipes-multimedia/vcu/libomxil-xlnx.bb
diff --git a/meta-xilinx-bsp/recipes-multimedia/vcu/libvcu-xlnx.bb b/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx.bb
index 0a5ab35e..0a5ab35e 100644
--- a/meta-xilinx-bsp/recipes-multimedia/vcu/libvcu-xlnx.bb
+++ b/meta-xilinx-core/recipes-multimedia/vcu/libvcu-xlnx.bb
diff --git a/meta-xilinx-bsp/recipes-multimedia/vcu/vcu-firmware.bb b/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware.bb
index 2c4fc780..2c4fc780 100644
--- a/meta-xilinx-bsp/recipes-multimedia/vcu/vcu-firmware.bb
+++ b/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware.bb
diff --git a/meta-xilinx-bsp/recipes-support/libgpg-error/files/lock-obj-pub.microblazeel-unknown-linux-gnu.h b/meta-xilinx-core/recipes-support/libgpg-error/files/lock-obj-pub.microblazeel-unknown-linux-gnu.h
index 9843f4d9..9843f4d9 100644
--- a/meta-xilinx-bsp/recipes-support/libgpg-error/files/lock-obj-pub.microblazeel-unknown-linux-gnu.h
+++ b/meta-xilinx-core/recipes-support/libgpg-error/files/lock-obj-pub.microblazeel-unknown-linux-gnu.h
diff --git a/meta-xilinx-bsp/recipes-support/libgpg-error/libgpg-error_%.bbappend b/meta-xilinx-core/recipes-support/libgpg-error/libgpg-error_%.bbappend
index f3e920c2..f3e920c2 100644
--- a/meta-xilinx-bsp/recipes-support/libgpg-error/libgpg-error_%.bbappend
+++ b/meta-xilinx-core/recipes-support/libgpg-error/libgpg-error_%.bbappend
diff --git a/meta-xilinx-bsp/recipes-xrt/xrt/xrt.inc b/meta-xilinx-core/recipes-xrt/xrt/xrt.inc
index ccca9922..ccca9922 100644
--- a/meta-xilinx-bsp/recipes-xrt/xrt/xrt.inc
+++ b/meta-xilinx-core/recipes-xrt/xrt/xrt.inc
diff --git a/meta-xilinx-bsp/recipes-xrt/xrt/xrt_git.bb b/meta-xilinx-core/recipes-xrt/xrt/xrt_git.bb
index f73d3d2b..f73d3d2b 100644
--- a/meta-xilinx-bsp/recipes-xrt/xrt/xrt_git.bb
+++ b/meta-xilinx-core/recipes-xrt/xrt/xrt_git.bb
diff --git a/meta-xilinx-bsp/recipes-xrt/zocl/zocl_git.bb b/meta-xilinx-core/recipes-xrt/zocl/zocl_git.bb
index 40578aa2..40578aa2 100644
--- a/meta-xilinx-bsp/recipes-xrt/zocl/zocl_git.bb
+++ b/meta-xilinx-core/recipes-xrt/zocl/zocl_git.bb
diff --git a/meta-xilinx-pynq/recipes-support/libcma/libcma_1.0.bb b/meta-xilinx-pynq/recipes-support/libcma/libcma_1.0.bb
index bd28e702..6191d28d 100644
--- a/meta-xilinx-pynq/recipes-support/libcma/libcma_1.0.bb
+++ b/meta-xilinx-pynq/recipes-support/libcma/libcma_1.0.bb
@@ -24,7 +24,7 @@ do_install() {
   install -d ${D}/usr/include/
 
   cd ${S}/sdbuild/packages/libsds/libcma
-  CMA_ARCH=${CMA_ARCH_${TARGET_ARCH}} make install DESTDIR=${D}
+  CMA_ARCH=${CMA_ARCH:${TARGET_ARCH}} make install DESTDIR=${D}
 }
 
 SOLIBS = ".so"
diff --git a/meta-xilinx-pynq/recipes-support/pynq-overlay/pynq-overlay_1.0.bb b/meta-xilinx-pynq/recipes-support/pynq-overlay/pynq-overlay_1.0.bb
index 467414ed..a32290b4 100644
--- a/meta-xilinx-pynq/recipes-support/pynq-overlay/pynq-overlay_1.0.bb
+++ b/meta-xilinx-pynq/recipes-support/pynq-overlay/pynq-overlay_1.0.bb
@@ -19,11 +19,11 @@ SRC_URI = " \
 
 S="${WORKDIR}"
 
-PYNQ_DTSI ??= "pynq:zynqmp.dtsi"
-PYNQ_DTSI:zynqmp ?= "pynq:zynqmp.dtsi"
-PYNQ_DTSI:zynq ?= "pynq:zynq.dtsi"
-PYNQ_SYMBOL_DTSI:zynqmp ?= "pynq:zynqmp_symbols.dtsi"
-PYNQ_SYMBOL_DTSI:zynq ?= "pynq:zynq_symbols.dtsi"
+PYNQ_DTSI ??= "pynq_zynqmp.dtsi"
+PYNQ_DTSI:zynqmp ?= "pynq_zynqmp.dtsi"
+PYNQ_DTSI:zynq ?= "pynq_zynq.dtsi"
+PYNQ_SYMBOL_DTSI:zynqmp ?= "pynq_zynqmp_symbols.dtsi"
+PYNQ_SYMBOL_DTSI:zynq ?= "pynq_zynq_symbols.dtsi"
 PYNQ_DTBO ?= "pynq.dtbo"
 PYNQ_SYMBOL_DTBO ?= "pynq-symbols.dtbo"
 
diff --git a/meta-xilinx-standalone-experimental/classes/esw_examples.bbclass b/meta-xilinx-standalone-experimental/classes/esw_examples.bbclass
index ea93f715..3ae01ac1 100644
--- a/meta-xilinx-standalone-experimental/classes/esw_examples.bbclass
+++ b/meta-xilinx-standalone-experimental/classes/esw_examples.bbclass
@@ -26,8 +26,8 @@ do_install() {
 }
 
 do_deploy() {
-    install -d ${DEPLOYDIR}/${MACHINE}-${BPN}/
-    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${MACHINE}-${BPN}/
+    install -d ${DEPLOYDIR}/
+    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/
 }
 addtask deploy before do_build after do_package
 
diff --git a/meta-xilinx-standalone-experimental/recipes-core/meta/files/README-setup b/meta-xilinx-standalone-experimental/recipes-core/meta/files/README-setup
index 5a01c33e..88046966 100644
--- a/meta-xilinx-standalone-experimental/recipes-core/meta/files/README-setup
+++ b/meta-xilinx-standalone-experimental/recipes-core/meta/files/README-setup
@@ -32,10 +32,10 @@ however you may use any path you wish.
 . <build>/prestep/environment-setup-x86_64-petalinux-linux
 
 # Run the script from the same directory as this README
-<build>/prestep/dt-processor.sh <path_to_conf> <dtb>
+<build>/prestep/dt-processor.sh -c <conf> -s <dtb>
 
 # For example, zynqmp:
-# <build>/prestep/dt-processor.sh <build>/conf <device-tree>/zu-sdt/system-top.dts
+# <build>/prestep/dt-processor.sh -c <build>/conf -s <device-tree>/zu-sdt/system-top.dts
 #
 # Follow the instructions returned by the script!
 # Such as:
@@ -61,7 +61,7 @@ PMU_FIRMWARE_DEPLOY_DIR = "${BASE_TMPDIR}/tmp-microblaze-pmu/deploy/images/${MAC
 # OR
 #
 # Versal:
-# <build>/prestep/dt-processor.sh <build>/conf <device-tree>/vck190-sdt/system-top.dts
+# <build>/prestep/dt-processor.sh -c <build>/conf -s <device-tree>/vck190-sdt/system-top.dts
 #
 # Follow the instructions returned by the script!
 # Such as:
diff --git a/meta-xilinx-standalone-experimental/recipes-core/meta/files/dt-processor.sh b/meta-xilinx-standalone-experimental/recipes-core/meta/files/dt-processor.sh
index 243a2cfd..a8da5b4a 100755
--- a/meta-xilinx-standalone-experimental/recipes-core/meta/files/dt-processor.sh
+++ b/meta-xilinx-standalone-experimental/recipes-core/meta/files/dt-processor.sh
@@ -89,7 +89,7 @@ detect_machine() {
 }
 
 cortex_a53_linux() {
-  info "coretex-a53 for Linux [ $1 ]"
+  info "cortex-a53 for Linux [ $1 ]"
 
   if [ "$1" = "None" ]; then
     dtb_file="cortexa53-${machine}-linux.dtb"
@@ -130,11 +130,11 @@ cortex_a53_linux() {
 CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}"
 MACHINE = "${machine}-generic"
 # Override the SYSTEM_DTFILE for Linux builds
-SYSTEM_DTFILE_linux = "\${CONFIG_DTFILE}"
+SYSTEM_DTFILE:linux = "\${CONFIG_DTFILE}"
 # We don't want the kernel to build us a device-tree
-KERNEL_DEVICETREE_${machine}-generic = ""
+KERNEL_DEVICETREE:${machine}-generic = ""
 # We need u-boot to use the one we passed in
-DEVICE_TREE_NAME_pn-u-boot-zynq-scr = "\${@os.path.basename(d.getVar('CONFIG_DTFILE'))}"
+DEVICE_TREE_NAME:pn-u-boot-zynq-scr = "\${@os.path.basename(d.getVar('CONFIG_DTFILE'))}"
 # Update bootbin to use proper device tree
 BIF_PARTITION_IMAGE[device-tree] = "\${RECIPE_SYSROOT}/boot/devicetree/\${@os.path.basename(d.getVar('CONFIG_DTFILE'))}"
 # Remap boot files to ensure the right device tree is listed first
@@ -146,9 +146,9 @@ a53_fsbl_done=0
 cortex_a53_baremetal() {
   if [ "$1" = "fsbl" ]; then
     [ ${a53_fsbl_done} = 1 ] && return
-    info "coretex-a53 FSBL baremetal configuration"
+    info "cortex-a53 FSBL baremetal configuration"
   else
-    info "coretex-a53 for baremetal [ $1 ]"
+    info "cortex-a53 for baremetal [ $1 ]"
   fi
 
   suffix=""; lto="-nolto"
@@ -210,7 +210,7 @@ EOF
 }
 
 cortex_a53_freertos() {
-  info "coretex-a53 for FreeRTOS [ $1 ]"
+  info "cortex-a53 for FreeRTOS [ $1 ]"
 
   suffix=""
   [ "$1" != "None" ] && suffix="-$1"
@@ -262,7 +262,7 @@ EOF
 }
 
 cortex_a72_linux() {
-  info "coretex-a72 for Linux [ $1 ]"
+  info "cortex-a72 for Linux [ $1 ]"
 
   if [ "$1" = "None" ]; then
     dtb_file="cortexa72-${machine}-linux.dtb"
@@ -305,11 +305,11 @@ cortex_a72_linux() {
 CONFIG_DTFILE = "\${TOPDIR}/conf/dtb/${dtb_file}"
 MACHINE = "${machine}-generic"
 # Override the SYSTEM_DTFILE for Linux builds
-SYSTEM_DTFILE_linux = "\${CONFIG_DTFILE}"
+SYSTEM_DTFILE:linux = "\${CONFIG_DTFILE}"
 # We don't want the kernel to build us a device-tree
-KERNEL_DEVICETREE_${machine}-generic = ""
+KERNEL_DEVICETREE:${machine}-generic = ""
 # We need u-boot to use the one we passed in
-DEVICE_TREE_NAME_pn-u-boot-zynq-scr = "\${@os.path.basename(d.getVar('CONFIG_DTFILE'))}"
+DEVICE_TREE_NAME:pn-u-boot-zynq-scr = "\${@os.path.basename(d.getVar('CONFIG_DTFILE'))}"
 # Update bootbin to use proper device tree
 BIF_PARTITION_IMAGE[device-tree] = "\${RECIPE_SYSROOT}/boot/devicetree/\${@os.path.basename(d.getVar('CONFIG_DTFILE'))}"
 # Remap boot files to ensure the right device tree is listed first
@@ -318,7 +318,7 @@ EOF
 }
 
 cortex_a72_baremetal() {
-  info "coretex-a72 for baremetal [ $1 ]"
+  info "cortex-a72 for baremetal [ $1 ]"
 
   suffix=""
   [ "$1" != "None" ] && suffix="-$1"
@@ -370,7 +370,7 @@ EOF
 }
 
 cortex_a72_freertos() {
-  info "coretex-a72 for FreeRTOS [ $1 ]"
+  info "cortex-a72 for FreeRTOS [ $1 ]"
 
   suffix=""
   [ "$1" != "None" ] && suffix="-$1"
@@ -425,9 +425,9 @@ r5_fsbl_done=0
 cortex_r5_baremetal() {
   if [ "$1" = "fsbl" ]; then
     [ ${r5_fsbl_done} = 1 ] && return
-    info "coretex-r5 FSBL baremetal configuration"
+    info "cortex-r5 FSBL baremetal configuration"
   else
-    info "coretex-r5 for baremetal [ $1 ]"
+    info "cortex-r5 for baremetal [ $1 ]"
   fi
 
   suffix=""; lto="-nolto"
@@ -451,14 +451,25 @@ cortex_r5_baremetal() {
   # Build device tree
   (
     cd dtb || error "Unable to cd to dtb dir"
-    LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -i "${lops_dir}/lop-r5-imux.dts" \
-      "${system_dtb}" "${dtb_file}" || error "lopper.py failed"
+    if [ -n "$domain_file" ]; then
+      LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --permissive --enhanced -x '*.yaml' \
+        -i "${domain_file}" -i "${lops_dir}/lop-r5-imux.dts" "${system_dtb}" "${dtb_file}" \
+        || error "lopper.py failed"
+    else
+      LOPPER_DTC_FLAGS="-b 0 -@" ${lopper} -f --enhanced -i "${lops_dir}/lop-r5-imux.dts" \
+        "${system_dtb}" "${dtb_file}" || error "lopper.py failed"
+    fi
     rm -f lop-r5-imux.dts.dtb
   )
 
   # Build baremetal multiconfig
-  ${lopper} -f "${system_dtb}" -- baremetaldrvlist_xlnx cortexr5-${machine} "${embeddedsw}" \
-    || error "lopper.py failed"
+  if [ -n "${domain_file}" ]; then
+    ${lopper} -f --permissive --enhanced -x '*.yaml' -i "${domain_file}" "${system_dtb}" \
+      -- baremetaldrvlist_xlnx cortexr5-${machine} "${embeddedsw}" || error "lopper.py failed"
+  else
+    ${lopper} -f "${system_dtb}" -- baremetaldrvlist_xlnx cortexr5-${machine} "${embeddedsw}" \
+      || error "lopper.py failed"
+  fi
 
   mv libxil.conf "${libxil}"
   mv distro.conf "${distro}"
@@ -478,7 +489,7 @@ EOF
 }
 
 cortex_r5_freertos() {
-  info "coretex-r5 for FreeRTOS [ $1 ]"
+  info "cortex-r5 for FreeRTOS [ $1 ]"
 
   suffix=""
   [ "$1" != "None" ] && suffix="-$1"
@@ -506,7 +517,7 @@ cortex_r5_freertos() {
   # Build baremetal multiconfig
   if [ -n "${domain_file}" ]; then
     ${lopper} -f --permissive --enhanced -x '*.yaml' -i "${domain_file}" "${system_dtb}" \
-      -- baremetaldrvlist_xlnx coretexr5-${machine} "${embeddedsw}" || error "lopper.py failed"
+      -- baremetaldrvlist_xlnx cortexr5-${machine} "${embeddedsw}" || error "lopper.py failed"
   else
     ${lopper} -f "${system_dtb}" -- baremetaldrvlist_xlnx cortexr5-${machine} "${embeddedsw}" \
       || error "lopper.py failed"
@@ -585,7 +596,7 @@ ESW_MACHINE = "microblaze-pmu"
 
 require conf/microblaze.conf
 DEFAULTTUNE = "microblaze"
-TUNE_FEATURES_tune-microblaze_forcevariable = "\${TUNE_FEATURES_tune-pmu-microblaze}"
+TUNE_FEATURES:tune-microblaze:forcevariable = "\${TUNE_FEATURES:tune-pmu-microblaze}"
 
 TARGET_CFLAGS += "-DPSU_PMU=1U"
 
@@ -637,7 +648,7 @@ ESW_MACHINE = "microblaze-plm"
 
 require conf/microblaze.conf
 DEFAULTTUNE = "microblaze"
-TUNE_FEATURES_tune-microblaze_forcevariable = "\${TUNE_FEATURES_tune-pmc-microblaze}"
+TUNE_FEATURES:tune-microblaze:forcevariable = "\${TUNE_FEATURES:tune-pmc-microblaze}"
 
 TARGET_CFLAGS += "-DVERSAL_PLM=1"
 
@@ -689,7 +700,7 @@ ESW_MACHINE = "microblaze-psm"
 
 require conf/microblaze.conf
 DEFAULTTUNE = "microblaze"
-TUNE_FEATURES_tune-microblaze_forcevariable = "\${TUNE_FEATURES_tune-psm-microblaze}"
+TUNE_FEATURES:tune-microblaze:forcevariable = "\${TUNE_FEATURES:tune-psm-microblaze}"
 
 TARGET_CFLAGS += "-DVERSAL_psm=1"
 
@@ -808,7 +819,7 @@ gen_local_conf() {
   echo "To enable this, add the following to your local.conf:"
   echo
   echo "# Adjust BASE_TMPDIR if you want to move the tmpdirs elsewhere"
-  echo "BASE_TMPDIR = \"${TOPDIR}\""
+  echo "BASE_TMPDIR = \"\${TOPDIR}\""
   [ -n "${system_conf}" ] && echo "require ${system_conf}"
   echo "SYSTEM_DTFILE = \"${system_dtb}\""
   echo "BBMULTICONFIG += \"${multiconf}\""