33 files changed, 83 insertions, 83 deletions
diff --git a/meta-microblaze/recipes-core/newlib/microblaze-newlib.inc b/meta-microblaze/recipes-core/newlib/microblaze-newlib.inc
index f3ae4975..51b97c0f 100644
--- a/meta-microblaze/recipes-core/newlib/microblaze-newlib.inc
+++ b/meta-microblaze/recipes-core/newlib/microblaze-newlib.inc
@@ -15,6 +15,6 @@ SRC_URI:append:microblaze = " \
    file://0012-libc-machine-microblaze-strcmp.c-Fix-missing-end-of-.patch \
    "
-EXTRA_OECONF:append_xilinx-standalone:microblaze = " \
+EXTRA_OECONF:append:xilinx-standalone:microblaze = " \
    --disable-newlib-reent-check-verify \
 "
diff --git a/meta-microblaze/recipes-devtools/gdb/gdb-common.inc b/meta-microblaze/recipes-devtools/gdb/gdb-common.inc
index 72ede01e..d2bcf726 100644
--- a/meta-microblaze/recipes-devtools/gdb/gdb-common.inc
+++ b/meta-microblaze/recipes-devtools/gdb/gdb-common.inc
@@ -56,7 +56,7 @@ do_install:append() {
        rm -f ${D}${infodir}/bfd.info
 }
-RRECOMMENDS:gdb:append_linux = " glibc-thread-db "
+RRECOMMENDS:gdb:append:linux = " glibc-thread-db "
 RRECOMMENDS:gdb:append:linux-gnueabi = " glibc-thread-db "
-RRECOMMENDS:gdbserver:append_linux = " glibc-thread-db "
+RRECOMMENDS:gdbserver:append:linux = " glibc-thread-db "
 RRECOMMENDS:gdbserver:append:linux-gnueabi = " glibc-thread-db "
diff --git a/meta-xilinx-bsp/conf/local.conf.sample b/meta-xilinx-bsp/conf/local.conf.sample
index caaa2083..4b129e42 100644
--- a/meta-xilinx-bsp/conf/local.conf.sample
+++ b/meta-xilinx-bsp/conf/local.conf.sample
@@ -196,7 +196,7 @@ BB_DISKMON_DIRS = "\
 #file://.* http://someserver.tld/share/sstate/PATH;downloadfilename=PATH \n \
 #file://.* file:///some/local/dir/sstate/PATH"
-XILINX_VER_MAIN = "2021.2"
+XILINX_VER_MAIN = "2022.1"
 # Uncomment below lines to provide path for custom xsct trim
 # This is required for building Versal based devices, please fetch the
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_DEFAULT_FSTYPE:qemuboot-xilinx = "wic.qemu-sd"
-QB_OPT_APPEND:append_qemuboot-xilinx = " -boot mode=5"
+QB_OPT_APPEND:append:qemuboot-xilinx = " -boot mode=5"
-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"
 # 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_DEFAULT_FSTYPE:qemuboot-xilinx = "wic.qemu-sd"
-QB_OPT_APPEND:append_qemuboot-xilinx = " -boot mode=5"
+QB_OPT_APPEND:append:qemuboot-xilinx = " -boot mode=5"
-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"
 # 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/versal-generic.conf b/meta-xilinx-bsp/conf/machine/versal-generic.conf
index 99dc140d..2b0cd495 100644
--- a/meta-xilinx-bsp/conf/machine/versal-generic.conf
+++ b/meta-xilinx-bsp/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_DEFAULT_FSTYPE:qemuboot-xilinx = "wic.qemu-sd"
-QB_OPT_APPEND:append_qemuboot-xilinx = " -boot mode=5"
+QB_OPT_APPEND:append:qemuboot-xilinx = " -boot mode=5"
-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"
 # 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/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_DEFAULT_FSTYPE:qemuboot-xilinx = "wic.qemu-sd"
-QB_OPT_APPEND:append_qemuboot-xilinx = " -boot mode=5"
+QB_OPT_APPEND:append:qemuboot-xilinx = " -boot mode=5"
-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"
 # 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_DEFAULT_FSTYPE:qemuboot-xilinx = "wic.qemu-sd"
-QB_OPT_APPEND:append_qemuboot-xilinx = " -boot mode=5"
+QB_OPT_APPEND:append:qemuboot-xilinx = " -boot mode=5"
-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"
 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/conf/machine/zynq-generic.conf b/meta-xilinx-bsp/conf/machine/zynq-generic.conf
index 8a8d8f24..b585b7bf 100644
--- a/meta-xilinx-bsp/conf/machine/zynq-generic.conf
+++ b/meta-xilinx-bsp/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-bsp/conf/machine/zynqmp-generic.conf
index 6f33c199..581d190a 100644
--- a/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf
+++ b/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf
@@ -56,7 +56,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 \
@@ -65,9 +65,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_DEFAULT_FSTYPE:qemuboot-xilinx = "wic.qemu-sd"
-QB_OPT_APPEND:append_qemuboot-xilinx = " -boot mode=5"
+QB_OPT_APPEND:append:qemuboot-xilinx = " -boot mode=5"
-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"
 QB_PMU_OPT = " \
                -M microblaze-fdt \
@@ -78,7 +78,7 @@ 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
index c3f773d6..bb792de2 100644
--- 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
@@ -1,2 +1,2 @@
 # Has a dependency on libmali
-PACKAGE_ARCH_mali400 = "${SOC_VARIANT_ARCH}"
+PACKAGE_ARCH:mali400 = "${SOC_VARIANT_ARCH}"
diff --git a/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc b/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc
index 4f7e99f4..8f15a485 100644
--- a/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc
+++ b/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc
@@ -71,7 +71,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/bootbin/xilinx-mcs_1.0.bb b/meta-xilinx-bsp/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-bsp/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/device-tree/device-tree.bb b/meta-xilinx-bsp/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-bsp/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 = ".*"
+COMPATIBLE_MACHINE:picozed-zynq7 = ".*"
-SRC_URI:append_picozed-zynq7 = " file://picozed-zynq7.dts"
+SRC_URI:append:picozed-zynq7 = " file://picozed-zynq7.dts"
-COMPATIBLE_MACHINE_qemu-zynq7 = ".*"
+COMPATIBLE_MACHINE:qemu-zynq7 = ".*"
-SRC_URI:append_qemu-zynq7 = " file://qemu-zynq7.dts"
+SRC_URI:append:qemu-zynq7 = " file://qemu-zynq7.dts"
-COMPATIBLE_MACHINE_zybo-linux-bd-zynq7 = ".*"
+COMPATIBLE_MACHINE:zybo-linux-bd-zynq7 = ".*"
-SRC_URI:append_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 = ".*"
+COMPATIBLE_MACHINE:kc705-microblazeel = ".*"
-SRC_URI:append_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/platform-init/platform-init.bb b/meta-xilinx-bsp/recipes-bsp/platform-init/platform-init.bb
index cac8bbfc..7e7d2de3 100644
--- a/meta-xilinx-bsp/recipes-bsp/platform-init/platform-init.bb
+++ b/meta-xilinx-bsp/recipes-bsp/platform-init/platform-init.bb
@@ -10,7 +10,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 inherit xilinx-platform-init
 COMPATIBLE_MACHINE = "$^"
-COMPATIBLE_MACHINE_picozed-zynq7 = "picozed-zynq7"
+COMPATIBLE_MACHINE:picozed-zynq7 = "picozed-zynq7"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
diff --git a/meta-xilinx-bsp/recipes-devtools/qemu/qemu_%.bbappend b/meta-xilinx-bsp/recipes-devtools/qemu/qemu_%.bbappend
index c3f773d6..bb792de2 100644
--- a/meta-xilinx-bsp/recipes-devtools/qemu/qemu_%.bbappend
+++ b/meta-xilinx-bsp/recipes-devtools/qemu/qemu_%.bbappend
@@ -1,2 +1,2 @@
 # Has a dependency on libmali
-PACKAGE_ARCH_mali400 = "${SOC_VARIANT_ARCH}"
+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
index c3f773d6..bb792de2 100644
--- a/meta-xilinx-bsp/recipes-gnome/gtk+/gtk+3_%.bbappend
+++ b/meta-xilinx-bsp/recipes-gnome/gtk+/gtk+3_%.bbappend
@@ -1,2 +1,2 @@
 # Has a dependency on libmali
-PACKAGE_ARCH_mali400 = "${SOC_VARIANT_ARCH}"
+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
index 6343c38f..68805315 100644
--- a/meta-xilinx-bsp/recipes-graphics/cairo/cairo_%.bbappend
+++ b/meta-xilinx-bsp/recipes-graphics/cairo/cairo_%.bbappend
@@ -1,7 +1,7 @@
-PACKAGECONFIG_mali400 = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xcb', '', d)} \
+PACKAGECONFIG:mali400 = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xcb', '', d)} \
                         egl glesv2"
 # OpenGL comes from libmali
-DEPENDS:append_mali400 = " libmali-xlnx"
+DEPENDS:append:mali400 = " libmali-xlnx"
-PACKAGE_ARCH_mali400 = "${SOC_VARIANT_ARCH}"
+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
index c3f773d6..bb792de2 100644
--- a/meta-xilinx-bsp/recipes-graphics/libepoxy/libepoxy_%.bbappend
+++ b/meta-xilinx-bsp/recipes-graphics/libepoxy/libepoxy_%.bbappend
@@ -1,2 +1,2 @@
 # Has a dependency on libmali
-PACKAGE_ARCH_mali400 = "${SOC_VARIANT_ARCH}"
+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
index 47cefc74..54fb4298 100644
--- a/meta-xilinx-bsp/recipes-graphics/libglu/libglu_%.bbappend
+++ b/meta-xilinx-bsp/recipes-graphics/libglu/libglu_%.bbappend
@@ -1,3 +1,3 @@
 # OpenGL comes from libmali, adjust parameters
-DEPENDS:append_mali400 =  " virtual/libgles2"
+DEPENDS:append:mali400 =  " virtual/libgles2"
-PACKAGE_ARCH_mali400 = "${SOC_VARIANT_ARCH}"
+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
index fd8a07e2..c3b20716 100644
--- a/meta-xilinx-bsp/recipes-graphics/libsdl2/libsdl2_%.bbappend
+++ b/meta-xilinx-bsp/recipes-graphics/libsdl2/libsdl2_%.bbappend
@@ -1,3 +1,3 @@
 # Has a dependency on libmali
-PACKAGE_ARCH_mali400 = "${SOC_VARIANT_ARCH}"
+PACKAGE_ARCH:mali400 = "${SOC_VARIANT_ARCH}"
diff --git a/meta-xilinx-bsp/recipes-graphics/mesa/mesa-demos_%.bbappend b/meta-xilinx-bsp/recipes-graphics/mesa/mesa-demos_%.bbappend
index af5dec9e..ca910830 100644
--- a/meta-xilinx-bsp/recipes-graphics/mesa/mesa-demos_%.bbappend
+++ b/meta-xilinx-bsp/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/virglrenderer/virglrenderer_%.bbappend b/meta-xilinx-bsp/recipes-graphics/virglrenderer/virglrenderer_%.bbappend
index c3f773d6..bb792de2 100644
--- a/meta-xilinx-bsp/recipes-graphics/virglrenderer/virglrenderer_%.bbappend
+++ b/meta-xilinx-bsp/recipes-graphics/virglrenderer/virglrenderer_%.bbappend
@@ -1,2 +1,2 @@
 # Has a dependency on libmali
-PACKAGE_ARCH_mali400 = "${SOC_VARIANT_ARCH}"
+PACKAGE_ARCH:mali400 = "${SOC_VARIANT_ARCH}"
diff --git a/meta-xilinx-bsp/recipes-graphics/wayland/weston_%.bbappend b/meta-xilinx-bsp/recipes-graphics/wayland/weston_%.bbappend
index 26b3d389..caa49063 100644
--- a/meta-xilinx-bsp/recipes-graphics/wayland/weston_%.bbappend
+++ b/meta-xilinx-bsp/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-kernel/linux/linux-xlnx.inc b/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx.inc
index 53fe83b0..31cde189 100644
--- a/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx.inc
+++ b/meta-xilinx-bsp/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-yocto-xilinx.inc b/meta-xilinx-bsp/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-bsp/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:ml605-qemu-microblazeel = "qemumicroblazeel"
-KMACHINE_s3adsp1800-qemu-microblazeeb = "qemumicroblazeeb"
+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-multimedia/gstreamer/gstreamer1.0-plugins-base_%.bbappend b/meta-xilinx-bsp/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-bsp/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-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 = ".*"
+COMPATIBLE_MACHINE:minized-zynq7 = ".*"
-SRC_URI:append_minized-zynq7 = " file://minized-zynq7.dts"
+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"