Convert to new override syntax

This is the result of automated script (0.9.0) conversion: oe-core/scripts/contrib/convert-overrides.py . converting the metadata to use ":" as the override character instead of "_". Signed-off-by: Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com>
author: Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com> 2021-09-28 22:12:04 -0700
committer: Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com> 2021-09-28 22:12:06 -0700
commit: 6921a88182ce51763fcf61273972df99dc2faee5 (patch)
tree: 6505b60113f6192f347991a3a82b8bc6fb02b8d9
parent: 1d2c0f073d3102c3f8ff043d2c3039e6d360118f (diff)
download: meta-xilinx-6921a88182ce51763fcf61273972df99dc2faee5.tar.gz
210 files changed, 1024 insertions, 1024 deletions
diff --git a/meta-microblaze/conf/layer.conf b/meta-microblaze/conf/layer.conf
index c2f7b4b0..678c5de0 100644
--- a/meta-microblaze/conf/layer.conf
+++ b/meta-microblaze/conf/layer.conf
@@ -12,5 +12,5 @@ BBFILE_PRIORITY_xilinx-microblaze = "5"
 LAYERDEPENDS_xilinx-microblaze = "core"
 # Until we've moved to a newer version, we need to stick on 9.2
-GDBVERSION_microblaze = "9.2"
+GDBVERSION:microblaze = "9.2"
 LAYERSERIES_COMPAT_xilinx-microblaze = "gatesgarth honister hardknott"
diff --git a/meta-microblaze/recipes-core/newlib/libgloss_4.1.%.bbappend b/meta-microblaze/recipes-core/newlib/libgloss_4.1.%.bbappend
index e7f0a9a3..15be1732 100644
--- a/meta-microblaze/recipes-core/newlib/libgloss_4.1.%.bbappend
+++ b/meta-microblaze/recipes-core/newlib/libgloss_4.1.%.bbappend
@@ -1,6 +1,6 @@
 require microblaze-newlib.inc
-do_configure_prepend_microblaze() {
+do_configure:prepend:microblaze() {
    # hack for microblaze, which needs xilinx.ld to literally do any linking (its hard coded in its LINK_SPEC)
    export CC="${CC} -L${S}/libgloss/microblaze"
 }
@@ -8,6 +8,6 @@ do_configure_prepend_microblaze() {
 # Libgloss provides various .o files in libdir
 # These must NOT be stripped, but for some reason they are installed +x
 # which triggers them to be stripped.
-do_install_append_microblaze() {
+do_install:append:microblaze() {
    chmod 0644 ${D}${libdir}/*.o
 }
diff --git a/meta-microblaze/recipes-core/newlib/microblaze-newlib.inc b/meta-microblaze/recipes-core/newlib/microblaze-newlib.inc
index 1a4a90ad..c9589bfe 100644
--- a/meta-microblaze/recipes-core/newlib/microblaze-newlib.inc
+++ b/meta-microblaze/recipes-core/newlib/microblaze-newlib.inc
@@ -1,6 +1,6 @@
 # Add MicroBlaze Patches
-FILESEXTRAPATHS_append_microblaze := ":${THISDIR}/files"
+FILESEXTRAPATHS:append:microblaze := ":${THISDIR}/files"
-SRC_URI_append_microblaze = " \
+SRC_URI:append:microblaze = " \
    file://0001-Patch-microblaze-Add-config-microblaze.mt-for-target.patch \
    file://0002-Patch-microblaze-Modified-_exceptional_handler.patch \
    file://0003-LOCAL-Add-missing-declarations-for-xil_printf-to-std.patch \
diff --git a/meta-microblaze/recipes-core/newlib/newlib_4.1.%.bbappend b/meta-microblaze/recipes-core/newlib/newlib_4.1.%.bbappend
index d459bf19..d30e61ec 100644
--- a/meta-microblaze/recipes-core/newlib/newlib_4.1.%.bbappend
+++ b/meta-microblaze/recipes-core/newlib/newlib_4.1.%.bbappend
@@ -1,6 +1,6 @@
 require microblaze-newlib.inc
-do_configure_prepend_microblaze() {
+do_configure:prepend:microblaze() {
    # hack for microblaze, which needs xilinx.ld to literally do any linking (its hard coded in its LINK_SPEC)
    export CC="${CC} -L${S}/libgloss/microblaze"
 }
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils-cross-canadian_%.bbappend b/meta-microblaze/recipes-devtools/binutils/binutils-cross-canadian_%.bbappend
index e439cae7..3d57ddbf 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils-cross-canadian_%.bbappend
+++ b/meta-microblaze/recipes-devtools/binutils/binutils-cross-canadian_%.bbappend
@@ -1,4 +1,4 @@
 MICROBLAZEPATCHES = ""
-MICROBLAZEPATCHES_microblaze = "binutils-microblaze.inc"
+MICROBLAZEPATCHES:microblaze = "binutils-microblaze.inc"
 require ${MICROBLAZEPATCHES}
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils-cross_%.bbappend b/meta-microblaze/recipes-devtools/binutils/binutils-cross_%.bbappend
index e439cae7..3d57ddbf 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils-cross_%.bbappend
+++ b/meta-microblaze/recipes-devtools/binutils/binutils-cross_%.bbappend
@@ -1,4 +1,4 @@
 MICROBLAZEPATCHES = ""
-MICROBLAZEPATCHES_microblaze = "binutils-microblaze.inc"
+MICROBLAZEPATCHES:microblaze = "binutils-microblaze.inc"
 require ${MICROBLAZEPATCHES}
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils-microblaze.inc b/meta-microblaze/recipes-devtools/binutils/binutils-microblaze.inc
index 96ffb289..44f4cc79 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils-microblaze.inc
+++ b/meta-microblaze/recipes-devtools/binutils/binutils-microblaze.inc
@@ -1,6 +1,6 @@
-FILESEXTRAPATHS_append := ":${THISDIR}/binutils"
+FILESEXTRAPATHS:append := ":${THISDIR}/binutils"
-SRC_URI_append = " \
+SRC_URI:append = " \
     file://0001-Add-wdc.ext.clear-and-wdc.ext.flush-insns.patch \
     file://0002-Add-mlittle-endian-and-mbig-endian-flags.patch \
     file://0003-Disable-the-warning-message-for-eh_frame_hdr.patch \
diff --git a/meta-microblaze/recipes-devtools/binutils/binutils_%.bbappend b/meta-microblaze/recipes-devtools/binutils/binutils_%.bbappend
index e439cae7..3d57ddbf 100644
--- a/meta-microblaze/recipes-devtools/binutils/binutils_%.bbappend
+++ b/meta-microblaze/recipes-devtools/binutils/binutils_%.bbappend
@@ -1,4 +1,4 @@
 MICROBLAZEPATCHES = ""
-MICROBLAZEPATCHES_microblaze = "binutils-microblaze.inc"
+MICROBLAZEPATCHES:microblaze = "binutils-microblaze.inc"
 require ${MICROBLAZEPATCHES}
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-source_11.%.bbappend b/meta-microblaze/recipes-devtools/gcc/gcc-source_11.%.bbappend
index a0805425..c0ad2e66 100644
--- a/meta-microblaze/recipes-devtools/gcc/gcc-source_11.%.bbappend
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-source_11.%.bbappend
@@ -1,7 +1,7 @@
 # Add MicroBlaze Patches (only when using MicroBlaze)
-FILESEXTRAPATHS_append_microblaze := ":${THISDIR}/gcc-10"
+FILESEXTRAPATHS:append:microblaze := ":${THISDIR}/gcc-10"
-SRC_URI_append_microblaze = " \
+SRC_URI:append:microblaze = " \
    file://0001-LOCAL-Testsuite-builtins-tests-require-fpic.patch \
    file://0002-LOCAL-Quick-fail-g-.dg-opt-memcpy1.C.patch \
    file://0003-LOCAL-For-dejagnu-static-testing-on-qemu-suppress-wa.patch \
diff --git a/meta-microblaze/recipes-devtools/gdb/gdb-common.inc b/meta-microblaze/recipes-devtools/gdb/gdb-common.inc
index 08f615ad..72ede01e 100644
--- a/meta-microblaze/recipes-devtools/gdb/gdb-common.inc
+++ b/meta-microblaze/recipes-devtools/gdb/gdb-common.inc
@@ -4,10 +4,10 @@ SECTION = "devel"
 DEPENDS = "expat zlib ncurses virtual/libiconv ${LTTNGUST} bison-native"
 LTTNGUST = "lttng-ust"
-LTTNGUST_arc = ""
+LTTNGUST:arc = ""
-LTTNGUST_aarch64 = ""
+LTTNGUST:aarch64 = ""
-LTTNGUST_mipsarch = ""
+LTTNGUST:mipsarch = ""
-LTTNGUST_sh4 = ""
+LTTNGUST:sh4 = ""
 inherit autotools texinfo
@@ -49,14 +49,14 @@ do_configure () {
 # we don't want gdb to provide bfd/iberty/opcodes, which instead will override the
 # right bits installed by binutils.  Same for bfd.info -- also from binutils.
-do_install_append() {
+do_install:append() {
        rm -rf ${D}${libdir}
        rm -rf ${D}${includedir}
        rm -rf ${D}${datadir}/locale
        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: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 "
+RRECOMMENDS:gdbserver:append:linux-gnueabi = " glibc-thread-db "
diff --git a/meta-microblaze/recipes-devtools/gdb/gdb-cross-canadian.inc b/meta-microblaze/recipes-devtools/gdb/gdb-cross-canadian.inc
index c9daf25a..92bff6fc 100644
--- a/meta-microblaze/recipes-devtools/gdb/gdb-cross-canadian.inc
+++ b/meta-microblaze/recipes-devtools/gdb/gdb-cross-canadian.inc
@@ -20,7 +20,7 @@ PACKAGECONFIG[readline] = "--with-system-readline,--without-system-readline,nati
 SSTATE_DUPWHITELIST += "${STAGING_DATADIR}/gdb"
-do_configure_prepend() {
+do_configure:prepend() {
 cat > ${WORKDIR}/python << EOF
 #! /bin/sh
 case "\$2" in
@@ -36,7 +36,7 @@ EOF
 # we don't want gdb to provide bfd/iberty/opcodes, which instead will override the
 # right bits installed by binutils.
-do_install_append() {
+do_install:append() {
        rm -rf ${D}${exec_prefix}/lib
        cross_canadian_bindirlinks
 }
diff --git a/meta-microblaze/recipes-devtools/gdb/gdb-cross-canadian_%.bbappend b/meta-microblaze/recipes-devtools/gdb/gdb-cross-canadian_%.bbappend
index ceb7b02b..33fbe158 100644
--- a/meta-microblaze/recipes-devtools/gdb/gdb-cross-canadian_%.bbappend
+++ b/meta-microblaze/recipes-devtools/gdb/gdb-cross-canadian_%.bbappend
@@ -1,4 +1,4 @@
 MICROBLAZEPATCHES = ""
-MICROBLAZEPATCHES_microblaze = "gdb-microblaze.inc"
+MICROBLAZEPATCHES:microblaze = "gdb-microblaze.inc"
 require ${MICROBLAZEPATCHES}
diff --git a/meta-microblaze/recipes-devtools/gdb/gdb-cross.inc b/meta-microblaze/recipes-devtools/gdb/gdb-cross.inc
index ebe329f6..56b8726f 100644
--- a/meta-microblaze/recipes-devtools/gdb/gdb-cross.inc
+++ b/meta-microblaze/recipes-devtools/gdb/gdb-cross.inc
@@ -9,7 +9,7 @@ PACKAGECONFIG ??= "python readline"
 PACKAGECONFIG[python] = "--with-python=${PYTHON},--without-python,python3-native"
 PACKAGECONFIG[readline] = "--with-system-readline,--without-system-readline,readline-native"
-do_compile_prepend() {
+do_compile:prepend() {
    export STAGING_LIBDIR="${STAGING_LIBDIR_NATIVE}"
    export STAGING_INCDIR="${STAGING_INCDIR_NATIVE}"
 }
diff --git a/meta-microblaze/recipes-devtools/gdb/gdb-cross_%.bbappend b/meta-microblaze/recipes-devtools/gdb/gdb-cross_%.bbappend
index ceb7b02b..33fbe158 100644
--- a/meta-microblaze/recipes-devtools/gdb/gdb-cross_%.bbappend
+++ b/meta-microblaze/recipes-devtools/gdb/gdb-cross_%.bbappend
@@ -1,4 +1,4 @@
 MICROBLAZEPATCHES = ""
-MICROBLAZEPATCHES_microblaze = "gdb-microblaze.inc"
+MICROBLAZEPATCHES:microblaze = "gdb-microblaze.inc"
 require ${MICROBLAZEPATCHES}
diff --git a/meta-microblaze/recipes-devtools/gdb/gdb-microblaze.inc b/meta-microblaze/recipes-devtools/gdb/gdb-microblaze.inc
index 006b135d..b202b114 100644
--- a/meta-microblaze/recipes-devtools/gdb/gdb-microblaze.inc
+++ b/meta-microblaze/recipes-devtools/gdb/gdb-microblaze.inc
@@ -1,10 +1,10 @@
 # MicroBlaze does not support LTTng UST
-LTTNGUST_microblaze = ""
+LTTNGUST:microblaze = ""
 # Add MicroBlaze patches
-FILESEXTRAPATHS_append := ":${THISDIR}/gdb"
+FILESEXTRAPATHS:append := ":${THISDIR}/gdb"
-SRC_URI_append_microblaze = " \
+SRC_URI:append:microblaze = " \
     file://0001-Add-wdc.ext.clear-and-wdc.ext.flush-insns.patch \
     file://0003-Disable-the-warning-message-for-eh_frame_hdr.patch \
     file://0004-LOCAL-Fix-relaxation-of-assembler-resolved-reference.patch \
diff --git a/meta-microblaze/recipes-devtools/gdb/gdb.inc b/meta-microblaze/recipes-devtools/gdb/gdb.inc
index 249e24dc..49870fbd 100644
--- a/meta-microblaze/recipes-devtools/gdb/gdb.inc
+++ b/meta-microblaze/recipes-devtools/gdb/gdb.inc
@@ -2,13 +2,13 @@ require gdb-common.inc
 inherit gettext
-#LDFLAGS_append = " -s"
+#LDFLAGS:append = " -s"
-#export CFLAGS_append=" -L${STAGING_LIBDIR}"
+#export CFLAGS:append=" -L${STAGING_LIBDIR}"
 # cross-canadian must not see this
 PACKAGES =+ "gdbserver"
-FILES_gdbserver = "${bindir}/gdbserver"
+FILES:gdbserver = "${bindir}/gdbserver"
-ALLOW_EMPTY_gdbserver_riscv64 = "1"
+ALLOW_EMPTY:gdbserver:riscv64 = "1"
-ALLOW_EMPTY_gdbserver_riscv32 = "1"
+ALLOW_EMPTY:gdbserver:riscv32 = "1"
diff --git a/meta-microblaze/recipes-devtools/gdb/gdb_%.bbappend b/meta-microblaze/recipes-devtools/gdb/gdb_%.bbappend
index ceb7b02b..33fbe158 100644
--- a/meta-microblaze/recipes-devtools/gdb/gdb_%.bbappend
+++ b/meta-microblaze/recipes-devtools/gdb/gdb_%.bbappend
@@ -1,4 +1,4 @@
 MICROBLAZEPATCHES = ""
-MICROBLAZEPATCHES_microblaze = "gdb-microblaze.inc"
+MICROBLAZEPATCHES:microblaze = "gdb-microblaze.inc"
 require ${MICROBLAZEPATCHES}
diff --git a/meta-microblaze/recipes-devtools/gdb/gdb_9.2.bb b/meta-microblaze/recipes-devtools/gdb/gdb_9.2.bb
index d70757a1..e73e3a2c 100644
--- a/meta-microblaze/recipes-devtools/gdb/gdb_9.2.bb
+++ b/meta-microblaze/recipes-devtools/gdb/gdb_9.2.bb
@@ -3,7 +3,7 @@ require gdb-${PV}.inc
 inherit python3-dir
-EXTRA_OEMAKE_append_libc-musl = "\
+EXTRA_OEMAKE:append:libc-musl = "\
                                 gt_cv_func_gnugettext1_libc=yes \
                                 gt_cv_func_gnugettext2_libc=yes \
                                 gl_cv_func_working_strerror=yes \
@@ -11,7 +11,7 @@ EXTRA_OEMAKE_append_libc-musl = "\
                                 gl_cv_func_gettimeofday_clobber=no \
                                "
-do_configure_prepend() {
+do_configure:prepend() {
        if [ "${@bb.utils.filter('PACKAGECONFIG', 'python', d)}" ]; then
                cat > ${WORKDIR}/python << EOF
 #!/bin/sh
diff --git a/meta-xilinx-bsp/classes/image-types-xilinx-qemu.bbclass b/meta-xilinx-bsp/classes/image-types-xilinx-qemu.bbclass
index 9b2682cf..63318087 100644
--- a/meta-xilinx-bsp/classes/image-types-xilinx-qemu.bbclass
+++ b/meta-xilinx-bsp/classes/image-types-xilinx-qemu.bbclass
@@ -5,6 +5,6 @@
 # block device to match that of valid SD card sizes (which are multiples of
 # 512K).
-CONVERSIONTYPES_append = " qemu-sd"
+CONVERSIONTYPES:append = " qemu-sd"
-CONVERSION_CMD_qemu-sd = "cp ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.qemu-sd; truncate -s %256M ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.qemu-sd"
+CONVERSION_CMD:qemu-sd = "cp ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.qemu-sd; truncate -s %256M ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.qemu-sd"
 CONVERSION_DEPENDS_qemu-sd = "coreutils-native"
diff --git a/meta-xilinx-bsp/classes/kernel-simpleimage.bbclass b/meta-xilinx-bsp/classes/kernel-simpleimage.bbclass
index 0d996273..110ee254 100644
--- a/meta-xilinx-bsp/classes/kernel-simpleimage.bbclass
+++ b/meta-xilinx-bsp/classes/kernel-simpleimage.bbclass
@@ -21,7 +21,7 @@ do_prep_simpleimage () {
    done
 }
-do_deploy_append () {
+do_deploy:append () {
    for type in ${KERNEL_IMAGETYPES} ; do
        if [ -z "${type##*simpleImage*}" ] && [ ${ARCH} = "microblaze" ]; then
            base_name=${type}-${KERNEL_IMAGE_NAME}
diff --git a/meta-xilinx-bsp/classes/qemuboot-xilinx.bbclass b/meta-xilinx-bsp/classes/qemuboot-xilinx.bbclass
index 1c3f2bb6..48dfa6e2 100644
--- a/meta-xilinx-bsp/classes/qemuboot-xilinx.bbclass
+++ b/meta-xilinx-bsp/classes/qemuboot-xilinx.bbclass
@@ -6,9 +6,9 @@ OVERRIDES .= ":qemuboot-xilinx"
 # Allow QB_MACHINE to be overridden by a BSP config
 QB_MACHINE ?= "${QB_MACHINE_XILINX}"
 QB_RNG=""
-QB_MACHINE_XILINX_aarch64 = "-machine arm-generic-fdt"
+QB_MACHINE_XILINX:aarch64 = "-machine arm-generic-fdt"
-QB_MACHINE_XILINX_arm = "-M arm-generic-fdt-7series"
+QB_MACHINE_XILINX:arm = "-M arm-generic-fdt-7series"
-QB_MACHINE_XILINX_microblaze = "-M microblaze-fdt-plnx"
+QB_MACHINE_XILINX:microblaze = "-M microblaze-fdt-plnx"
 # defaults
 QB_DEFAULT_KERNEL ?= "none"
@@ -16,7 +16,7 @@ QB_DEFAULT_KERNEL ?= "none"
 inherit qemuboot
 # rewrite the qemuboot with the custom sysroot bindir
-python do_write_qemuboot_conf_append() {
+python do_write_qemuboot_conf:append() {
    val = os.path.join(d.getVar('BASE_WORKDIR'), d.getVar('BUILD_SYS'), 'qemu-xilinx-helper-native/1.0-r1/recipe-sysroot-native/usr/bin/')
    cf.set('config_bsp', 'STAGING_BINDIR_NATIVE', '%s' % val)
diff --git a/meta-xilinx-bsp/classes/xilinx-platform-init.bbclass b/meta-xilinx-bsp/classes/xilinx-platform-init.bbclass
index 5d099500..99f7863a 100644
--- a/meta-xilinx-bsp/classes/xilinx-platform-init.bbclass
+++ b/meta-xilinx-bsp/classes/xilinx-platform-init.bbclass
@@ -9,6 +9,6 @@ PLATFORM_INIT_STAGE_DIR = "${STAGING_DIR_HOST}${PLATFORM_INIT_DIR}"
 # Target files use for platform init
 PLATFORM_INIT_FILES ?= ""
-PLATFORM_INIT_FILES_zynq = "ps7_init_gpl.c ps7_init_gpl.h"
+PLATFORM_INIT_FILES:zynq = "ps7_init_gpl.c ps7_init_gpl.h"
-PLATFORM_INIT_FILES_zynqmp = "psu_init_gpl.c psu_init_gpl.h"
+PLATFORM_INIT_FILES:zynqmp = "psu_init_gpl.c psu_init_gpl.h"
diff --git a/meta-xilinx-bsp/classes/xilinx-testimage.bbclass b/meta-xilinx-bsp/classes/xilinx-testimage.bbclass
index 0126d8ba..99519637 100644
--- a/meta-xilinx-bsp/classes/xilinx-testimage.bbclass
+++ b/meta-xilinx-bsp/classes/xilinx-testimage.bbclass
@@ -2,7 +2,7 @@ inherit testimage
 HOSTTOOLS += 'ip ping ps scp ssh stty'
-python do_testimage_prepend () {
+python do_testimage:prepend () {
    from oeqa.core.target.qemu import supported_fstypes
    supported_fstypes.append('wic.qemu-sd')
 }
diff --git a/meta-xilinx-bsp/conf/local.conf.sample b/meta-xilinx-bsp/conf/local.conf.sample
index ab73c4ed..caaa2083 100644
--- a/meta-xilinx-bsp/conf/local.conf.sample
+++ b/meta-xilinx-bsp/conf/local.conf.sample
@@ -63,7 +63,7 @@ MACHINE ??= "qemuzynq"
 #
 #TMPDIR = "${TOPDIR}/tmp"
 #
-#TMPDIR_versal = "${TOPDIR}/tmp-versal"
+#TMPDIR:versal = "${TOPDIR}/tmp-versal"
 #
 # Default policy config
@@ -210,11 +210,11 @@ XILINX_VER_MAIN = "2021.2"
 # INHERIT += "externalsrc"
 # PREFERRED_PROVIDER_virtual/kernel = "linux-xlnx-dev"
-# EXTERNALSRC_pn-linux-xlnx-dev = "${BASE}/sources/linux"
+# EXTERNALSRC:pn-linux-xlnx-dev = "${BASE}/sources/linux"
 # RM_WORK_EXCLUDE += "linux-xlnx-dev"
 # PREFERRED_PROVIDER_virtual/bootloader = "u-boot-xlnx-dev"
-# EXTERNALSRC_pn-u-boot-xlnx-dev = "${BASE}/sources/u-boot"
+# EXTERNALSRC:pn-u-boot-xlnx-dev = "${BASE}/sources/u-boot"
 # RM_WORK_EXCLUDE += "u-boot-xlnx-dev"
 #Add below lines to use runqemu for ZU+ machines
diff --git a/meta-xilinx-bsp/conf/machine/include/baremetal-tc.conf b/meta-xilinx-bsp/conf/machine/include/baremetal-tc.conf
index a53ceac2..c9f5c614 100644
--- a/meta-xilinx-bsp/conf/machine/include/baremetal-tc.conf
+++ b/meta-xilinx-bsp/conf/machine/include/baremetal-tc.conf
@@ -4,4 +4,4 @@
 # Project SDK workflows, so wrap baremetal toolchain items in a custom
 # override:
-MACHINEOVERRIDES_append = ":baremetal-multilib-tc"
+MACHINEOVERRIDES:append = ":baremetal-multilib-tc"
diff --git a/meta-xilinx-bsp/conf/machine/include/board/ultra96.inc b/meta-xilinx-bsp/conf/machine/include/board/ultra96.inc
index 97c850cd..d0ed510c 100644
--- a/meta-xilinx-bsp/conf/machine/include/board/ultra96.inc
+++ b/meta-xilinx-bsp/conf/machine/include/board/ultra96.inc
@@ -1,7 +1,7 @@
 # Ultra96 items that need to be configured from zynqmp-generic
-PACKAGE_ARCH_pn-linux-xlnx_ultra96 = "${BOARDVARIANT_ARCH}"
+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-wl180x"
diff --git a/meta-xilinx-bsp/conf/machine/include/machine-xilinx-default.inc b/meta-xilinx-bsp/conf/machine/include/machine-xilinx-default.inc
index 1b17ebce..bcb0e006 100644
--- a/meta-xilinx-bsp/conf/machine/include/machine-xilinx-default.inc
+++ b/meta-xilinx-bsp/conf/machine/include/machine-xilinx-default.inc
@@ -15,11 +15,11 @@ PREFERRED_PROVIDER_virtual/boot-bin ??= "${PREFERRED_PROVIDER_virtual/bootloader
 do_image_wic[depends] += "${@' '.join('%s:do_deploy' % r for r in (d.getVar('WIC_DEPENDS') or "").split())}"
 UBOOT_SUFFIX ?= "img"
-UBOOT_SUFFIX_microblaze ?= "bin"
+UBOOT_SUFFIX:microblaze ?= "bin"
 UBOOT_BINARY ?= "u-boot.${UBOOT_SUFFIX}"
 UBOOT_ELF ?= "u-boot"
-UBOOT_ELF_aarch64 ?= "u-boot.elf"
+UBOOT_ELF:aarch64 ?= "u-boot.elf"
 #Hardware accelaration
 PREFERRED_PROVIDER_virtual/libgles1_mali400 = "libmali-xlnx"
@@ -29,12 +29,12 @@ PREFERRED_PROVIDER_virtual/libgl_mali400 = "mesa-gl"
 PREFERRED_PROVIDER_virtual/mesa_mali400 = "mesa-gl"
 # microblaze does not get on with pie for reasons not looked into as yet
-GCCPIE_microblaze = ""
+GCCPIE:microblaze = ""
-GLIBCPIE_microblaze = ""
+GLIBCPIE:microblaze = ""
-SECURITY_CFLAGS_microblaze = ""
+SECURITY_CFLAGS:microblaze = ""
-SECURITY_LDFLAGS_microblaze = ""
+SECURITY_LDFLAGS:microblaze = ""
 # Microblaze does not support gnu hash style
-LINKER_HASH_STYLE_microblaze = "sysv"
+LINKER_HASH_STYLE:microblaze = "sysv"
 XSERVER ?= " \
        xserver-xorg \
diff --git a/meta-xilinx-bsp/conf/machine/include/machine-xilinx-qemu.inc b/meta-xilinx-bsp/conf/machine/include/machine-xilinx-qemu.inc
index b804112b..d6cfd376 100644
--- a/meta-xilinx-bsp/conf/machine/include/machine-xilinx-qemu.inc
+++ b/meta-xilinx-bsp/conf/machine/include/machine-xilinx-qemu.inc
@@ -41,13 +41,13 @@ def qemu_target_binary(d):
        ta = "aarch64"
    return "qemu-system-%s" % ta
-def qemu_zynqmp_unhalt(d, multiarch):
+def qemu:zynqmp_unhalt(d, multiarch):
    if multiarch:
        return "-global xlnx,zynqmp-boot.cpu-num=0 -global xlnx,zynqmp-boot.use-pmufw=true"
    return "-device loader,addr=0xfd1a0104,data=0x8000000e,data-len=4 -device loader,addr=0xfd1a0104,data=0x8000000e,data-len=4"
 # For qemuboot, default setup across all machines in meta-xilinx
-QB_SYSTEM_NAME_aarch64 ?= "${@qemu_target_binary(d)}-multiarch"
+QB_SYSTEM_NAME:aarch64 ?= "${@qemu_target_binary(d)}-multiarch"
 QB_SYSTEM_NAME ?= "${@qemu_target_binary(d)}"
 QB_DEFAULT_FSTYPE ?= "cpio"
 QB_DTB ?= "${@qemu_default_dtb(d)}"
diff --git a/meta-xilinx-bsp/conf/machine/include/soc-zynq.inc b/meta-xilinx-bsp/conf/machine/include/soc-zynq.inc
index 4459f3c4..88d48a92 100644
--- a/meta-xilinx-bsp/conf/machine/include/soc-zynq.inc
+++ b/meta-xilinx-bsp/conf/machine/include/soc-zynq.inc
@@ -16,7 +16,7 @@ KERNEL_IMAGETYPES += "zImage"
 # Set default load address.
 # Override with KERNEL_EXTRA_ARGS_<board> += "..." in machine file if required
-KERNEL_EXTRA_ARGS_zynq += "UIMAGE_LOADADDR=0x8000"
+KERNEL_EXTRA_ARGS:zynq += "UIMAGE_LOADADDR=0x8000"
 # WIC Specific dependencies
 WIC_DEPENDS ?= "virtual/kernel virtual/bootloader virtual/boot-bin"
diff --git a/meta-xilinx-bsp/conf/machine/include/soc-zynqmp.inc b/meta-xilinx-bsp/conf/machine/include/soc-zynqmp.inc
index 395cf7f4..e32fd617 100644
--- a/meta-xilinx-bsp/conf/machine/include/soc-zynqmp.inc
+++ b/meta-xilinx-bsp/conf/machine/include/soc-zynqmp.inc
@@ -12,8 +12,8 @@ SOC_VARIANT ?= "eg"
 require xilinx-soc-family.inc
 GRAPHICSOVERRIDES = ""
-GRAPHICSOVERRIDES_zynqmp-eg = "mali400:"
+GRAPHICSOVERRIDES:zynqmp-eg = "mali400:"
-GRAPHICSOVERRIDES_zynqmp-ev = "mali400:vcu:"
+GRAPHICSOVERRIDES:zynqmp-ev = "mali400:vcu:"
 MACHINEOVERRIDES =. "${GRAPHICSOVERRIDES}"
@@ -23,13 +23,13 @@ require soc-tune-include.inc
 KERNEL_IMAGETYPE ?= "Image"
 # Support multilib on zynqmp
-DEFAULTTUNE_virtclass-multilib-lib32 ?= "armv7vethf-neon-vfpv4"
+DEFAULTTUNE:virtclass-multilib-lib32 ?= "armv7vethf-neon-vfpv4"
 WIC_DEPENDS ?= "virtual/kernel virtual/bootloader virtual/boot-bin virtual/arm-trusted-firmware"
 UBOOT_SUFFIX ?= "bin"
-XSERVER_EXT_zynqmp ?= "xf86-video-armsoc"
+XSERVER_EXT:zynqmp ?= "xf86-video-armsoc"
 # Default PMU ROM
 PMU_ROM ?= "${DEPLOY_DIR_IMAGE}/pmu-rom.elf"
diff --git a/meta-xilinx-bsp/conf/machine/include/tune-cortexrm.inc b/meta-xilinx-bsp/conf/machine/include/tune-cortexrm.inc
index 66edbdbd..e415209b 100644
--- a/meta-xilinx-bsp/conf/machine/include/tune-cortexrm.inc
+++ b/meta-xilinx-bsp/conf/machine/include/tune-cortexrm.inc
@@ -9,13 +9,13 @@ TUNEVALID[cortexr5] = "Enable Cortex-r5 specific processor optimizations"
 TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'cortexr5', ' -mcpu=cortex-r5', '', d)}"
 AVAILTUNES += "cortexr5"
-ARMPKGARCH_tune-cortexr5 = "cortexr5"
+ARMPKGARCH:tune-cortexr5 = "cortexr5"
-TUNE_FEATURES_tune-cortexr5 = "armrm cortexr5"
+TUNE_FEATURES:tune-cortexr5 = "armrm cortexr5"
-PACKAGE_EXTRA_ARCHS_tune-cortexr5 = "${TUNE_PKGARCH}"
+PACKAGE_EXTRA_ARCHS:tune-cortexr5 = "${TUNE_PKGARCH}"
 AVAILTUNES += "cortexr5f"
-ARMPKGARCH_tune-cortexr5f = "cortexr5f"
+ARMPKGARCH:tune-cortexr5f = "cortexr5f"
-TUNE_FEATURES_tune-cortexr5f = "armrm cortexr5 vfpv3d16 callconvention-hard"
+TUNE_FEATURES:tune-cortexr5f = "armrm cortexr5 vfpv3d16 callconvention-hard"
-PACKAGE_EXTRA_ARCHS_tune-cortexr5f = "${TUNE_PKGARCH}"
+PACKAGE_EXTRA_ARCHS:tune-cortexr5f = "${TUNE_PKGARCH}"
diff --git a/meta-xilinx-bsp/conf/machine/include/xilinx-board.inc b/meta-xilinx-bsp/conf/machine/include/xilinx-board.inc
index 5eaeca7b..18b04742 100644
--- a/meta-xilinx-bsp/conf/machine/include/xilinx-board.inc
+++ b/meta-xilinx-bsp/conf/machine/include/xilinx-board.inc
@@ -8,5 +8,5 @@ MACHINEOVERRIDES .= "${@['', ':${BOARD}-${BOARD_VARIANT}']['${BOARD_VARIANT}' !=
 BOARD_ARCH ?= "${@['${BOARD}', '${MACHINE_ARCH}'][d.getVar('BOARD')=='']}"
 BOARDVARIANT_ARCH ?= "${@['${BOARD}-${BOARD_VARIANT}','${BOARD_ARCH}'][d.getVar('BOARD_VARIANT')=='']}"
-PACKAGE_EXTRA_ARCHS_append = "${@['', ' ${BOARD_ARCH}'][d.getVar('BOARDVARIANT_ARCH') != d.getVar('MACHINE_ARCH')]}"
+PACKAGE_EXTRA_ARCHS:append = "${@['', ' ${BOARD_ARCH}'][d.getVar('BOARDVARIANT_ARCH') != d.getVar('MACHINE_ARCH')]}"
-PACKAGE_EXTRA_ARCHS_append = "${@['', ' ${BOARDVARIANT_ARCH}'][d.getVar('BOARDVARIANT_ARCH') != d.getVar('BOARD_ARCH')]}"
+PACKAGE_EXTRA_ARCHS:append = "${@['', ' ${BOARDVARIANT_ARCH}'][d.getVar('BOARDVARIANT_ARCH') != d.getVar('BOARD_ARCH')]}"
diff --git a/meta-xilinx-bsp/conf/machine/include/xilinx-board.inc.orig b/meta-xilinx-bsp/conf/machine/include/xilinx-board.inc.orig
index 9613a154..a7e139a0 100644
--- a/meta-xilinx-bsp/conf/machine/include/xilinx-board.inc.orig
+++ b/meta-xilinx-bsp/conf/machine/include/xilinx-board.inc.orig
@@ -8,5 +8,5 @@ MACHINEOVERRIDES =. "${@['', '${BOARD}-${BOARD_VARIANT}:']['${BOARD_VARIANT}' !=
 BOARD_ARCH ?= "${BOARD}"
 BOARDVARIANT_ARCH ?= "${@['${BOARD}-${BOARD_VARIANT}','${BOARD}'][d.getVar('BOARD_VARIANT')=='']}"
-PACKAGE_EXTRA_ARCHS_append = " ${BOARD_ARCH}"
+PACKAGE_EXTRA_ARCHS:append = " ${BOARD_ARCH}"
-PACKAGE_EXTRA_ARCHS_append = "${@['', ' ${BOARDVARIANT_ARCH}'][d.getVar('BOARDVARIANT_ARCH') != d.getVar('BOARD_ARCH')]}"
+PACKAGE_EXTRA_ARCHS:append = "${@['', ' ${BOARDVARIANT_ARCH}'][d.getVar('BOARDVARIANT_ARCH') != d.getVar('BOARD_ARCH')]}"
diff --git a/meta-xilinx-bsp/conf/machine/include/xilinx-soc-family.inc b/meta-xilinx-bsp/conf/machine/include/xilinx-soc-family.inc
index 0eddb16b..dd54f5c6 100644
--- a/meta-xilinx-bsp/conf/machine/include/xilinx-soc-family.inc
+++ b/meta-xilinx-bsp/conf/machine/include/xilinx-soc-family.inc
@@ -6,5 +6,5 @@ require conf/machine/include/soc-family.inc
 SOC_FAMILY_ARCH ?= "${SOC_FAMILY}"
 SOC_VARIANT_ARCH ?= "${@['${SOC_FAMILY}-${SOC_VARIANT}','${SOC_FAMILY}'][d.getVar('SOC_VARIANT')=='']}"
-PACKAGE_EXTRA_ARCHS_append = " ${SOC_FAMILY_ARCH}"
+PACKAGE_EXTRA_ARCHS:append = " ${SOC_FAMILY_ARCH}"
-PACKAGE_EXTRA_ARCHS_append = "${@['', ' ${SOC_VARIANT_ARCH}'][d.getVar('SOC_VARIANT_ARCH') != d.getVar('SOC_FAMILY_ARCH')]}"
+PACKAGE_EXTRA_ARCHS:append = "${@['', ' ${SOC_VARIANT_ARCH}'][d.getVar('SOC_VARIANT_ARCH') != d.getVar('SOC_FAMILY_ARCH')]}"
diff --git a/meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf b/meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf
index a34651b7..d8169aab 100644
--- a/meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf
+++ b/meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf
@@ -6,7 +6,7 @@
 require conf/machine/include/tune-microblaze.inc
 require conf/machine/include/machine-xilinx-default.inc
-TUNE_FEATURES_tune-microblaze += "v11.0 barrel-shift reorder pattern-compare multiply-high divide-hard"
+TUNE_FEATURES:tune-microblaze += "v11.0 barrel-shift reorder pattern-compare multiply-high divide-hard"
 MACHINE_FEATURES = ""
diff --git a/meta-xilinx-bsp/conf/machine/microblazeel-v11.0-bs-cmp-mh-div-generic.conf b/meta-xilinx-bsp/conf/machine/microblazeel-v11.0-bs-cmp-mh-div-generic.conf
index 2ef9bde5..45190205 100644
--- a/meta-xilinx-bsp/conf/machine/microblazeel-v11.0-bs-cmp-mh-div-generic.conf
+++ b/meta-xilinx-bsp/conf/machine/microblazeel-v11.0-bs-cmp-mh-div-generic.conf
@@ -6,7 +6,7 @@ require conf/machine/include/tune-microblaze.inc
 require conf/machine/include/machine-xilinx-default.inc
 require conf/machine/include/xilinx-board.inc
-TUNE_FEATURES_tune-microblaze += "v11.0 barrel-shift pattern-compare reorder divide-hard multiply-high"
+TUNE_FEATURES:tune-microblaze += "v11.0 barrel-shift pattern-compare reorder divide-hard multiply-high"
 MACHINE_FEATURES = ""
diff --git a/meta-xilinx-bsp/conf/machine/microblazeel-v11.0-bs-cmp-ml-generic.conf b/meta-xilinx-bsp/conf/machine/microblazeel-v11.0-bs-cmp-ml-generic.conf
index d97df6a3..09546ef6 100644
--- a/meta-xilinx-bsp/conf/machine/microblazeel-v11.0-bs-cmp-ml-generic.conf
+++ b/meta-xilinx-bsp/conf/machine/microblazeel-v11.0-bs-cmp-ml-generic.conf
@@ -5,7 +5,7 @@
 require conf/machine/include/tune-microblaze.inc
 require conf/machine/include/machine-xilinx-default.inc
-TUNE_FEATURES_tune-microblaze += "v11.0 barrel-shift reorder pattern-compare multiply-low"
+TUNE_FEATURES:tune-microblaze += "v11.0 barrel-shift reorder pattern-compare multiply-low"
 MACHINE_FEATURES = ""
diff --git a/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf b/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf
index eac1b3dc..3f9d598a 100644
--- a/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf
@@ -9,7 +9,7 @@ MACHINE_FEATURES = "ext2 vfat usbhost"
 # u-boot configuration
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
-UBOOT_MACHINE ?= "xilinx_zynq_virt_defconfig"
+UBOOT_MACHINE ?= "xilinx:zynq_virt_defconfig"
 SPL_BINARY ?= "spl/boot.bin"
 UBOOT_ELF = "u-boot"
diff --git a/meta-xilinx-bsp/conf/machine/ml605-qemu-microblazeel.conf b/meta-xilinx-bsp/conf/machine/ml605-qemu-microblazeel.conf
index 3e5d623f..25918b9d 100644
--- a/meta-xilinx-bsp/conf/machine/ml605-qemu-microblazeel.conf
+++ b/meta-xilinx-bsp/conf/machine/ml605-qemu-microblazeel.conf
@@ -6,7 +6,7 @@ require conf/machine/include/tune-microblaze.inc
 require conf/machine/include/machine-xilinx-default.inc
 require conf/machine/include/machine-xilinx-qemu.inc
-TUNE_FEATURES_tune-microblaze += "v8.50 barrel-shift reorder pattern-compare divide-hard multiply-high fpu-hard"
+TUNE_FEATURES:tune-microblaze += "v8.50 barrel-shift reorder pattern-compare divide-hard multiply-high fpu-hard"
 MACHINE_FEATURES = ""
@@ -16,8 +16,8 @@ SERIAL_CONSOLES ?= "115200;ttyS0"
 KERNEL_IMAGETYPE ?= "linux.bin.ub"
 # Use the networking setup from qemuarm
-MACHINEOVERRIDES_prepend_pn-init-ifupdown = "qemuall:"
+MACHINEOVERRIDES:prepend:pn-init-ifupdown = "qemuall:"
-FILESOVERRIDES_append_pn-init-ifupdown = ":qemuarm"
+FILESOVERRIDES:append:pn-init-ifupdown = ":qemuarm"
 # This machine is a targeting a QEMU model, runqemu setup:
 QB_MEM = "-m 256"
diff --git a/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf b/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf
index db9c20bd..ec7a0fe3 100644
--- a/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf
@@ -13,7 +13,7 @@ MACHINE_FEATURES = "ext2 vfat usbhost usbgadget"
 # u-boot configuration
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
-UBOOT_MACHINE ?= "xilinx_zynq_virt_defconfig"
+UBOOT_MACHINE ?= "xilinx:zynq_virt_defconfig"
 SPL_BINARY ?= "spl/boot.bin"
 UBOOT_ELF = "u-boot"
diff --git a/meta-xilinx-bsp/conf/machine/qemu-zynq7.conf b/meta-xilinx-bsp/conf/machine/qemu-zynq7.conf
index 8bccfde2..5f25600f 100644
--- a/meta-xilinx-bsp/conf/machine/qemu-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/qemu-zynq7.conf
@@ -15,8 +15,8 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree"
 HDF_MACHINE = "zc702-zynq7"
 # Use the networking setup from qemuarm
-MACHINEOVERRIDES_prepend_pn-init-ifupdown = "qemuall:"
+MACHINEOVERRIDES:prepend:pn-init-ifupdown = "qemuall:"
-FILESOVERRIDES_append_pn-init-ifupdown = ":qemuarm"
+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"
diff --git a/meta-xilinx-bsp/conf/machine/s3adsp1800-qemu-microblazeeb.conf b/meta-xilinx-bsp/conf/machine/s3adsp1800-qemu-microblazeeb.conf
index 1ce63291..88a1c433 100644
--- a/meta-xilinx-bsp/conf/machine/s3adsp1800-qemu-microblazeeb.conf
+++ b/meta-xilinx-bsp/conf/machine/s3adsp1800-qemu-microblazeeb.conf
@@ -6,7 +6,7 @@ require conf/machine/include/tune-microblaze.inc
 require conf/machine/include/machine-xilinx-default.inc
 require conf/machine/include/machine-xilinx-qemu.inc
-TUNE_FEATURES_tune-microblaze += "v8.00 bigendian barrel-shift pattern-compare multiply-low"
+TUNE_FEATURES:tune-microblaze += "v8.00 bigendian barrel-shift pattern-compare multiply-low"
 MACHINE_FEATURES = ""
diff --git a/meta-xilinx-bsp/conf/machine/v350-versal.conf b/meta-xilinx-bsp/conf/machine/v350-versal.conf
index 6741e2f3..f637f1ed 100644
--- a/meta-xilinx-bsp/conf/machine/v350-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/v350-versal.conf
@@ -7,7 +7,7 @@ require conf/machine/include/machine-xilinx-default.inc
 MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
-UBOOT_MACHINE ?= "xilinx_versal_virt_defconfig"
+UBOOT_MACHINE ?= "xilinx:versal_virt_defconfig"
 SERIAL_CONSOLES ?= "115200;ttyAMA0"
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 9ee2d4a4..a7817c10 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
@@ -10,7 +10,7 @@ SOC_VARIANT = "ai-core"
 MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
-UBOOT_MACHINE ?= "xilinx_versal_virt_defconfig"
+UBOOT_MACHINE ?= "xilinx:versal_virt_defconfig"
 SERIAL_CONSOLES ?= "115200;ttyAMA0"
@@ -44,13 +44,13 @@ 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_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/vck-sc-zynqmp.conf b/meta-xilinx-bsp/conf/machine/vck-sc-zynqmp.conf
index 1bda4cd1..5c02d023 100644
--- a/meta-xilinx-bsp/conf/machine/vck-sc-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/vck-sc-zynqmp.conf
@@ -8,7 +8,7 @@ require conf/machine/include/machine-xilinx-default.inc
 MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
-UBOOT_MACHINE ?= "xilinx_zynqmp_virt_defconfig"
+UBOOT_MACHINE ?= "xilinx:zynqmp_virt_defconfig"
 SPL_BINARY ?= "spl/boot.bin"
 SERIAL_CONSOLES ?= "115200;ttyPS0"
diff --git a/meta-xilinx-bsp/conf/machine/vck190-versal.conf b/meta-xilinx-bsp/conf/machine/vck190-versal.conf
index 28a07eb4..abf73a61 100644
--- a/meta-xilinx-bsp/conf/machine/vck190-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/vck190-versal.conf
@@ -10,7 +10,7 @@ SOC_VARIANT = "ai-core"
 MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
-UBOOT_MACHINE ?= "xilinx_versal_virt_defconfig"
+UBOOT_MACHINE ?= "xilinx:versal_virt_defconfig"
 SERIAL_CONSOLES ?= "115200;ttyAMA0"
@@ -45,13 +45,13 @@ 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_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/vck5000-versal.conf b/meta-xilinx-bsp/conf/machine/vck5000-versal.conf
index 97fb9cc7..a2407d8b 100644
--- a/meta-xilinx-bsp/conf/machine/vck5000-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/vck5000-versal.conf
@@ -7,7 +7,7 @@ require conf/machine/include/machine-xilinx-default.inc
 MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
-UBOOT_MACHINE ?= "xilinx_versal_virt_defconfig"
+UBOOT_MACHINE ?= "xilinx:versal_virt_defconfig"
 SERIAL_CONSOLES ?= "115200;ttyAMA0"
diff --git a/meta-xilinx-bsp/conf/machine/versal-generic.conf b/meta-xilinx-bsp/conf/machine/versal-generic.conf
index add3da23..af7a042e 100644
--- a/meta-xilinx-bsp/conf/machine/versal-generic.conf
+++ b/meta-xilinx-bsp/conf/machine/versal-generic.conf
@@ -11,7 +11,7 @@ MACHINE_FEATURES += "rtc ext2 ext3 vfat usbhost"
 EXTRA_IMAGEDEPENDS += "libyaml-native python3-cython-native python3-pyyaml-native"
-UBOOT_MACHINE ?= "xilinx_versal_virt_defconfig"
+UBOOT_MACHINE ?= "xilinx:versal_virt_defconfig"
 SERIAL_CONSOLES ?= "115200;ttyAMA0"
@@ -51,7 +51,7 @@ 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_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
@@ -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 e9044ba7..794506e7 100644
--- a/meta-xilinx-bsp/conf/machine/vmk180-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/vmk180-versal.conf
@@ -8,7 +8,7 @@ require conf/machine/include/machine-xilinx-qemu.inc
 MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
-UBOOT_MACHINE ?= "xilinx_versal_virt_defconfig"
+UBOOT_MACHINE ?= "xilinx:versal_virt_defconfig"
 SERIAL_CONSOLES ?= "115200;ttyAMA0"
@@ -42,13 +42,13 @@ 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_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/zc1254-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf
index d91d2ba3..e10008a7 100644
--- a/meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zc1254-zynqmp.conf
@@ -10,7 +10,7 @@ require conf/machine/include/machine-xilinx-default.inc
 MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
-UBOOT_MACHINE ?= "xilinx_zynqmp_virt_defconfig"
+UBOOT_MACHINE ?= "xilinx:zynqmp_virt_defconfig"
 SPL_BINARY ?= "spl/boot.bin"
 SERIAL_CONSOLES ?= "115200;ttyPS0"
diff --git a/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf b/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf
index 82d47cb4..fb709b78 100644
--- a/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/zc702-zynq7.conf
@@ -16,7 +16,7 @@ require conf/machine/include/machine-xilinx-qemu.inc
 MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
 # u-boot configuration
-UBOOT_MACHINE ?= "xilinx_zynq_virt_defconfig"
+UBOOT_MACHINE ?= "xilinx:zynq_virt_defconfig"
 SPL_BINARY ?= "spl/boot.bin"
 EXTRA_IMAGEDEPENDS += " \
diff --git a/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf b/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf
index b5268689..369d5d75 100644
--- a/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/zc706-zynq7.conf
@@ -16,7 +16,7 @@ require conf/machine/include/machine-xilinx-qemu.inc
 MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost usbgadget"
 # u-boot configuration
-UBOOT_MACHINE ?= "xilinx_zynq_virt_defconfig"
+UBOOT_MACHINE ?= "xilinx:zynq_virt_defconfig"
 SPL_BINARY ?= "spl/boot.bin"
 EXTRA_IMAGEDEPENDS += " \
diff --git a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
index 46dc420c..2b0ba1a9 100644
--- a/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu102-zynqmp.conf
@@ -8,7 +8,7 @@ require conf/machine/include/machine-xilinx-qemu.inc
 MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
-UBOOT_MACHINE ?= "xilinx_zynqmp_virt_defconfig"
+UBOOT_MACHINE ?= "xilinx:zynqmp_virt_defconfig"
 SPL_BINARY ?= "spl/boot.bin"
 # Default SD image build onfiguration, use qemu-sd to pad
@@ -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 \
@@ -52,7 +52,7 @@ 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_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 = " \
@@ -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/zcu104-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf
index e6fa0b3f..6f72250f 100644
--- a/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu104-zynqmp.conf
@@ -10,7 +10,7 @@ require conf/machine/include/machine-xilinx-default.inc
 MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
-UBOOT_MACHINE ?= "xilinx_zynqmp_virt_defconfig"
+UBOOT_MACHINE ?= "xilinx:zynqmp_virt_defconfig"
 SPL_BINARY ?= "spl/boot.bin"
 SERIAL_CONSOLES ?= "115200;ttyPS0"
diff --git a/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf
index 25bfd3a8..180562f0 100644
--- a/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu106-zynqmp.conf
@@ -9,7 +9,7 @@ require conf/machine/include/machine-xilinx-default.inc
 MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
-UBOOT_MACHINE ?= "xilinx_zynqmp_virt_defconfig"
+UBOOT_MACHINE ?= "xilinx:zynqmp_virt_defconfig"
 SPL_BINARY ?= "spl/boot.bin"
 SERIAL_CONSOLES ?= "115200;ttyPS0"
diff --git a/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf
index cbe0a627..6ea024f8 100644
--- a/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu111-zynqmp.conf
@@ -10,7 +10,7 @@ require conf/machine/include/machine-xilinx-default.inc
 MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
-UBOOT_MACHINE ?= "xilinx_zynqmp_virt_defconfig"
+UBOOT_MACHINE ?= "xilinx:zynqmp_virt_defconfig"
 SPL_BINARY ?= "spl/boot.bin"
 SERIAL_CONSOLES ?= "115200;ttyPS0"
diff --git a/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf
index 672411ea..4c730d3f 100644
--- a/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu1275-zynqmp.conf
@@ -10,7 +10,7 @@ require conf/machine/include/machine-xilinx-default.inc
 MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
-UBOOT_MACHINE ?= "xilinx_zynqmp_virt_defconfig"
+UBOOT_MACHINE ?= "xilinx:zynqmp_virt_defconfig"
 SPL_BINARY ?= "spl/boot.bin"
 SERIAL_CONSOLES ?= "115200;ttyPS0"
diff --git a/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf
index c23c8ca5..98a580ed 100644
--- a/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf
@@ -10,7 +10,7 @@ require conf/machine/include/machine-xilinx-default.inc
 MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
-UBOOT_MACHINE ?= "xilinx_zynqmp_virt_defconfig"
+UBOOT_MACHINE ?= "xilinx:zynqmp_virt_defconfig"
 SPL_BINARY ?= "spl/boot.bin"
 SERIAL_CONSOLES ?= "115200;ttyPS0"
diff --git a/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf
index 92096220..54a27a9d 100644
--- a/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu208-zynqmp.conf
@@ -10,7 +10,7 @@ require conf/machine/include/machine-xilinx-default.inc
 MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
-UBOOT_MACHINE ?= "xilinx_zynqmp_virt_defconfig"
+UBOOT_MACHINE ?= "xilinx:zynqmp_virt_defconfig"
 SPL_BINARY ?= "spl/boot.bin"
 SERIAL_CONSOLES ?= "115200;ttyPS0"
diff --git a/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf b/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf
index 3ebb9897..2e8e5071 100644
--- a/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/zcu216-zynqmp.conf
@@ -10,7 +10,7 @@ require conf/machine/include/machine-xilinx-default.inc
 MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
-UBOOT_MACHINE ?= "xilinx_zynqmp_virt_defconfig"
+UBOOT_MACHINE ?= "xilinx:zynqmp_virt_defconfig"
 SPL_BINARY ?= "spl/boot.bin"
 SERIAL_CONSOLES ?= "115200;ttyPS0"
diff --git a/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf b/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf
index a824de2c..09309045 100644
--- a/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf
@@ -12,7 +12,7 @@ require conf/machine/include/soc-zynq.inc
 require conf/machine/include/machine-xilinx-default.inc
 # u-boot configuration
-UBOOT_MACHINE ?= "xilinx_zynq_virt_defconfig"
+UBOOT_MACHINE ?= "xilinx:zynq_virt_defconfig"
 SPL_BINARY ?= "spl/boot.bin"
 EXTRA_IMAGEDEPENDS += " \
diff --git a/meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf b/meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf
index 137796c6..7d6482bd 100644
--- a/meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf
@@ -15,7 +15,7 @@ SERIAL_CONSOLES ?= "115200;ttyPS0"
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree"
-UBOOT_MACHINE ?= "xilinx_zynq_virt_defconfig"
+UBOOT_MACHINE ?= "xilinx:zynq_virt_defconfig"
 SPL_BINARY ?= "spl/boot.bin"
 FORCE_PLATFORM_INIT = "1"
 UBOOT_ELF = "u-boot"
diff --git a/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf b/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf
index c09cf519..39ae6050 100644
--- a/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf
+++ b/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf
@@ -13,7 +13,7 @@ MACHINE_FEATURES = "ext2 vfat usbhost usbgadget"
 # u-boot configuration
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
-UBOOT_MACHINE ?= "xilinx_zynq_virt_defconfig"
+UBOOT_MACHINE ?= "xilinx:zynq_virt_defconfig"
 SPL_BINARY ?= "spl/boot.bin"
 UBOOT_ELF = "u-boot"
diff --git a/meta-xilinx-bsp/conf/machine/zynq-generic.conf b/meta-xilinx-bsp/conf/machine/zynq-generic.conf
index 8a8d8f24..d6bb5a9c 100644
--- a/meta-xilinx-bsp/conf/machine/zynq-generic.conf
+++ b/meta-xilinx-bsp/conf/machine/zynq-generic.conf
@@ -11,7 +11,7 @@ MACHINE_FEATURES += "rtc ext2 ext3 vfat usbhost usbgadget"
 EXTRA_IMAGEDEPENDS += "libyaml-native python3-cython-native python3-pyyaml-native"
-UBOOT_MACHINE ?= "xilinx_zynq_virt_defconfig"
+UBOOT_MACHINE ?= "xilinx:zynq_virt_defconfig"
 SERIAL_CONSOLES ?= "115200;ttyPS0"
diff --git a/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf b/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf
index 0ff25ac0..3a1f1638 100644
--- a/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf
+++ b/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf
@@ -18,7 +18,7 @@ MACHINE_FEATURES += " usbgadget wifi bluetooth"
 EXTRA_IMAGEDEPENDS += "libyaml-native python3-cython-native python3-pyyaml-native"
-UBOOT_MACHINE ?= "xilinx_zynqmp_virt_defconfig"
+UBOOT_MACHINE ?= "xilinx:zynqmp_virt_defconfig"
 SPL_BINARY ?= "spl/boot.bin"
 # Default SD image build onfiguration, use qemu-sd to pad
@@ -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 \
@@ -66,7 +66,7 @@ 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_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 = " \
@@ -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/openembedded-layer/recipes-core/opencl-headers/opencl-headers_%.bbappend b/meta-xilinx-bsp/dynamic-layers/openembedded-layer/recipes-core/opencl-headers/opencl-headers_%.bbappend
index afe3e9cd..b90c754d 100644
--- a/meta-xilinx-bsp/dynamic-layers/openembedded-layer/recipes-core/opencl-headers/opencl-headers_%.bbappend
+++ b/meta-xilinx-bsp/dynamic-layers/openembedded-layer/recipes-core/opencl-headers/opencl-headers_%.bbappend
@@ -1 +1 @@
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
diff --git a/meta-xilinx-bsp/dynamic-layers/openembedded-layer/recipes-graphics/xorg-driver/xf86-video-armsoc_%.bbappend b/meta-xilinx-bsp/dynamic-layers/openembedded-layer/recipes-graphics/xorg-driver/xf86-video-armsoc_%.bbappend
index 955398a3..f7b52f58 100644
--- a/meta-xilinx-bsp/dynamic-layers/openembedded-layer/recipes-graphics/xorg-driver/xf86-video-armsoc_%.bbappend
+++ b/meta-xilinx-bsp/dynamic-layers/openembedded-layer/recipes-graphics/xorg-driver/xf86-video-armsoc_%.bbappend
@@ -1,5 +1,5 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/xf86-video-armsoc:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/xf86-video-armsoc:"
-SRC_URI_append = " file://0001-src-drmmode_xilinx-Add-the-dumb-gem-support-for-Xili.patch \
+SRC_URI:append = " file://0001-src-drmmode_xilinx-Add-the-dumb-gem-support-for-Xili.patch \
                   file://0001-armsoc_driver.c-Bypass-the-exa-layer-to-free-the-roo.patch \
                "
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 5060887b..9e24bdd0 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
@@ -33,11 +33,11 @@ BOARDVARIANT_ARCH ??= "${MACHINE_ARCH}"
 PACKAGE_ARCH = "${BOARDVARIANT_ARCH}"
 COMPATIBLE_MACHINE ?= "^$"
-COMPATIBLE_MACHINE_zynqmp = ".*"
+COMPATIBLE_MACHINE:zynqmp = ".*"
-COMPATIBLE_MACHINE_versal = ".*"
+COMPATIBLE_MACHINE:versal = ".*"
-PLATFORM_zynqmp = "zynqmp"
+PLATFORM:zynqmp = "zynqmp"
-PLATFORM_versal = "versal"
+PLATFORM:versal = "versal"
 # requires CROSS_COMPILE set by hand as there is no configure script
 export CROSS_COMPILE="${TARGET_PREFIX}"
@@ -49,27 +49,27 @@ AS[unexport] = "1"
 LD[unexport] = "1"
 ATF_CONSOLE ?= ""
-ATF_CONSOLE_zynqmp = "cadence"
+ATF_CONSOLE:zynqmp = "cadence"
-ATF_CONSOLE_versal ?= "pl011"
+ATF_CONSOLE:versal ?= "pl011"
 DEBUG_ATF ?= ""
-DEBUG_ATF_versal ?= "1"
+DEBUG_ATF:versal ?= "1"
-EXTRA_OEMAKE_zynqmp_append = "${@' ZYNQMP_CONSOLE=${ATF_CONSOLE}' if d.getVar('ATF_CONSOLE', True) != '' else ''}"
+EXTRA_OEMAKE:zynqmp:append = "${@' ZYNQMP_CONSOLE=${ATF_CONSOLE}' if d.getVar('ATF_CONSOLE', True) != '' else ''}"
-EXTRA_OEMAKE_append_versal = "${@' VERSAL_CONSOLE=${ATF_CONSOLE}' if d.getVar('ATF_CONSOLE', True) != '' else ''}"
+EXTRA_OEMAKE:append:versal = "${@' VERSAL_CONSOLE=${ATF_CONSOLE}' if d.getVar('ATF_CONSOLE', True) != '' else ''}"
-EXTRA_OEMAKE_append = " ${@bb.utils.contains('DEBUG_ATF', '1', ' DEBUG=${DEBUG_ATF}', '', d)}"
+EXTRA_OEMAKE:append = " ${@bb.utils.contains('DEBUG_ATF', '1', ' DEBUG=${DEBUG_ATF}', '', d)}"
 OUTPUT_DIR = "${@bb.utils.contains('DEBUG_ATF', '1', '${B}/${PLATFORM}/debug', '${B}/${PLATFORM}/release', d)}"
 ATF_MEM_BASE ?= ""
 ATF_MEM_SIZE ?= ""
-EXTRA_OEMAKE_zynqmp_append = "${@' ZYNQMP_ATF_MEM_BASE=${ATF_MEM_BASE}' if d.getVar('ATF_MEM_BASE', True) != '' else ''}"
+EXTRA_OEMAKE:zynqmp:append = "${@' ZYNQMP_ATF_MEM_BASE=${ATF_MEM_BASE}' if d.getVar('ATF_MEM_BASE', True) != '' else ''}"
-EXTRA_OEMAKE_zynqmp_append = "${@' ZYNQMP_ATF_MEM_SIZE=${ATF_MEM_SIZE}' if d.getVar('ATF_MEM_SIZE', True) != '' else ''}"
+EXTRA_OEMAKE:zynqmp:append = "${@' ZYNQMP_ATF_MEM_SIZE=${ATF_MEM_SIZE}' if d.getVar('ATF_MEM_SIZE', True) != '' else ''}"
-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_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: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}
@@ -100,4 +100,4 @@ do_deploy() {
        ln -sf ${ATF_BASE_NAME}.ub ${DEPLOYDIR}/atf-uboot.ub
 }
 addtask deploy before do_build after do_compile
-FILES_${PN} += "/boot/${PN}.elf"
+FILES:${PN} += "/boot/${PN}.elf"
diff --git a/meta-xilinx-bsp/recipes-bsp/base-pdi/base-pdi_1.0.bb b/meta-xilinx-bsp/recipes-bsp/base-pdi/base-pdi_1.0.bb
index ba24ba1f..4e940642 100644
--- a/meta-xilinx-bsp/recipes-bsp/base-pdi/base-pdi_1.0.bb
+++ b/meta-xilinx-bsp/recipes-bsp/base-pdi/base-pdi_1.0.bb
@@ -5,7 +5,7 @@ LICENSE = "CLOSED"
 PROVIDES = "virtual/base-pdi"
 COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE_versal = "versal"
+COMPATIBLE_MACHINE:versal = "versal"
 PACKAGE_ARCH ?= "${MACHINE_ARCH}"
@@ -32,4 +32,4 @@ do_install() {
 }
 SYSROOT_DIRS += "/boot"
-FILES_${PN} += "/boot/*"
+FILES:${PN} += "/boot/*"
diff --git a/meta-xilinx-bsp/recipes-bsp/bootbin/xilinx-bootbin_1.0.bb b/meta-xilinx-bsp/recipes-bsp/bootbin/xilinx-bootbin_1.0.bb
index 6bb3a9f5..c46ae2fe 100644
--- a/meta-xilinx-bsp/recipes-bsp/bootbin/xilinx-bootbin_1.0.bb
+++ b/meta-xilinx-bsp/recipes-bsp/bootbin/xilinx-bootbin_1.0.bb
@@ -58,7 +58,7 @@ def create_bif(config, attrflags, attrimage, ids, common_attr, biffd, d):
    return
-def create_versal_bif(config, attrflags, attrimage, ids, common_attr, biffd, d):
+def create:versal_bif(config, attrflags, attrimage, ids, common_attr, biffd, d):
    import re, os
    id_dict = {}
    for cfg in config:
@@ -104,7 +104,7 @@ python do_configure() {
    fp = d.getVar("BIF_FILE_PATH")
    if fp == (d.getVar('B') + '/bootgen.bif'):
        arch = d.getVar("SOC_FAMILY")
-        biffunc = {'versal':create_versal_bif, 'zynq':create_bif, 'zynqmp':create_bif}
+        biffunc = {'versal':create:versal_bif, 'zynq':create_bif, 'zynqmp':create_bif}
        biffd = open(fp, 'w')
        biffd.write("the_ROM_image:\n")
        biffd.write("{\n")
@@ -159,13 +159,13 @@ do_deploy() {
    ln -sf ${BOOTBIN_BASE_NAME}.bin ${DEPLOYDIR}/boot.bin
 }
-do_deploy_append_versal () {
+do_deploy:append:versal () {
    install -m 0644 ${B}/BOOT_bh.bin ${DEPLOYDIR}/${BOOTBIN_BASE_NAME}_bh.bin
    ln -sf ${BOOTBIN_BASE_NAME}_bh.bin ${DEPLOYDIR}/BOOT-${MACHINE}_bh.bin
 }
-FILES_${PN} += "/boot/BOOT.bin"
+FILES:${PN} += "/boot/BOOT.bin"
 SYSROOT_DIRS += "/boot"
 addtask do_deploy before do_build after do_compile
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 4e3b11db..a729c07b 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
@@ -10,7 +10,7 @@ DEPENDS = "bitstream-microblaze"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 COMPATIBLE_MACHINE ?= "^$"
-COMPATIBLE_MACHINE_microblaze = ".*"
+COMPATIBLE_MACHINE:microblaze = ".*"
 inherit deploy image-artifact-names
diff --git a/meta-xilinx-bsp/recipes-bsp/bootgen/bootgen_1.0.bb b/meta-xilinx-bsp/recipes-bsp/bootgen/bootgen_1.0.bb
index 4c4c8ade..c49a84ef 100644
--- a/meta-xilinx-bsp/recipes-bsp/bootgen/bootgen_1.0.bb
+++ b/meta-xilinx-bsp/recipes-bsp/bootgen/bootgen_1.0.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=d526b6d0807bf263b97da1da876f39b1"
 S = "${WORKDIR}/git"
 DEPENDS += "openssl"
-RDEPENDS_${PN} += "openssl"
+RDEPENDS:${PN} += "openssl"
 REPO ?= "git://github.com/Xilinx/bootgen.git;protocol=https"
 BRANCH ?= "xlnx_rel_v2021.2"
@@ -17,7 +17,7 @@ BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '
 SRC_URI = "${REPO};${BRANCHARG}"
 EXTRA_OEMAKE += 'CROSS_COMPILER="${CXX}" -C ${S}'
-CXXFLAGS_append = " -std=c++0x"
+CXXFLAGS:append = " -std=c++0x"
 TARGET_CC_ARCH += "${LDFLAGS}"
@@ -26,6 +26,6 @@ do_install() {
    install -Dm 0755 ${S}/bootgen ${D}${bindir}
 }
-FILES_${PN} = "${bindir}/bootgen"
+FILES:${PN} = "${bindir}/bootgen"
 BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-xilinx-bsp/recipes-bsp/cdo/extract-cdo_1.0.bb b/meta-xilinx-bsp/recipes-bsp/cdo/extract-cdo_1.0.bb
index dedb3559..37c284ad 100644
--- a/meta-xilinx-bsp/recipes-bsp/cdo/extract-cdo_1.0.bb
+++ b/meta-xilinx-bsp/recipes-bsp/cdo/extract-cdo_1.0.bb
@@ -11,7 +11,7 @@ DEPENDS += "bootgen-native"
 do_compile[depends] += "virtual/boot-bin:do_deploy"
 COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE_versal = "versal"
+COMPATIBLE_MACHINE:versal = "versal"
 PACKAGE_ARCH ?= "${MACHINE_ARCH}"
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 962154ad..be1e7f30 100644
--- a/meta-xilinx-bsp/recipes-bsp/device-tree/device-tree.bb
+++ b/meta-xilinx-bsp/recipes-bsp/device-tree/device-tree.bb
@@ -17,8 +17,8 @@ inherit devicetree image-artifact-names
 DT_FILES_PATH = "${@os.path.dirname(d.getVar('SYSTEM_DTFILE')) if d.getVar('SYSTEM_DTFILE') else d.getVar('S')}"
-COMPATIBLE_MACHINE_zynqmp = ".*"
+COMPATIBLE_MACHINE:zynqmp = ".*"
-COMPATIBLE_MACHINE_versal = ".*"
+COMPATIBLE_MACHINE:versal = ".*"
 # Device-trees are inherently board specific
 BOARD_ARCH ??= "${MACHINE_ARCH}"
@@ -29,24 +29,24 @@ DEPENDS += "python3-dtc-native"
 PROVIDES = "virtual/dtb"
 # common zynq include
-SRC_URI_append_zynq = " file://zynq-7000-qspi-dummy.dtsi"
+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"
+SRC_URI:append_picozed-zynq7 = " file://picozed-zynq7.dts"
 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 = ".*"
-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 = ".*"
-SRC_URI_append_kc705-microblazeel = " \
+SRC_URI:append_kc705-microblazeel = " \
                file://kc705-microblazeel.dts \
                file://pl.dtsi \
                file://system-conf.dtsi \
@@ -55,7 +55,7 @@ SRC_URI_append_kc705-microblazeel = " \
 DTB_FILE_NAME = "${@os.path.basename(d.getVar('SYSTEM_DTFILE')).replace('.dts', '.dtb') if d.getVar('SYSTEM_DTFILE') else ''}"
 DTB_BASE_NAME ?= "${MACHINE}-system${IMAGE_VERSION_SUFFIX}"
-devicetree_do_deploy_append() {
+devicetree_do_deploy:append() {
    if [ -n "${DTB_FILE_NAME}" ]; then
        if [ -e "${DEPLOYDIR}/devicetree/${DTB_FILE_NAME}" ]; then
            # We need the output to be system.dtb for WIC setup to match XSCT flow
diff --git a/meta-xilinx-bsp/recipes-bsp/embeddedsw/fsbl.bb b/meta-xilinx-bsp/recipes-bsp/embeddedsw/fsbl.bb
index 4954b03d..2fa71309 100644
--- a/meta-xilinx-bsp/recipes-bsp/embeddedsw/fsbl.bb
+++ b/meta-xilinx-bsp/recipes-bsp/embeddedsw/fsbl.bb
@@ -7,8 +7,8 @@ PROVIDES = "virtual/fsbl"
 INHERIT_DEFAULT_DEPENDS = "1"
 COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE_zynq = "zynq"
+COMPATIBLE_MACHINE:zynq = "zynq"
-COMPATIBLE_MACHINE_zynqmp = "zynqmp"
+COMPATIBLE_MACHINE:zynqmp = "zynqmp"
 # Specify a default in case boardvariant isn't available
 BOARDVARIANT_ARCH ??= "${MACHINE_ARCH}"
@@ -53,8 +53,8 @@ do_deploy() {
 addtask deploy before do_build after do_install
-INSANE_SKIP_${PN} = "arch"
+INSANE_SKIP:${PN} = "arch"
-INSANE_SKIP_${PN}-dbg = "arch"
+INSANE_SKIP:${PN}-dbg = "arch"
 SYSROOT_DIRS += "/boot"
-FILES_${PN} = "/boot/${PN}.elf"
+FILES:${PN} = "/boot/${PN}.elf"
diff --git a/meta-xilinx-bsp/recipes-bsp/embeddedsw/plmfw.bb b/meta-xilinx-bsp/recipes-bsp/embeddedsw/plmfw.bb
index 0dd93b09..70d234c9 100644
--- a/meta-xilinx-bsp/recipes-bsp/embeddedsw/plmfw.bb
+++ b/meta-xilinx-bsp/recipes-bsp/embeddedsw/plmfw.bb
@@ -8,7 +8,7 @@ PROVIDES = "virtual/plm"
 INHERIT_DEFAULT_DEPENDS = "1"
 COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE_versal = "versal"
+COMPATIBLE_MACHINE:versal = "versal"
 # Specify a default in case boardvariant isn't available
 BOARDVARIANT_ARCH ??= "${MACHINE_ARCH}"
@@ -54,8 +54,8 @@ do_deploy() {
 addtask deploy before do_build after do_install
-INSANE_SKIP_${PN} = "arch"
+INSANE_SKIP:${PN} = "arch"
-INSANE_SKIP_${PN}-dbg = "arch"
+INSANE_SKIP:${PN}-dbg = "arch"
 SYSROOT_DIRS += "/boot"
-FILES_${PN} = "/boot/${PN}.elf"
+FILES:${PN} = "/boot/${PN}.elf"
diff --git a/meta-xilinx-bsp/recipes-bsp/embeddedsw/pmufw.bb b/meta-xilinx-bsp/recipes-bsp/embeddedsw/pmufw.bb
index 13498737..7371127c 100644
--- a/meta-xilinx-bsp/recipes-bsp/embeddedsw/pmufw.bb
+++ b/meta-xilinx-bsp/recipes-bsp/embeddedsw/pmufw.bb
@@ -7,7 +7,7 @@ PROVIDES = "virtual/pmu-firmware"
 INHERIT_DEFAULT_DEPENDS = "1"
 COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE_zynqmp = "zynqmp"
+COMPATIBLE_MACHINE:zynqmp = "zynqmp"
 # Specify a default in case boardvariant isn't available
 BOARDVARIANT_ARCH ??= "${MACHINE_ARCH}"
@@ -52,8 +52,8 @@ do_deploy() {
 addtask deploy before do_build after do_install
-INSANE_SKIP_${PN} = "arch"
+INSANE_SKIP:${PN} = "arch"
-INSANE_SKIP_${PN}-dbg = "arch"
+INSANE_SKIP:${PN}-dbg = "arch"
 SYSROOT_DIRS += "/boot"
-FILES_${PN} = "/boot/${PN}.elf"
+FILES:${PN} = "/boot/${PN}.elf"
diff --git a/meta-xilinx-bsp/recipes-bsp/embeddedsw/psmfw.bb b/meta-xilinx-bsp/recipes-bsp/embeddedsw/psmfw.bb
index 267d6c8a..5a885b3b 100644
--- a/meta-xilinx-bsp/recipes-bsp/embeddedsw/psmfw.bb
+++ b/meta-xilinx-bsp/recipes-bsp/embeddedsw/psmfw.bb
@@ -8,7 +8,7 @@ PROVIDES = "virtual/psm-firmware"
 INHERIT_DEFAULT_DEPENDS = "1"
 COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE_versal = "versal"
+COMPATIBLE_MACHINE:versal = "versal"
 # Specify a default in case boardvariant isn't available
 BOARDVARIANT_ARCH ??= "${MACHINE_ARCH}"
@@ -54,8 +54,8 @@ do_deploy() {
 addtask deploy before do_build after do_install
-INSANE_SKIP_${PN} = "arch"
+INSANE_SKIP:${PN} = "arch"
-INSANE_SKIP_${PN}-dbg = "arch"
+INSANE_SKIP:${PN}-dbg = "arch"
 SYSROOT_DIRS += "/boot"
-FILES_${PN} = "/boot/${PN}.elf"
+FILES:${PN} = "/boot/${PN}.elf"
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 32509b07..cac8bbfc 100644
--- a/meta-xilinx-bsp/recipes-bsp/platform-init/platform-init.bb
+++ b/meta-xilinx-bsp/recipes-bsp/platform-init/platform-init.bb
@@ -34,5 +34,5 @@ do_install() {
        done
 }
-FILES_${PN} += "${PLATFORM_INIT_DIR}/*"
+FILES:${PN} += "${PLATFORM_INIT_DIR}/*"
diff --git a/meta-xilinx-bsp/recipes-bsp/reference-design/kc705-bitstream_2021.2.bb b/meta-xilinx-bsp/recipes-bsp/reference-design/kc705-bitstream_2021.2.bb
index 6a2ca7cc..e512777c 100644
--- a/meta-xilinx-bsp/recipes-bsp/reference-design/kc705-bitstream_2021.2.bb
+++ b/meta-xilinx-bsp/recipes-bsp/reference-design/kc705-bitstream_2021.2.bb
@@ -21,7 +21,7 @@ SRC_URI[sha256sum] = "a909a91a37a9925ee2f972ccb10f986a26ff9785c1a71a483545a19278
 PROVIDES = "virtual/bitstream"
-FILES_${PN} += "/boot/download.bit"
+FILES:${PN} += "/boot/download.bit"
 INHIBIT_DEFAULT_DEPS = "1"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-spl-zynq-init.inc b/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-spl-zynq-init.inc
index 97c449bd..a68c597f 100644
--- a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-spl-zynq-init.inc
+++ b/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-spl-zynq-init.inc
@@ -3,10 +3,10 @@ inherit xilinx-platform-init
 FORCE_PLATFORM_INIT[doc] = "This variable is used to force the overriding of all platform init files in u-boot source."
 PLATFORM_BOARD_DIR ?= ""
-PLATFORM_BOARD_DIR_zynq = "board/xilinx/zynq"
+PLATFORM_BOARD_DIR:zynq = "board/xilinx/zynq"
-PLATFORM_BOARD_DIR_zynqmp = "board/xilinx/zynqmp"
+PLATFORM_BOARD_DIR:zynqmp = "board/xilinx/zynqmp"
-do_zynq_platform_init() {
+do:zynq_platform_init() {
        for f in ${PLATFORM_INIT_FILES}; do
                if [ -d "${S}/${PLATFORM_BOARD_DIR}/custom_hw_platform" ]; then
                        cp ${PLATFORM_INIT_STAGE_DIR}/$f ${S}/${PLATFORM_BOARD_DIR}/custom_hw_platform/
@@ -48,7 +48,7 @@ python () {
            # force the dependency on a recipe that provides the platform init files
            d.appendVar("DEPENDS", " virtual/xilinx-platform-init")
            # setup task to modify platform init after unpack and prepare_recipe_sysroot, and before configure
-            bb.build.addtask("do_zynq_platform_init", "do_configure", "do_unpack do_prepare_recipe_sysroot", d)
+            bb.build.addtask("do:zynq_platform_init", "do_configure", "do_unpack do_prepare_recipe_sysroot", d)
    if "boot.bin" not in d.getVar("SPL_BINARY"):
        # not deploying the boot.bin, just building SPL
diff --git a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx.inc b/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx.inc
index 794141ec..893b8f6c 100644
--- a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx.inc
+++ b/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx.inc
@@ -15,7 +15,7 @@ SRC_URI = "${UBOOTURI};${UBRANCHARG}"
 S = "${WORKDIR}/git"
 B = "${WORKDIR}/build"
-FILESEXTRAPATHS_prepend := "${THISDIR}/u-boot:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot:"
 SYSROOT_DIRS += "/boot"
diff --git a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2021.2.bb b/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2021.2.bb
index c7051bc4..512ae8e9 100644
--- a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2021.2.bb
+++ b/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2021.2.bb
@@ -12,8 +12,8 @@ LIC_FILES_CHKSUM = "file://README;beginline=1;endline=4;md5=744e7e3bb0c94b4b9f6b
 # u-boot-xlnx has support for these
 HAS_PLATFORM_INIT ?= " \
-                xilinx_zynqmp_virt_config \
+                xilinx:zynqmp_virt_config \
-                xilinx_zynq_virt_defconfig \
+                xilinx:zynq_virt_defconfig \
-                xilinx_versal_vc_p_a2197_revA_x_prc_01_revA \
+                xilinx:versal_vc_p_a2197_revA_x_prc_01_revA \
                "
diff --git a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-zynq-scr.bb b/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-zynq-scr.bb
index e340bf65..ebcf2551 100644
--- a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-zynq-scr.bb
+++ b/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-zynq-scr.bb
@@ -9,23 +9,23 @@ inherit deploy nopackages image-wic-utils
 INHIBIT_DEFAULT_DEPS = "1"
 COMPATIBLE_MACHINE ?= "^$"
-COMPATIBLE_MACHINE_zynqmp = "zynqmp"
+COMPATIBLE_MACHINE:zynqmp = "zynqmp"
-COMPATIBLE_MACHINE_zynq = "zynq"
+COMPATIBLE_MACHINE:zynq = "zynq"
-COMPATIBLE_MACHINE_versal = "versal"
+COMPATIBLE_MACHINE:versal = "versal"
-COMPATIBLE_MACHINE_microblaze = "microblaze"
+COMPATIBLE_MACHINE:microblaze = "microblaze"
 KERNELDT = "${@os.path.basename(d.getVar('KERNEL_DEVICETREE').split(' ')[0]) if d.getVar('KERNEL_DEVICETREE') else ''}"
 DEVICE_TREE_NAME ?= "${@bb.utils.contains('PREFERRED_PROVIDER_virtual/dtb', 'device-tree', 'system.dtb', d.getVar('KERNELDT'), d)}"
 #Need to copy a rootfs.cpio.gz.u-boot as uramdisk.image.gz into boot partition
 RAMDISK_IMAGE ?= ""
-RAMDISK_IMAGE_zynq ?= "uramdisk.image.gz"
+RAMDISK_IMAGE:zynq ?= "uramdisk.image.gz"
 PXERAMDISK_IMAGE ?= "${@'ramdisk.cpio.gz.u-boot' if d.getVar('INITRAMFS_IMAGE') and d.getVar('INITRAMFS_IMAGE').find('initramfs') > 0 else '${RAMDISK_IMAGE}'}"
-KERNEL_BOOTCMD_zynqmp ?= "booti"
+KERNEL_BOOTCMD:zynqmp ?= "booti"
-KERNEL_BOOTCMD_zynq ?= "bootm"
+KERNEL_BOOTCMD:zynq ?= "bootm"
-KERNEL_BOOTCMD_versal ?= "booti"
+KERNEL_BOOTCMD:versal ?= "booti"
-KERNEL_BOOTCMD_microblaze ?= "bootm"
+KERNEL_BOOTCMD:microblaze ?= "bootm"
 BOOTMODE ?= "sd"
 BOOTFILE_EXT ?= ".${SOC_FAMILY}"
@@ -34,7 +34,7 @@ BOOTFILE_EXT ?= ".${SOC_FAMILY}"
 SKIP_APPEND_BASEADDR ?= "0"
 DDR_BASEADDR ?= "0x0"
-DDR_BASEADDR_microblaze ?= "0x80000000"
+DDR_BASEADDR:microblaze ?= "0x80000000"
 PRE_BOOTENV ?= ""
 SRC_URI = " \
@@ -54,14 +54,14 @@ PACKAGE_ARCH = "${BOARDVARIANT_ARCH}"
 # On zynqmp-dr, we know we're different so if BOARD is not defined, fall back
 # to the SOC_VARIANT_ARCH instead
 SOC_VARIANT_ARCH ??= "${MACHINE_ARCH}"
-PACKAGE_ARCH_zynqmp-dr = "${@['${BOARDVARIANT_ARCH}', '${SOC_VARIANT_ARCH}'][d.getVar('BOARDVARIANT_ARCH')==d.getVar('MACHINE_ARCH')]}"
+PACKAGE_ARCH:zynqmp-dr = "${@['${BOARDVARIANT_ARCH}', '${SOC_VARIANT_ARCH}'][d.getVar('BOARDVARIANT_ARCH')==d.getVar('MACHINE_ARCH')]}"
 inherit image-artifact-names
 UENV_TEXTFILE ?= "uEnv.txt"
-UENV_MMC_OFFSET_zynqmp ?= "0x200000"
+UENV_MMC_OFFSET:zynqmp ?= "0x200000"
-UENV_MMC_OFFSET_zynq ?= "0x2080000"
+UENV_MMC_OFFSET:zynq ?= "0x2080000"
-UENV_MMC_OFFSET_versal ?= "0x200000"
+UENV_MMC_OFFSET:versal ?= "0x200000"
-UENV_MMC_OFFSET_microblaze ?= "0x0"
+UENV_MMC_OFFSET:microblaze ?= "0x0"
 UENV_MMC_LOAD_ADDRESS ?= "${@append_baseaddr(d,d.getVar('UENV_MMC_OFFSET'))}"
@@ -71,26 +71,26 @@ UBOOTPXE_CONFIG_NAME = "${UBOOTPXE_CONFIG}${IMAGE_VERSION_SUFFIX}"
 DEVICETREE_ADDRESS ?= "${@append_baseaddr(d,d.getVar('DEVICETREE_OFFSET'))}"
-DEVICETREE_OFFSET_microblaze ?= "0x1e00000"
+DEVICETREE_OFFSET:microblaze ?= "0x1e00000"
-DEVICETREE_OFFSET_zynqmp ?= "0x100000"
+DEVICETREE_OFFSET:zynqmp ?= "0x100000"
-DEVICETREE_OFFSET_zynq ?= "0x2000000"
+DEVICETREE_OFFSET:zynq ?= "0x2000000"
-DEVICETREE_OFFSET_versal ?= "0x1000"
+DEVICETREE_OFFSET:versal ?= "0x1000"
 KERNEL_LOAD_ADDRESS ?= "${@append_baseaddr(d,d.getVar('KERNEL_OFFSET'))}"
-KERNEL_OFFSET_microblaze ?= "0x0"
+KERNEL_OFFSET:microblaze ?= "0x0"
-KERNEL_OFFSET_zynqmp ?= "0x200000"
+KERNEL_OFFSET:zynqmp ?= "0x200000"
-KERNEL_OFFSET_zynq ?= "0x2080000"
+KERNEL_OFFSET:zynq ?= "0x2080000"
-KERNEL_OFFSET_versal ?= "0x200000"
+KERNEL_OFFSET:versal ?= "0x200000"
 KERNEL_IMAGE ?= "${KERNEL_IMAGETYPE}"
 RAMDISK_IMAGE_ADDRESS ?= "${@append_baseaddr(d,d.getVar('RAMDISK_OFFSET'))}"
-RAMDISK_OFFSET_microblaze ?= "0x2e00000"
+RAMDISK_OFFSET:microblaze ?= "0x2e00000"
-RAMDISK_OFFSET_zynq ?= "0x4000000"
+RAMDISK_OFFSET:zynq ?= "0x4000000"
-RAMDISK_OFFSET_zynqmp ?= "0x4000000"
+RAMDISK_OFFSET:zynqmp ?= "0x4000000"
-RAMDISK_OFFSET_versal ?= "0x6000000"
+RAMDISK_OFFSET:versal ?= "0x6000000"
 FIT_IMAGE_LOAD_ADDRESS ?= "${@append_baseaddr(d,d.getVar('FIT_IMAGE_OFFSET'))}"
 FIT_IMAGE_OFFSET ?= "0x10000000"
@@ -99,20 +99,20 @@ FIT_IMAGE ?= "image.ub"
 ## Below offsets and sizes are based on 32MB QSPI Memory for zynq
 ## For MB
 ## Load boot.scr at 0xFC0000 -> 15MB of QSPI/NAND Memory
-QSPI_KERNEL_OFFSET_microblaze ?= "0xBC0000"
+QSPI_KERNEL_OFFSET:microblaze ?= "0xBC0000"
-QSPI_KERNEL_SIZE_microblaze ?= "0x500000"
+QSPI_KERNEL_SIZE:microblaze ?= "0x500000"
-QSPI_RAMDISK_SIZE_microblaze ?= "0xA00000"
+QSPI_RAMDISK_SIZE:microblaze ?= "0xA00000"
 ## For zynq
 ## Load boot.scr at 0xFC0000 -> 15MB of QSPI/NAND Memory
-QSPI_KERNEL_OFFSET_zynq ?= "0x1000000"
+QSPI_KERNEL_OFFSET:zynq ?= "0x1000000"
-QSPI_RAMDISK_OFFSET_zynq ?= "0x1580000"
+QSPI_RAMDISK_OFFSET:zynq ?= "0x1580000"
-NAND_KERNEL_OFFSET_zynq ?= "0x1000000"
+NAND_KERNEL_OFFSET:zynq ?= "0x1000000"
-NAND_RAMDISK_OFFSET_zynq ?= "0x4600000"
+NAND_RAMDISK_OFFSET:zynq ?= "0x4600000"
-QSPI_KERNEL_SIZE_zynq ?= "0x500000"
+QSPI_KERNEL_SIZE:zynq ?= "0x500000"
-QSPI_RAMDISK_SIZE_zynq ?= "0xA00000"
+QSPI_RAMDISK_SIZE:zynq ?= "0xA00000"
 NAND_KERNEL_SIZE ?= "0x3200000"
 NAND_RAMDISK_SIZE ?= "0x3200000"
@@ -121,40 +121,40 @@ NAND_RAMDISK_SIZE ?= "0x3200000"
 ## For zynqMP
 ## Load boot.scr at 0x3E80000 -> 62MB of QSPI/NAND Memory
 QSPI_KERNEL_OFFSET ?= "0xF00000"
-QSPI_KERNEL_OFFSET_zynqmpdr ?= "0x3F00000"
+QSPI_KERNEL_OFFSET:zynqmpdr ?= "0x3F00000"
 QSPI_RAMDISK_OFFSET ?= "0x4000000"
-QSPI_RAMDISK_OFFSET_zynqmpdr ?= "0x5D00000"
+QSPI_RAMDISK_OFFSET:zynqmpdr ?= "0x5D00000"
-NAND_KERNEL_OFFSET_zynqmp ?= "0x4100000"
+NAND_KERNEL_OFFSET:zynqmp ?= "0x4100000"
-NAND_RAMDISK_OFFSET_zynqmp ?= "0x7800000"
+NAND_RAMDISK_OFFSET:zynqmp ?= "0x7800000"
-QSPI_KERNEL_SIZE_zynqmp ?= "0x1D00000"
+QSPI_KERNEL_SIZE:zynqmp ?= "0x1D00000"
 QSPI_RAMDISK_SIZE ?= "0x4000000"
-QSPI_RAMDISK_SIZE_zynqmpdr ?= "0x1D00000"
+QSPI_RAMDISK_SIZE:zynqmpdr ?= "0x1D00000"
 ## For versal
 ## Load boot.scr at 0x7F80000 -> 127MB of QSPI/NAND Memory
-QSPI_KERNEL_OFFSET_versal ?= "0xF00000"
+QSPI_KERNEL_OFFSET:versal ?= "0xF00000"
-QSPI_RAMDISK_OFFSET_versal ?= "0x2E00000"
+QSPI_RAMDISK_OFFSET:versal ?= "0x2E00000"
-NAND_KERNEL_OFFSET_versal ?= "0x4100000"
+NAND_KERNEL_OFFSET:versal ?= "0x4100000"
-NAND_RAMDISK_OFFSET_versal ?= "0x8200000"
+NAND_RAMDISK_OFFSET:versal ?= "0x8200000"
-QSPI_KERNEL_SIZE_versal ?= "0x1D00000"
+QSPI_KERNEL_SIZE:versal ?= "0x1D00000"
-QSPI_RAMDISK_SIZE_versal ?= "0x4000000"
+QSPI_RAMDISK_SIZE:versal ?= "0x4000000"
-QSPI_KERNEL_IMAGE_microblaze ?= "image.ub"
+QSPI_KERNEL_IMAGE:microblaze ?= "image.ub"
-QSPI_KERNEL_IMAGE_zynq ?= "image.ub"
+QSPI_KERNEL_IMAGE:zynq ?= "image.ub"
-QSPI_KERNEL_IMAGE_zynqmp ?= "image.ub"
+QSPI_KERNEL_IMAGE:zynqmp ?= "image.ub"
-QSPI_KERNEL_IMAGE_versal ?= "image.ub"
+QSPI_KERNEL_IMAGE:versal ?= "image.ub"
 NAND_KERNEL_IMAGE ?= "image.ub"
 QSPI_FIT_IMAGE_OFFSET ?= "0x1080000"
 QSPI_FIT_IMAGE_SIZE ?= "0x6400000"
-QSPI_FIT_IMAGE_SIZE_zynqmpdr ?= "0x3F00000"
+QSPI_FIT_IMAGE_SIZE:zynqmpdr ?= "0x3F00000"
-QSPI_FIT_IMAGE_SIZE_zynq ?= "0xF00000"
+QSPI_FIT_IMAGE_SIZE:zynq ?= "0xF00000"
-QSPI_FIT_IMAGE_SIZE_microblaze ?= "0xF00000"
+QSPI_FIT_IMAGE_SIZE:microblaze ?= "0xF00000"
 NAND_FIT_IMAGE_OFFSET ?= "0x1080000"
 NAND_FIT_IMAGE_SIZE ?= "0x6400000"
@@ -167,8 +167,8 @@ do_configure[noexec] = "1"
 do_install[noexec] = "1"
 def append_baseaddr(d,offset):
-    skip_append = d.getVar('SKIP_APPEND_BASEADDR') or ""
+    skip:append = d.getVar('SKIP_APPEND_BASEADDR') or ""
-    if skip_append == "1":
+    if skip:append == "1":
        return offset
    import subprocess
    baseaddr = d.getVar('DDR_BASEADDR') or "0x0"
diff --git a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-zynq-uenv.bb b/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-zynq-uenv.bb
index 97577c3d..52ae09f0 100644
--- a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-zynq-uenv.bb
+++ b/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-zynq-uenv.bb
@@ -22,8 +22,8 @@ python () {
 }
 COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE_zynq = ".*"
+COMPATIBLE_MACHINE:zynq = ".*"
-COMPATIBLE_MACHINE_zynqmp = ".*"
+COMPATIBLE_MACHINE:zynqmp = ".*"
 inherit deploy image-wic-utils
@@ -81,13 +81,13 @@ def uenv_populate(d):
    return env
 # bootargs, default to booting with the rootfs device being partition 2
-KERNEL_BOOTARGS_zynq = "earlyprintk console=ttyPS0,115200 root=/dev/mmcblk0p2 rw rootwait"
+KERNEL_BOOTARGS:zynq = "earlyprintk console=ttyPS0,115200 root=/dev/mmcblk0p2 rw rootwait"
-KERNEL_BOOTARGS_zynqmp = "earlycon clk_ignore_unused root=/dev/mmcblk${sdbootdev}p2 rw rootwait"
+KERNEL_BOOTARGS:zynqmp = "earlycon clk_ignore_unused root=/dev/mmcblk${sdbootdev}p2 rw rootwait"
-KERNEL_LOAD_ADDRESS_zynq = "0x2080000"
+KERNEL_LOAD_ADDRESS:zynq = "0x2080000"
-KERNEL_LOAD_ADDRESS_zynqmp = "0x200000"
+KERNEL_LOAD_ADDRESS:zynqmp = "0x200000"
-DEVICETREE_LOAD_ADDRESS_zynq = "0x2000000"
+DEVICETREE_LOAD_ADDRESS:zynq = "0x2000000"
-DEVICETREE_LOAD_ADDRESS_zynqmp = "0x4000000"
+DEVICETREE_LOAD_ADDRESS:zynqmp = "0x4000000"
 python do_compile() {
    env = uenv_populate(d)
@@ -96,7 +96,7 @@ python do_compile() {
            f.write("{0}={1}\n".format(k, v))
 }
-FILES_${PN} += "/boot/uEnv.txt"
+FILES:${PN} += "/boot/uEnv.txt"
 do_install() {
        install -Dm 0644 ${WORKDIR}/uEnv.txt ${D}/boot/uEnv.txt
diff --git a/meta-xilinx-bsp/recipes-core/glibc/glibc-locale_%.bbappend b/meta-xilinx-bsp/recipes-core/glibc/glibc-locale_%.bbappend
index 68ae89b4..1702b75d 100644
--- a/meta-xilinx-bsp/recipes-core/glibc/glibc-locale_%.bbappend
+++ b/meta-xilinx-bsp/recipes-core/glibc/glibc-locale_%.bbappend
@@ -1,4 +1,4 @@
-do_install_append() {
+do_install:append() {
    # Remove the libdir if it is empty when gconv is not copied
    find ${D}${libdir} -type d -empty -delete
 }
diff --git a/meta-xilinx-bsp/recipes-devtools/python/python3-anytree_2.8.0.bb b/meta-xilinx-bsp/recipes-devtools/python/python3-anytree_2.8.0.bb
index 1b27844c..f5070be7 100644
--- a/meta-xilinx-bsp/recipes-devtools/python/python3-anytree_2.8.0.bb
+++ b/meta-xilinx-bsp/recipes-devtools/python/python3-anytree_2.8.0.bb
@@ -14,7 +14,7 @@ S = "${WORKDIR}/git"
 inherit setuptools3
-do_install_append() {
+do_install:append() {
        rm -f ${D}/${datadir}/LICENSE
        rmdir ${D}/${datadir} || :
 }
diff --git a/meta-xilinx-bsp/recipes-devtools/qemu/flashstrip_1.0.bb b/meta-xilinx-bsp/recipes-devtools/qemu/flashstrip_1.0.bb
index a6389910..e1dcc5ae 100644
--- a/meta-xilinx-bsp/recipes-devtools/qemu/flashstrip_1.0.bb
+++ b/meta-xilinx-bsp/recipes-devtools/qemu/flashstrip_1.0.bb
@@ -22,6 +22,6 @@ do_install() {
    install -Dm 0755 ${B}/* ${D}${bindir}/
 }
-FILES_${PN} = "${bindir}/*"
+FILES:${PN} = "${bindir}/*"
 BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-devicetrees.inc b/meta-xilinx-bsp/recipes-devtools/qemu/qemu-devicetrees.inc
index ee9d0be8..6d834297 100644
--- a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-devicetrees.inc
+++ b/meta-xilinx-bsp/recipes-devtools/qemu/qemu-devicetrees.inc
@@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = "file://Makefile;beginline=1;endline=27;md5=7348b6cbcae69912c
 PV = "xilinx-${XILINX_RELEASE_VERSION}+git${SRCPV}"
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-SRC_URI_append = " file://0001-Makefile-Use-python3-instead-of-python.patch"
+SRC_URI:append = " file://0001-Makefile-Use-python3-instead-of-python.patch"
 REPO ?= "git://github.com/Xilinx/qemu-devicetrees.git;protocol=https"
diff --git a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx-helper-native_1.0.bb b/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx-helper-native_1.0.bb
index 2e018aa5..efd23d50 100644
--- a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx-helper-native_1.0.bb
+++ b/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx-helper-native_1.0.bb
@@ -8,17 +8,17 @@ python () {
 # include the existing qemu-helper-native
 require recipes-devtools/qemu/qemu-helper-native_1.0.bb
 # get the path to tunctl.c (from oe-core!)
-FILESEXTRAPATHS_prepend := "${COREBASE}/meta/recipes-devtools/qemu/qemu-helper:"
+FILESEXTRAPATHS:prepend := "${COREBASE}/meta/recipes-devtools/qemu/qemu-helper:"
 # provide it, to replace the existing
 PROVIDES += "qemu-helper-native"
 # replace qemu with qemu-xilinx
-DEPENDS_remove = "qemu-system-native"
+DEPENDS:remove = "qemu-system-native"
-DEPENDS_append = " \
+DEPENDS:append = " \
                qemu-xilinx-system-native \
                qemu-xilinx-multiarch-helper-native \
                "
-RDEPENDS_${PN}_remove = "qemu-system-native"
+RDEPENDS:${PN}:remove = "qemu-system-native"
-RDEPENDS_${PN}_append = " qemu-xilinx-system-native"
+RDEPENDS:${PN}:append = " qemu-xilinx-system-native"
diff --git a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx-multiarch-helper-native_1.0.bb b/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx-multiarch-helper-native_1.0.bb
index 55cec776..1eec0163 100644
--- a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx-multiarch-helper-native_1.0.bb
+++ b/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx-multiarch-helper-native_1.0.bb
@@ -1,11 +1,11 @@
 SUMMARY = "Helper scripts for executing a multi-arch instance of Xilinx QEMU"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
-RDEPENDS_${PN} = "qemu-xilinx-native"
+RDEPENDS:${PN} = "qemu-xilinx-native"
 inherit native
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 SRC_URI = "file://qemu-system-aarch64-multiarch"
diff --git a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx-native.inc b/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx-native.inc
index a1dc5d66..3faabe5b 100644
--- a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx-native.inc
+++ b/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx-native.inc
@@ -3,9 +3,9 @@ require qemu-xilinx.inc
 DEPENDS = "glib-2.0-native zlib-native"
-SRC_URI_remove = "file://0012-fix-libcap-header-issue-on-some-distro.patch"
+SRC_URI:remove = "file://0012-fix-libcap-header-issue-on-some-distro.patch"
-SRC_URI_remove = "file://0013-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch"
+SRC_URI:remove = "file://0013-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch"
-do_install_append(){
+do_install:append(){
       rm -rf ${D}${datadir}/icons
 }
diff --git a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx-native_2021.2.bb b/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx-native_2021.2.bb
index 45d474d1..f657186f 100644
--- a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx-native_2021.2.bb
+++ b/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx-native_2021.2.bb
@@ -1,6 +1,6 @@
 require qemu-xilinx-native.inc
 BPN = "qemu-xilinx"
-EXTRA_OECONF_append = " --target-list=${@get_qemu_usermode_target_list(d)} --disable-tools --disable-blobs --disable-guest-agent"
+EXTRA_OECONF:append = " --target-list=${@get_qemu_usermode_target_list(d)} --disable-tools --disable-blobs --disable-guest-agent"
 PROVIDES = "qemu-native"
diff --git a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx-system-native_2021.2.bb b/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx-system-native_2021.2.bb
index 80e0043b..b30777d2 100644
--- a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx-system-native_2021.2.bb
+++ b/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx-system-native_2021.2.bb
@@ -1,14 +1,14 @@
 require qemu-xilinx-native.inc
-EXTRA_OECONF_append = " --target-list=${@get_qemu_system_target_list(d)}"
+EXTRA_OECONF:append = " --target-list=${@get_qemu_system_target_list(d)}"
 PACKAGECONFIG ??= "fdt alsa kvm"
-PACKAGECONFIG_remove = "${@'kvm' if not os.path.exists('/usr/include/linux/kvm.h') else ''}"
+PACKAGECONFIG:remove = "${@'kvm' if not os.path.exists('/usr/include/linux/kvm.h') else ''}"
 DEPENDS += "pixman-native qemu-xilinx-native"
-do_install_append() {
+do_install:append() {
    # The following is also installed by qemu-native
    rm -f ${D}${datadir}/qemu/trace-events-all
    rm -rf ${D}${datadir}/qemu/keymaps
diff --git a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx.inc b/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx.inc
index 2b0ab563..a56e395a 100644
--- a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx.inc
+++ b/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx.inc
@@ -14,7 +14,7 @@ XILINX_QEMU_VERSION ?= "v5.1.0"
 BRANCH ?= "xlnx_rel_v2021.2"
 SRCREV = "303b509ec23138c43be8a3712068347210df67fd"
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 PV = "${XILINX_QEMU_VERSION}-xilinx-${XILINX_RELEASE_VERSION}+git${SRCPV}"
 REPO ?= "gitsm://github.com/Xilinx/qemu.git;protocol=https"
@@ -22,24 +22,24 @@ REPO ?= "gitsm://github.com/Xilinx/qemu.git;protocol=https"
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI = "${REPO};${BRANCHARG}"
-SRC_URI_append = " file://0010-configure-Add-pkg-config-handling-for-libgcrypt.patch \
+SRC_URI:append = " file://0010-configure-Add-pkg-config-handling-for-libgcrypt.patch \
                   file://0001-Add-enable-disable-udev.patch \
 "
 S = "${WORKDIR}/git"
 # Disable KVM completely
-PACKAGECONFIG_remove = "kvm"
+PACKAGECONFIG:remove = "kvm"
-PACKAGECONFIG_append = " fdt gcrypt"
+PACKAGECONFIG:append = " fdt gcrypt"
-DISABLE_STATIC_pn-${PN} = ""
+DISABLE_STATIC:pn-${PN} = ""
 PTEST_ENABLED = ""
-EXTRA_OECONF_append = " --with-git=/bin/false --disable-git-update"
+EXTRA_OECONF:append = " --with-git=/bin/false --disable-git-update"
-EXTRA_OECONF_remove = " --with-suffix=${BPN} --with-git-submodules=ignore --meson=meson"
+EXTRA_OECONF:remove = " --with-suffix=${BPN} --with-git-submodules=ignore --meson=meson"
-do_install_append() {
+do_install:append() {
        # Prevent QA warnings about installed ${localstatedir}/run
        if [ -d ${D}${localstatedir}/run ]; then rmdir ${D}${localstatedir}/run; fi
 }
diff --git a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx_2021.2.bb b/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx_2021.2.bb
index 09f431ec..5189595a 100644
--- a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx_2021.2.bb
+++ b/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx_2021.2.bb
@@ -3,14 +3,14 @@ require qemu-xilinx.inc
 BBCLASSEXTEND = "nativesdk"
-RDEPENDS_${PN}_class-target += "bash"
+RDEPENDS:${PN}:class-target += "bash"
-PROVIDES_class-nativesdk = "nativesdk-qemu"
+PROVIDES:class-nativesdk = "nativesdk-qemu"
-RPROVIDES_${PN}_class-nativesdk = "nativesdk-qemu"
+RPROVIDES:${PN}:class-nativesdk = "nativesdk-qemu"
-EXTRA_OECONF_append_class-target = " --target-list=${@get_qemu_target_list(d)}"
+EXTRA_OECONF:append:class-target = " --target-list=${@get_qemu_target_list(d)}"
-EXTRA_OECONF_append_class-nativesdk = " --target-list=${@get_qemu_target_list(d)}"
+EXTRA_OECONF:append:class-nativesdk = " --target-list=${@get_qemu_target_list(d)}"
-do_install_append_class-nativesdk() {
+do_install:append:class-nativesdk() {
    ${@bb.utils.contains('PACKAGECONFIG', 'gtk+', 'make_qemu_wrapper', '', d)}
 }
diff --git a/meta-xilinx-bsp/recipes-devtools/run-postinsts/run-postinsts_%.bbappend b/meta-xilinx-bsp/recipes-devtools/run-postinsts/run-postinsts_%.bbappend
index 3923fa2d..cb5a912b 100644
--- a/meta-xilinx-bsp/recipes-devtools/run-postinsts/run-postinsts_%.bbappend
+++ b/meta-xilinx-bsp/recipes-devtools/run-postinsts/run-postinsts_%.bbappend
@@ -2,6 +2,6 @@
 # our devices, exits ungracefully without performing the required work (symbolic
 # linking), pass kmsg to it as output to achieve proper behavior.
-do_install_append(){
+do_install:append(){
    sed -i "s/sh -c \$i \$append_log/sh -c \$i > \/dev\/kmsg/" ${D}${sbindir}/run-postinsts
 }
diff --git a/meta-xilinx-bsp/recipes-graphics/cairo/cairo_%.bbappend b/meta-xilinx-bsp/recipes-graphics/cairo/cairo_%.bbappend
index d00e696a..6343c38f 100644
--- a/meta-xilinx-bsp/recipes-graphics/cairo/cairo_%.bbappend
+++ b/meta-xilinx-bsp/recipes-graphics/cairo/cairo_%.bbappend
@@ -2,6 +2,6 @@ PACKAGECONFIG_mali400 = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xcb
                         egl glesv2"
 # OpenGL comes from libmali
-DEPENDS_append_mali400 = " libmali-xlnx"
+DEPENDS:append_mali400 = " libmali-xlnx"
 PACKAGE_ARCH_mali400 = "${SOC_VARIANT_ARCH}"
diff --git a/meta-xilinx-bsp/recipes-graphics/libgles/libmali-xlnx.bb b/meta-xilinx-bsp/recipes-graphics/libgles/libmali-xlnx.bb
index 047f2d90..4acbc389 100644
--- a/meta-xilinx-bsp/recipes-graphics/libgles/libmali-xlnx.bb
+++ b/meta-xilinx-bsp/recipes-graphics/libgles/libmali-xlnx.bb
@@ -9,7 +9,7 @@ ANY_OF_DISTRO_FEATURES = "x11 fbdev wayland"
 PROVIDES += "virtual/libgles1 virtual/libgles2 virtual/egl virtual/libgbm"
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 REPO ?= "git://github.com/Xilinx/mali-userspace-binaries.git;protocol=https"
 BRANCH ?= "rel-v2021.1"
@@ -27,8 +27,8 @@ SRC_URI = " \
    "
 COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE_zynqmp-eg = "zynqmp-eg"
+COMPATIBLE_MACHINE:zynqmp-eg = "zynqmp-eg"
-COMPATIBLE_MACHINE_zynqmp-ev = "zynqmp-ev"
+COMPATIBLE_MACHINE:zynqmp-ev = "zynqmp-ev"
 PACKAGE_ARCH = "${SOC_VARIANT_ARCH}"
@@ -40,7 +40,7 @@ X11RDEPENDS = "libxdamage libxext libx11 libdrm libxfixes"
 X11DEPENDS = "libxdamage libxext virtual/libx11 libdrm libxfixes"
 # Don't install runtime dependencies for other backends unless the DISTRO supports it
-RDEPENDS_${PN} = " \
+RDEPENDS:${PN} = " \
    kernel-module-mali \
    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '${X11RDEPENDS}', '', d)} \
 "
@@ -129,16 +129,16 @@ ALTERNATIVE_LINK_NAME[libmali-xlnx] = "${libdir}/${MONOLITHIC_LIBMALI}"
 # Declare alternatives and corresponding library location
-ALTERNATIVE_${PN}-x11 = "libmali-xlnx"
+ALTERNATIVE:${PN}-x11 = "libmali-xlnx"
 ALTERNATIVE_TARGET_libmali-xlnx-x11[libmali-xlnx] = "${libdir}/x11/${MONOLITHIC_LIBMALI}"
-ALTERNATIVE_${PN}-fbdev = "libmali-xlnx"
+ALTERNATIVE:${PN}-fbdev = "libmali-xlnx"
 ALTERNATIVE_TARGET_libmali-xlnx-fbdev[libmali-xlnx] = "${libdir}/fbdev/${MONOLITHIC_LIBMALI}"
-ALTERNATIVE_${PN}-wayland = "libmali-xlnx"
+ALTERNATIVE:${PN}-wayland = "libmali-xlnx"
 ALTERNATIVE_TARGET_libmali-xlnx-wayland[libmali-xlnx] = "${libdir}/wayland/${MONOLITHIC_LIBMALI}"
-ALTERNATIVE_${PN}-headless = "libmali-xlnx"
+ALTERNATIVE:${PN}-headless = "libmali-xlnx"
 ALTERNATIVE_TARGET_libmali-xlnx-headless[libmali-xlnx] = "${libdir}/headless/${MONOLITHIC_LIBMALI}"
 # Set priorities according to what we prveiously defined
@@ -151,24 +151,24 @@ ALTERNATIVE_PRIORITY_libmali-xlnx-headless[libmali-xlnx] = "${@bb.utils.contains
 # Package gets renamed on the debian class, but we want to keep -xlnx
-DEBIAN_NOAUTONAME_libmali-xlnx = "1"
+DEBIAN_NOAUTONAME:libmali-xlnx = "1"
 # Update alternatives will actually have separate postinst scripts (one for each package)
 # This wont work for us, so we create a common postinst script and we pass that as the general
 # libmali-xlnx postinst script, but we defer execution to run on first boot (pkg_postinst_ontarget).
 # This will avoid ldconfig removing the symbolic links when creating the root filesystem.
-python populate_packages_updatealternatives_append () {
+python populate_packages_updatealternatives:append () {
    # We need to remove the 'fake' libmali-xlnx before creating any links
    libdir = d.getVar('libdir')
    common_postinst = "#!/bin/sh\nrm " + libdir + "/${MONOLITHIC_LIBMALI}\n"
    for pkg in (d.getVar('PACKAGES') or "").split():
        # Not all packages provide an alternative (e.g. ${PN}-lic)
-        postinst = d.getVar('pkg_postinst_%s' % pkg)
+        postinst = d.getVar('pkg_postinst:%s' % pkg)
        if postinst:
            old_postinst = postinst
            new_postinst = postinst.replace('#!/bin/sh','')
            common_postinst += new_postinst
-    d.setVar('pkg_postinst_ontarget_%s' % 'libmali-xlnx', common_postinst)
+    d.setVar('pkg_postinst_ontarget:%s' % 'libmali-xlnx', common_postinst)
 }
@@ -177,16 +177,16 @@ INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
 INHIBIT_PACKAGE_STRIP = "1"
 INHIBIT_SYSROOT_STRIP = "1"
-RREPLACES_${PN} = "libegl libgles1 libglesv1-cm1 libgles2 libglesv2-2 libgbm"
+RREPLACES:${PN} = "libegl libgles1 libglesv1-cm1 libgles2 libglesv2-2 libgbm"
-RPROVIDES_${PN} = "libegl libgles1 libglesv1-cm1 libgles2 libglesv2-2 libgbm"
+RPROVIDES:${PN} = "libegl libgles1 libglesv1-cm1 libgles2 libglesv2-2 libgbm"
-RCONFLICTS_${PN} = "libegl libgles1 libglesv1-cm1 libgles2 libglesv2-2 libgbm"
+RCONFLICTS:${PN} = "libegl libgles1 libglesv1-cm1 libgles2 libglesv2-2 libgbm"
 # These libraries shouldn't get installed in world builds unless something
 # explicitly depends upon them.
 EXCLUDE_FROM_WORLD = "1"
-FILES_${PN} += "${libdir}/*"
+FILES:${PN} += "${libdir}/*"
-do_package_append() {
+do_package:append() {
    shlibswork_dir = d.getVar('SHLIBSWORKDIR')
    pkg_filename = d.getVar('PN') + ".list"
diff --git a/meta-xilinx-bsp/recipes-graphics/libglu/libglu_%.bbappend b/meta-xilinx-bsp/recipes-graphics/libglu/libglu_%.bbappend
index 9107114c..47cefc74 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}"
diff --git a/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali.bb b/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali.bb
index fdeeab3a..1e584241 100644
--- a/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali.bb
+++ b/meta-xilinx-bsp/recipes-graphics/mali/kernel-module-mali.bb
@@ -41,8 +41,8 @@ PARALLEL_MAKE = "-j 1"
 S = "${WORKDIR}/DX910-SW-99002-${PV}/driver/src/devicedrv/mali"
 COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE_zynqmp-eg = "zynqmp-eg"
+COMPATIBLE_MACHINE:zynqmp-eg = "zynqmp-eg"
-COMPATIBLE_MACHINE_zynqmp-ev = "zynqmp-ev"
+COMPATIBLE_MACHINE:zynqmp-ev = "zynqmp-ev"
 EXTRA_OEMAKE = 'KDIR="${STAGING_KERNEL_DIR}" \
                ARCH="${ARCH}" \
diff --git a/meta-xilinx-bsp/recipes-graphics/mesa/mesa-demos_%.bbappend b/meta-xilinx-bsp/recipes-graphics/mesa/mesa-demos_%.bbappend
index c9570332..af5dec9e 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)}"
diff --git a/meta-xilinx-bsp/recipes-graphics/mesa/mesa-gl_%.bbappend b/meta-xilinx-bsp/recipes-graphics/mesa/mesa-gl_%.bbappend
index bcfefa1e..a5a1eeb2 100644
--- a/meta-xilinx-bsp/recipes-graphics/mesa/mesa-gl_%.bbappend
+++ b/meta-xilinx-bsp/recipes-graphics/mesa/mesa-gl_%.bbappend
@@ -1,3 +1,3 @@
-do_install_append_zynqmp () {
+do_install:append:zynqmp () {
    rm -rf ${D}${includedir}/KHR/*
 }
diff --git a/meta-xilinx-bsp/recipes-graphics/wayland/weston-init%.bbappend b/meta-xilinx-bsp/recipes-graphics/wayland/weston-init%.bbappend
index aaee7f5d..ba570d44 100644
--- a/meta-xilinx-bsp/recipes-graphics/wayland/weston-init%.bbappend
+++ b/meta-xilinx-bsp/recipes-graphics/wayland/weston-init%.bbappend
@@ -1,7 +1,7 @@
-FILESEXTRAPATHS_prepend_zynqmp := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend:zynqmp := "${THISDIR}/files:"
-SRC_URI_append_zynqmp = " file://weston.ini"
+SRC_URI:append:zynqmp = " file://weston.ini"
-do_install_append_zynqmp() {
+do_install:append:zynqmp() {
    install -Dm 0700 ${WORKDIR}/weston.ini ${D}/${sysconfdir}/xdg/weston/weston.ini
 }
diff --git a/meta-xilinx-bsp/recipes-graphics/wayland/weston_%.bbappend b/meta-xilinx-bsp/recipes-graphics/wayland/weston_%.bbappend
index 19d8ac6c..26b3d389 100644
--- a/meta-xilinx-bsp/recipes-graphics/wayland/weston_%.bbappend
+++ b/meta-xilinx-bsp/recipes-graphics/wayland/weston_%.bbappend
@@ -1,9 +1,9 @@
-FILESEXTRAPATHS_prepend_zynqmp := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend:zynqmp := "${THISDIR}/files:"
-SRC_URI_append_zynqmp = " file://0001-libweston-Remove-substitute-format-for-ARGB8888.patch"
+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}"
@@ -11,4 +11,4 @@ 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)}"
-PACKAGE_ARCH_zynqmp = "${ZYNQMP_PKGARCH}"
+PACKAGE_ARCH:zynqmp = "${ZYNQMP_PKGARCH}"
diff --git a/meta-xilinx-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config_%.bbappend b/meta-xilinx-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config_%.bbappend
index 72d991c7..4fc41d05 100644
--- a/meta-xilinx-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config_%.bbappend
+++ b/meta-xilinx-bsp/recipes-graphics/xorg-xserver/xserver-xf86-config_%.bbappend
@@ -1 +1 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
diff --git a/meta-xilinx-bsp/recipes-kernel/dp/kernel-module-dp_git.bb b/meta-xilinx-bsp/recipes-kernel/dp/kernel-module-dp_git.bb
index 42daadf7..3bc136da 100755
--- a/meta-xilinx-bsp/recipes-kernel/dp/kernel-module-dp_git.bb
+++ b/meta-xilinx-bsp/recipes-kernel/dp/kernel-module-dp_git.bb
@@ -20,5 +20,5 @@ inherit module
 EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}"
 COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE_zynqmp = "zynqmp"
+COMPATIBLE_MACHINE:zynqmp = "zynqmp"
-COMPATIBLE_MACHINE_versal = "versal"
+COMPATIBLE_MACHINE:versal = "versal"
diff --git a/meta-xilinx-bsp/recipes-kernel/dtc/python3-dtc_1.6.0.bb b/meta-xilinx-bsp/recipes-kernel/dtc/python3-dtc_1.6.0.bb
index ed2652e3..f57b2b19 100644
--- a/meta-xilinx-bsp/recipes-kernel/dtc/python3-dtc_1.6.0.bb
+++ b/meta-xilinx-bsp/recipes-kernel/dtc/python3-dtc_1.6.0.bb
@@ -19,7 +19,7 @@ DEPENDS += "libyaml dtc"
 inherit distutils3
-do_configure_prepend() {
+do_configure:prepend() {
    (cd ${S}/../ ; make version_gen.h )
 }
diff --git a/meta-xilinx-bsp/recipes-kernel/hdmi/kernel-module-hdmi_git.bb b/meta-xilinx-bsp/recipes-kernel/hdmi/kernel-module-hdmi_git.bb
index 9c70fe7f..65484fca 100644
--- a/meta-xilinx-bsp/recipes-kernel/hdmi/kernel-module-hdmi_git.bb
+++ b/meta-xilinx-bsp/recipes-kernel/hdmi/kernel-module-hdmi_git.bb
@@ -20,5 +20,5 @@ inherit module
 EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}"
 COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE_zynqmp = "zynqmp"
+COMPATIBLE_MACHINE:zynqmp = "zynqmp"
-COMPATIBLE_MACHINE_versal = "versal"
+COMPATIBLE_MACHINE:versal = "versal"
diff --git a/meta-xilinx-bsp/recipes-kernel/linux-firmware/linux-firmware-ti-bt.bb b/meta-xilinx-bsp/recipes-kernel/linux-firmware/linux-firmware-ti-bt.bb
index c3adcf58..1ad8ae2e 100644
--- a/meta-xilinx-bsp/recipes-kernel/linux-firmware/linux-firmware-ti-bt.bb
+++ b/meta-xilinx-bsp/recipes-kernel/linux-firmware/linux-firmware-ti-bt.bb
@@ -53,13 +53,13 @@ do_install() {
 #  11.8.32   =   WL180x, WL183x, WL185x PG2.1 or PG2.2, 8.32 ROM Version
 PACKAGES =+ "${PN}-wl180x ${PN}-license"
-FILES_${PN}-license = "${nonarch_base_libdir}/firmware/License.ti-bt"
+FILES:${PN}-license = "${nonarch_base_libdir}/firmware/License.ti-bt"
-FILES_${PN}-wl180x = "${nonarch_base_libdir}/firmware/TIInit_11.8.32.bts \
+FILES:${PN}-wl180x = "${nonarch_base_libdir}/firmware/TIInit_11.8.32.bts \
                      ${nonarch_base_libdir}/firmware/ti-connectivity/TIInit_11.8.32.bts"
-RDEPENDS_${PN}-wl180x = "${PN}-license linux-firmware-wl18xx"
+RDEPENDS:${PN}-wl180x = "${PN}-license linux-firmware-wl18xx"
-LICENSE_${PN}-wl180x = "Firmware-ti-bt"
+LICENSE:${PN}-wl180x = "Firmware-ti-bt"
 INSANE_SKIP = "arch"
diff --git a/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx.inc b/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx.inc
index b4928fba..49f96865 100644
--- a/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx.inc
+++ b/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx.inc
@@ -7,7 +7,7 @@ PV = "${LINUX_VERSION}+git${SRCPV}"
 KBRANCH ?= "xlnx_rebase_v5.10"
 SRCBRANCHARG = "${@['nobranch=1', 'branch=${KBRANCH}'][d.getVar('KBRANCH', True) != '']}"
-FILESOVERRIDES_append = ":${XILINX_RELEASE_VERSION}"
+FILESOVERRIDES:append = ":${XILINX_RELEASE_VERSION}"
 KERNELURI ?= "git://github.com/Xilinx/linux-xlnx.git;protocol=https;name=machine"
 YOCTO_META ?= "git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=yocto-kmeta"
 SRC_URI = "${KERNELURI};${SRCBRANCHARG} ${YOCTO_META}"
@@ -25,11 +25,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 EXTKERNELSRC = "${@'1' if d.getVar('EXTERNALSRC') else ''}"
 # Force the use of the KBUILD_DEFCONFIG even if some other defconfig was generated in the ${WORKDIR}
-do_kernel_metadata_prepend () {
+do_kernel_metadata:prepend () {
        [ -n "${KBUILD_DEFCONFIG}" ] && [ -e ${WORKDIR}/defconfig ] && rm ${WORKDIR}/defconfig
 }
-do_configure_prepend () {
+do_configure:prepend () {
        if [ -n "${KBUILD_DEFCONFIG}" ] && [ -n "${EXTKERNELSRC}" ]; then
                cp ${S}/arch/${ARCH}/configs/${KBUILD_DEFCONFIG} ${WORKDIR}/defconfig
        fi
@@ -39,27 +39,27 @@ inherit kernel-simpleimage
 # Default to be only compatible with specific machines or soc families
 COMPATIBLE_MACHINE ?= "^$"
-COMPATIBLE_MACHINE_zynq = ".*"
+COMPATIBLE_MACHINE:zynq = ".*"
-COMPATIBLE_MACHINE_zynqmp = ".*"
+COMPATIBLE_MACHINE:zynqmp = ".*"
-COMPATIBLE_MACHINE_microblaze = ".*"
+COMPATIBLE_MACHINE:microblaze = ".*"
-COMPATIBLE_MACHINE_versal = ".*"
+COMPATIBLE_MACHINE:versal = ".*"
 # Use DEFCONFIGs for configuring linux-xlnx kernels
 KCONFIG_MODE ?= "alldefconfig"
-KBUILD_DEFCONFIG_zynqmp ?= "xilinx_defconfig"
+KBUILD_DEFCONFIG:zynqmp ?= "xilinx_defconfig"
-KBUILD_DEFCONFIG_zynq ?= "xilinx_zynq_defconfig"
+KBUILD_DEFCONFIG:zynq ?= "xilinx:zynq_defconfig"
-KBUILD_DEFCONFIG_microblaze ?= "mmu_defconfig"
+KBUILD_DEFCONFIG:microblaze ?= "mmu_defconfig"
-KBUILD_DEFCONFIG_versal ?= "xilinx_defconfig"
+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)}"
+KERNEL_FEATURES:append:zynqmp = "${@bb.utils.contains('DISTRO_FEATURES', 'xen', ' features/xen/xen.scc', '', d)}"
-KERNEL_FEATURES_append_zynqmp = "${@' features/xilinx/overlay_of/overlay_of.scc' if d.getVar('FPGA_MNGR_RECONFIG_ENABLE') == '1' else ''}"
+KERNEL_FEATURES:append:zynqmp = "${@' features/xilinx/overlay_of/overlay_of.scc' if d.getVar('FPGA_MNGR_RECONFIG_ENABLE') == '1' else ''}"
-KERNEL_FEATURES_append_versal = "${@bb.utils.contains('DISTRO_FEATURES', 'xen', ' features/xen/xen.scc', '', d)} features/xilinx/hdmi-module/hdmi-module.scc"
+KERNEL_FEATURES:append:versal = "${@bb.utils.contains('DISTRO_FEATURES', 'xen', ' features/xen/xen.scc', '', d)} features/xilinx/hdmi-module/hdmi-module.scc"
-KERNEL_FEATURES_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', ' features/ocicontainer/ocicontainer.scc', '', d)}"
+KERNEL_FEATURES:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', ' features/ocicontainer/ocicontainer.scc', '', d)}"
diff --git a/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx_2021.2.bb b/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx_2021.2.bb
index 24f7551e..79fde54f 100644
--- a/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx_2021.2.bb
+++ b/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx_2021.2.bb
@@ -6,4 +6,4 @@ KCONF_AUDIT_LEVEL="0"
 include linux-xlnx.inc
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
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 e99785d1..51eab948 100644
--- a/meta-xilinx-bsp/recipes-kernel/linux/linux-yocto-xilinx.inc
+++ b/meta-xilinx-bsp/recipes-kernel/linux/linux-yocto-xilinx.inc
@@ -1,23 +1,23 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/linux-xlnx:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/linux-xlnx:"
 require linux-microblaze.inc
 # Zynq default generic KMACHINE
-COMPATIBLE_MACHINE_zynq = "zynq"
+COMPATIBLE_MACHINE:zynq = "zynq"
-KMACHINE_zynq = "zynq"
+KMACHINE:zynq = "zynq"
 # ZynqMP default generic KMACHINE
-COMPATIBLE_MACHINE_zynqmp = "zynqmp"
+COMPATIBLE_MACHINE:zynqmp = "zynqmp"
-KMACHINE_zynqmp = "zynqmp"
+KMACHINE:zynqmp = "zynqmp"
 # MicroBlaze KMACHINEs
 KMACHINE_ml605-qemu-microblazeel = "qemumicroblazeel"
 KMACHINE_s3adsp1800-qemu-microblazeeb = "qemumicroblazeeb"
 # MicroBlaze default generic KMACHINE
-KMACHINE_microblaze = "microblaze"
+KMACHINE:microblaze = "microblaze"
-COMPATIBLE_MACHINE_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/lopper/lopper.bb b/meta-xilinx-bsp/recipes-kernel/lopper/lopper.bb
index 8ca7135e..fc8dc755 100644
--- a/meta-xilinx-bsp/recipes-kernel/lopper/lopper.bb
+++ b/meta-xilinx-bsp/recipes-kernel/lopper/lopper.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Tool to subset a system device tree"
 SECTION = "bootloader"
 LICENSE = "BSD-3-Clause"
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
    python3-core \
    dtc \
    python3-dtc \
diff --git a/meta-xilinx-bsp/recipes-kernel/lopper/xilinx-lops.bb b/meta-xilinx-bsp/recipes-kernel/lopper/xilinx-lops.bb
index cfa1bc87..77456376 100644
--- a/meta-xilinx-bsp/recipes-kernel/lopper/xilinx-lops.bb
+++ b/meta-xilinx-bsp/recipes-kernel/lopper/xilinx-lops.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Xilinx specific lop files"
 SECTION = "bootloader"
 LICENSE = "BSD-3-Clause"
-RDEPENDS_${PN} += "lopper"
+RDEPENDS:${PN} += "lopper"
 SRC_URI = " \
        file://lop-microblaze-yocto.dts \
@@ -23,5 +23,5 @@ do_install() {
        cp ${S}/lop-xilinx-id-cpus.dts   ${D}/${datadir}/lopper/lops/.
 }
-FILES_${PN} += "${datadir}/lopper/lops"
+FILES:${PN} += "${datadir}/lopper/lops"
 BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-xilinx-bsp/recipes-kernel/lopper/xilinx-lops/lop-microblaze-yocto.dts b/meta-xilinx-bsp/recipes-kernel/lopper/xilinx-lops/lop-microblaze-yocto.dts
index d710c10f..72eb4665 100644
--- a/meta-xilinx-bsp/recipes-kernel/lopper/xilinx-lops/lop-microblaze-yocto.dts
+++ b/meta-xilinx-bsp/recipes-kernel/lopper/xilinx-lops/lop-microblaze-yocto.dts
@@ -230,12 +230,12 @@
                                   tname = tname[0]+str(cpu_addr)
                                   cpu_addr += 1
                                   print( 'AVAILTUNES += \"microblaze-%s\"' % tname )
-                                   print( 'TUNE_FEATURES_tune-microblaze-%s = \"' % tname, end='' )
+                                   print( 'TUNE_FEATURES:tune-microblaze-%s = \"' % tname, end='' )
                                   for t in n.tunes.values():
                                       print( ' %s' % t, end='' )
                                   print( '\"' )
-                                   print( 'PACKAGE_EXTRA_ARCHS_tune-microblaze-%s = \"${TUNE_PKGARCH}\"' % tname )
+                                   print( 'PACKAGE_EXTRA_ARCHS:tune-microblaze-%s = \"${TUNE_PKGARCH}\"' % tname )
-                                   print( 'TUNE_FEATURES_tune-%s = \"${TUNE_FEATURES_tune-microblaze-%s}\"\\n' % (n.tune_type,tname) )
+                                   print( 'TUNE_FEATURES:tune-%s = \"${TUNE_FEATURES:tune-microblaze-%s}\"\\n' % (n.tune_type,tname) )
                               ";
                      };
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 c9570332..af5dec9e 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)}"
diff --git a/meta-xilinx-bsp/recipes-multimedia/vcu/kernel-module-vcu.bb b/meta-xilinx-bsp/recipes-multimedia/vcu/kernel-module-vcu.bb
index baac0ddb..f11a5a90 100644
--- a/meta-xilinx-bsp/recipes-multimedia/vcu/kernel-module-vcu.bb
+++ b/meta-xilinx-bsp/recipes-multimedia/vcu/kernel-module-vcu.bb
@@ -20,9 +20,9 @@ inherit module
 EXTRA_OEMAKE += "O=${STAGING_KERNEL_BUILDDIR}"
-RDEPENDS_${PN} = "vcu-firmware"
+RDEPENDS:${PN} = "vcu-firmware"
 COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE_zynqmp = "zynqmp"
+COMPATIBLE_MACHINE:zynqmp = "zynqmp"
 KERNEL_MODULE_AUTOLOAD += "dmaproxy"
diff --git a/meta-xilinx-bsp/recipes-multimedia/vcu/libomxil-xlnx.bb b/meta-xilinx-bsp/recipes-multimedia/vcu/libomxil-xlnx.bb
index d0d3285b..f86fc3ed 100644
--- a/meta-xilinx-bsp/recipes-multimedia/vcu/libomxil-xlnx.bb
+++ b/meta-xilinx-bsp/recipes-multimedia/vcu/libomxil-xlnx.bb
@@ -16,12 +16,12 @@ SRC_URI = "${REPO};${BRANCHARG}"
 S  = "${WORKDIR}/git"
 COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE_zynqmp = "zynqmp"
+COMPATIBLE_MACHINE:zynqmp = "zynqmp"
 PACKAGE_ARCH = "${SOC_FAMILY_ARCH}"
 DEPENDS = "libvcu-xlnx"
-RDEPENDS_${PN} = "kernel-module-vcu libvcu-xlnx"
+RDEPENDS:${PN} = "kernel-module-vcu libvcu-xlnx"
 EXTERNAL_INCLUDE="${STAGING_INCDIR}/vcu-ctrl-sw/include"
diff --git a/meta-xilinx-bsp/recipes-multimedia/vcu/libvcu-xlnx.bb b/meta-xilinx-bsp/recipes-multimedia/vcu/libvcu-xlnx.bb
index 8ddd24bc..ebc93d0d 100644
--- a/meta-xilinx-bsp/recipes-multimedia/vcu/libvcu-xlnx.bb
+++ b/meta-xilinx-bsp/recipes-multimedia/vcu/libvcu-xlnx.bb
@@ -16,11 +16,11 @@ SRC_URI = "${REPO};${BRANCHARG}"
 S  = "${WORKDIR}/git"
 COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE_zynqmp = "zynqmp"
+COMPATIBLE_MACHINE:zynqmp = "zynqmp"
 PACKAGE_ARCH = "${SOC_FAMILY_ARCH}"
-RDEPENDS_${PN} = "kernel-module-vcu"
+RDEPENDS:${PN} = "kernel-module-vcu"
 EXTRA_OEMAKE = "CC='${CC}' CXX='${CXX} ${CXXFLAGS}'"
diff --git a/meta-xilinx-bsp/recipes-multimedia/vcu/vcu-firmware.bb b/meta-xilinx-bsp/recipes-multimedia/vcu/vcu-firmware.bb
index e9d4fdaa..25490aec 100644
--- a/meta-xilinx-bsp/recipes-multimedia/vcu/vcu-firmware.bb
+++ b/meta-xilinx-bsp/recipes-multimedia/vcu/vcu-firmware.bb
@@ -16,7 +16,7 @@ BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '
 SRC_URI   = "${REPO};${BRANCHARG}"
 COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE_zynqmp = "zynqmp"
+COMPATIBLE_MACHINE:zynqmp = "zynqmp"
 PACKAGE_ARCH = "${SOC_FAMILY_ARCH}"
@@ -30,10 +30,10 @@ do_install() {
 # Inhibit warnings about files being stripped
 INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
 INHIBIT_PACKAGE_STRIP = "1"
-FILES_${PN} = "/lib/firmware/*"
+FILES:${PN} = "/lib/firmware/*"
 # These libraries shouldn't get installed in world builds unless something
 # explicitly depends upon them.
 EXCLUDE_FROM_WORLD = "1"
-INSANE_SKIP_${PN} = "ldflags"
+INSANE_SKIP:${PN} = "ldflags"
diff --git a/meta-xilinx-bsp/recipes-support/libgpg-error/libgpg-error_%.bbappend b/meta-xilinx-bsp/recipes-support/libgpg-error/libgpg-error_%.bbappend
index 7a4d1142..f3e920c2 100644
--- a/meta-xilinx-bsp/recipes-support/libgpg-error/libgpg-error_%.bbappend
+++ b/meta-xilinx-bsp/recipes-support/libgpg-error/libgpg-error_%.bbappend
@@ -1,8 +1,8 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
-SRC_URI_append_microblaze = " file://lock-obj-pub.microblazeel-unknown-linux-gnu.h"
+SRC_URI:append:microblaze = " file://lock-obj-pub.microblazeel-unknown-linux-gnu.h"
-do_configure_append_microblaze () {
+do_configure:append:microblaze () {
        cp ${WORKDIR}/lock-obj-pub.microblazeel-unknown-linux-gnu.h ${S}/src/syscfg/
 }
diff --git a/meta-xilinx-bsp/recipes-xrt/xrt/xrt_git.bb b/meta-xilinx-bsp/recipes-xrt/xrt/xrt_git.bb
index dcf3a36d..f73d3d2b 100644
--- a/meta-xilinx-bsp/recipes-xrt/xrt/xrt_git.bb
+++ b/meta-xilinx-bsp/recipes-xrt/xrt/xrt_git.bb
@@ -19,27 +19,27 @@ BBCLASSEXTEND = "native nativesdk"
 # util-linux is for libuuid-dev.
 DEPENDS = "libdrm opencl-headers ocl-icd opencl-clhpp boost util-linux git-replacement-native protobuf-native protobuf elfutils libffi"
-RDEPENDS_${PN} = "bash ocl-icd boost-system boost-filesystem zocl"
+RDEPENDS:${PN} = "bash ocl-icd boost-system boost-filesystem zocl"
 EXTRA_OECMAKE += " \
                -DCMAKE_BUILD_TYPE=Release \
                -DCMAKE_EXPORT_COMPILE_COMANDS=ON \
                "
-PACKAGE_ARCH_versal-ai-core = "${SOC_VARIANT_ARCH}"
+PACKAGE_ARCH:versal-ai-core = "${SOC_VARIANT_ARCH}"
-EXTRA_OECMAKE_append_versal-ai-core += "-DXRT_AIE_BUILD=true"
+EXTRA_OECMAKE:append:versal-ai-core += "-DXRT_AIE_BUILD=true"
-TARGET_CXXFLAGS_append_versal-ai-core += "-DXRT_ENABLE_AIE"
+TARGET_CXXFLAGS:append:versal-ai-core += "-DXRT_ENABLE_AIE"
-DEPENDS_append_versal-ai-core += " libmetal libxaiengine aiefal"
+DEPENDS:append:versal-ai-core += " libmetal libxaiengine aiefal"
-RDEPENDS_${PN}_append_versal-ai-core += " libxaiengine aiefal"
+RDEPENDS:${PN}:append:versal-ai-core += " libxaiengine aiefal"
 FILES_SOLIBSDEV = ""
-FILES_${PN} += "\
+FILES:${PN} += "\
    ${libdir}/lib*.so \
    ${libdir}/lib*.so.* \
    /lib/*.so* "
-INSANE_SKIP_${PN} += "dev-so"
+INSANE_SKIP:${PN} += "dev-so"
-pkg_postinst_ontarget_${PN}() {
+pkg_postinst_ontarget:${PN}() {
  #!/bin/sh
  if [ ! -e /etc/OpenCL/vendors/xilinx.icd ]; then
        echo "INFO: Creating ICD entry for Xilinx Platform"
diff --git a/meta-xilinx-bsp/recipes-xrt/zocl/zocl_git.bb b/meta-xilinx-bsp/recipes-xrt/zocl/zocl_git.bb
index 194a51cb..40578aa2 100644
--- a/meta-xilinx-bsp/recipes-xrt/zocl/zocl_git.bb
+++ b/meta-xilinx-bsp/recipes-xrt/zocl/zocl_git.bb
@@ -11,7 +11,7 @@ S = "${WORKDIR}/git/src/runtime_src/core/edge/drm/zocl"
 inherit module
-pkg_postinst_ontarget_${PN}() {
+pkg_postinst_ontarget:${PN}() {
  #!/bin/sh
  echo "Unloading old XRT Linux kernel modules"
  ( rmmod zocl || true ) > /dev/null 2>&1
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 d9535da0..330548a8 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:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 # device tree sources for MiniZed
 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-bsp/reference-design/zybo-linux-bd.bb b/meta-xilinx-contrib/recipes-bsp/reference-design/zybo-linux-bd.bb
index be68918c..4439f7f9 100644
--- a/meta-xilinx-contrib/recipes-bsp/reference-design/zybo-linux-bd.bb
+++ b/meta-xilinx-contrib/recipes-bsp/reference-design/zybo-linux-bd.bb
@@ -26,9 +26,9 @@ S ?= "${WORKDIR}/${MACHINE}"
 PROVIDES = "virtual/bitstream virtual/xilinx-platform-init"
-FILES_${PN}-platform-init += "${PLATFORM_INIT_DIR}/*"
+FILES:${PN}-platform-init += "${PLATFORM_INIT_DIR}/*"
-FILES_${PN}-bitstream += " \
+FILES:${PN}-bitstream += " \
                download.bit \
                "
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 b34eea34..b205d00d 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,23 +19,23 @@ 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 \
 "
-LICENSE_${PN}-bcm43430a1-hcd = "Firmware-cypress"
+LICENSE:${PN}-bcm43430a1-hcd = "Firmware-cypress"
-FILES_${PN}-bcm43430a1-hcd = " \
+FILES:${PN}-bcm43430a1-hcd = " \
  ${nonarch_base_libdir}/firmware/brcm/BCM43430A1.1DX.hcd \
 "
-RDEPENDS_${PN}-bcm43430a1-hcd += "${PN}-cypress-license"
+RDEPENDS:${PN}-bcm43430a1-hcd += "${PN}-cypress-license"
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 535fbb26..6cba54df 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:"
+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-pynq/classes/xilinx-pynq.bbclass b/meta-xilinx-pynq/classes/xilinx-pynq.bbclass
index a183a78e..9110037a 100644
--- a/meta-xilinx-pynq/classes/xilinx-pynq.bbclass
+++ b/meta-xilinx-pynq/classes/xilinx-pynq.bbclass
@@ -1,36 +1,36 @@
 PYNQ_NOTEBOOK_DIR ?= "${datadir}/notebooks"
-PYNQ_ARCH_arm = "armv7l"
+PYNQ_ARCH:arm = "armv7l"
-PYNQ_ARCH_aarch64 = "aarch64"
+PYNQ_ARCH:aarch64 = "aarch64"
 PYNQ_BUILD_ARCH="${PYNQ_ARCH_${TARGET_ARCH}}"
 PYNQ_BUILD_ROOT="${STAGING_DIR_TARGET}"
 BBCLASSEXTEND = "native nativesdk"
 PACKAGES += " ${PN}-notebooks"
-FILES_${PN}-notebooks += "${PYNQ_NOTEBOOK_DIR}"
+FILES:${PN}-notebooks += "${PYNQ_NOTEBOOK_DIR}"
-INSANE_SKIP_${PN} += "staticdev dev-so"
+INSANE_SKIP:${PN} += "staticdev dev-so"
 inherit python3-dir
 # Used for setup.py on PYNQ
 BOARD_NAME_ultra96 = "Ultra96"
 BOARD_NAME_zcu104-zynqmp = "ZCU104"
-do_compile_prepend() {
+do_compile:prepend() {
  export BOARD=${BOARD_NAME}
  export PYNQ_BUILD_ARCH=${PYNQ_BUILD_ARCH}
  export PYNQ_JUPYTER_NOTEBOOKS=${D}${PYNQ_NOTEBOOK_DIR}
 }
-do_install_prepend() {
+do_install:prepend() {
  export BOARD=${BOARD_NAME}
  export PYNQ_BUILD_ARCH=${PYNQ_BUILD_ARCH}
  export PYNQ_JUPYTER_NOTEBOOKS=${D}${PYNQ_NOTEBOOK_DIR}
  install -d ${PYNQ_JUPYTER_NOTEBOOKS}
 }
-do_configure_prepend() {
+do_configure:prepend() {
  export BOARD=${BOARD_NAME}
  export PYNQ_BUILD_ARCH=${PYNQ_BUILD_ARCH}
  export PYNQ_JUPYTER_NOTEBOOKS=${D}${PYNQ_NOTEBOOK_DIR}
diff --git a/meta-xilinx-pynq/recipes-devtool/python/python-pynq.inc b/meta-xilinx-pynq/recipes-devtool/python/python-pynq.inc
index 9aa55764..b35b98be 100644
--- a/meta-xilinx-pynq/recipes-devtool/python/python-pynq.inc
+++ b/meta-xilinx-pynq/recipes-devtool/python/python-pynq.inc
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b42e39ad2ddbad7e8ad47f3eee6feff5"
 SRC_URI[md5sum] = "9950894100c20293e921090b76ca9f17"
 SRC_URI[sha256sum] = "4f719e2753093d1e79931755c624d160cf342c03af49e027d09abe75bdc8e8c5"
-RDEPENDS_${PN} += "\
+RDEPENDS:${PN} += "\
        ${PYTHON_PN}-core \
        ${PYTHON_PN}-asyncio \
        ${PYTHON_PN}-cffi \
@@ -37,8 +37,8 @@ SRC_URI += " \
        file://0003-Use-sysroot-for-Displayport-library.patch \
 "
-FILESEXTRAPATHS_prepend := "${THISDIR}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}:"
-do_install_append() {
+do_install:append() {
        rm -rf ${D}${PYNQ_NOTEBOOK_DIR}_*
 }
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 9d9a2b38..bd28e702 100644
--- a/meta-xilinx-pynq/recipes-support/libcma/libcma_1.0.bb
+++ b/meta-xilinx-pynq/recipes-support/libcma/libcma_1.0.bb
@@ -2,8 +2,8 @@ SUMMARY = "Recompile libcma against pynqlib c"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=b42e39ad2ddbad7e8ad47f3eee6feff5"
-CMA_ARCH_arm = "32"
+CMA_ARCH:arm = "32"
-CMA_ARCH_aarch64 = "64"
+CMA_ARCH:aarch64 = "64"
 PYNQBRANCH ?= "image_v2.4"
 SRCBRANCHARG = "${@['nobranch=1', 'branch=${PYNQBRANCH}'][d.getVar('PYNQBRANCH', True) != '']}"
@@ -15,8 +15,8 @@ SRCREV ?= "3d659d374701b7c34fa702e7aa23f71f9113f826"
 S="${WORKDIR}/git"
-CMA_ARCH_arm = "32"
+CMA_ARCH:arm = "32"
-CMA_ARCH_aarch64 = "64"
+CMA_ARCH:aarch64 = "64"
 do_install() {
@@ -29,5 +29,5 @@ do_install() {
 SOLIBS = ".so"
 FILES_SOLIBSDEV = ""
-FILES_${PN} += "/usr/lib/libcma.so /usr/include"
+FILES:${PN} += "/usr/lib/libcma.so /usr/include"
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 8f71d9ae..467414ed 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 ??= "pynq:zynqmp.dtsi"
-PYNQ_DTSI_zynqmp ?= "pynq_zynqmp.dtsi"
+PYNQ_DTSI:zynqmp ?= "pynq:zynqmp.dtsi"
-PYNQ_DTSI_zynq ?= "pynq_zynq.dtsi"
+PYNQ_DTSI:zynq ?= "pynq:zynq.dtsi"
-PYNQ_SYMBOL_DTSI_zynqmp ?= "pynq_zynqmp_symbols.dtsi"
+PYNQ_SYMBOL_DTSI:zynqmp ?= "pynq:zynqmp_symbols.dtsi"
-PYNQ_SYMBOL_DTSI_zynq ?= "pynq_zynq_symbols.dtsi"
+PYNQ_SYMBOL_DTSI:zynq ?= "pynq:zynq_symbols.dtsi"
 PYNQ_DTBO ?= "pynq.dtbo"
 PYNQ_SYMBOL_DTBO ?= "pynq-symbols.dtbo"
@@ -51,4 +51,4 @@ do_install() {
 }
-FILES_${PN} += "/lib/firmware/pynq.dtbo /lib/firmware/pynq-symbols.dtbo ${sysconfdir}/modprobe.d/generic-uio.conf"
+FILES:${PN} += "/lib/firmware/pynq.dtbo /lib/firmware/pynq-symbols.dtbo ${sysconfdir}/modprobe.d/generic-uio.conf"
diff --git a/meta-xilinx-pynq/recipes-support/pynq-ultra96-bnn/pynq-ultra96-bnn_1.0.bb b/meta-xilinx-pynq/recipes-support/pynq-ultra96-bnn/pynq-ultra96-bnn_1.0.bb
index c20ac5d6..a736d963 100644
--- a/meta-xilinx-pynq/recipes-support/pynq-ultra96-bnn/pynq-ultra96-bnn_1.0.bb
+++ b/meta-xilinx-pynq/recipes-support/pynq-ultra96-bnn/pynq-ultra96-bnn_1.0.bb
@@ -13,7 +13,7 @@ SRCREV = "32eed91994228d1042a16c692047dfe81e47d498"
 inherit xilinx-pynq
-RDEPENDS_${PN}-notebooks += "\
+RDEPENDS:${PN}-notebooks += "\
    python3-pynq \
    python3-pillow \
    libstdc++ \
diff --git a/meta-xilinx-pynq/recipes-support/pynq-ultra96-helloworld/pynq-ultra96-helloworld_1.0.bb b/meta-xilinx-pynq/recipes-support/pynq-ultra96-helloworld/pynq-ultra96-helloworld_1.0.bb
index d1aabb7d..7ed5f8a2 100644
--- a/meta-xilinx-pynq/recipes-support/pynq-ultra96-helloworld/pynq-ultra96-helloworld_1.0.bb
+++ b/meta-xilinx-pynq/recipes-support/pynq-ultra96-helloworld/pynq-ultra96-helloworld_1.0.bb
@@ -3,7 +3,7 @@ LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=f9990fcc34ccf1f82ccf1bc5a1cc3bfc"
-RDEPENDS_${PN} += "\
+RDEPENDS:${PN} += "\
        python3-pynq \
        python3-pillow \
        libstdc++ \
diff --git a/meta-xilinx-standalone-experimental/classes/esw.bbclass b/meta-xilinx-standalone-experimental/classes/esw.bbclass
index 0d6e78a6..f95dc692 100644
--- a/meta-xilinx-standalone-experimental/classes/esw.bbclass
+++ b/meta-xilinx-standalone-experimental/classes/esw.bbclass
@@ -10,9 +10,9 @@ B = "${WORKDIR}/build"
 OECMAKE_SOURCEPATH = "${S}/${ESW_COMPONENT_SRC}"
 LICFILENAME = "license.txt"
-SPECFILE_PATH_arm = "${S}/scripts/specs/arm/Xilinx.spec"
+SPECFILE_PATH:arm = "${S}/scripts/specs/arm/Xilinx.spec"
-SPECFILE_PATH_aarch64 = "${S}/scripts/specs/arm/Xilinx.spec"
+SPECFILE_PATH:aarch64 = "${S}/scripts/specs/arm/Xilinx.spec"
-SPECFILE_PATH_microblaze = "${S}/scripts/specs/microblaze/Xilinx.spec"
+SPECFILE_PATH:microblaze = "${S}/scripts/specs/microblaze/Xilinx.spec"
 ESW_MACHINE ?= "${MACHINE}"
@@ -21,7 +21,7 @@ ESW_CFLAGS += "-specs=${SPECFILE_PATH}"
 inherit ccmake
 COMPATIBLE_HOST = ".*-elf"
-COMPATIBLE_HOST_arm = "[^-]*-[^-]*-eabi"
+COMPATIBLE_HOST:arm = "[^-]*-[^-]*-eabi"
 DTS_FILE = "${DEPLOY_DIR_IMAGE}/devicetree/${@os.path.basename(d.getVar('CONFIG_DTFILE'))}"
@@ -46,9 +46,9 @@ def get_xlnx_cmake_processor(tune, machine, d):
    cmake_processor = tune
    if tune.startswith('microblaze'):
        if (machine == 'microblaze-pmu'):
-            cmake_processor = 'pmu_microblaze'
+            cmake_processor = 'pmu:microblaze'
        elif (machine == 'microblaze-plm'):
-            cmake_processor = 'plm_microblaze'
+            cmake_processor = 'plm:microblaze'
        else:
            cmake_processor = 'microblaze'
    elif (tune in [ 'cortexr5', 'cortexr5f' ]):
@@ -85,7 +85,7 @@ do_install() {
    install -m 0644  ${B}/include/*.h ${D}${includedir}
 }
-CFLAGS_append = " ${ESW_CFLAGS}"
+CFLAGS:append = " ${ESW_CFLAGS}"
 # We need to find the license file, which vaires depending on the component
 # recurse a maximum of x times, could be fancier but it gets complicated since
diff --git a/meta-xilinx-standalone-experimental/classes/esw_examples.bbclass b/meta-xilinx-standalone-experimental/classes/esw_examples.bbclass
index 58946b7c..ea93f715 100644
--- a/meta-xilinx-standalone-experimental/classes/esw_examples.bbclass
+++ b/meta-xilinx-standalone-experimental/classes/esw_examples.bbclass
@@ -2,7 +2,7 @@ inherit esw deploy python3native
 DEPENDS += "python3-dtc-native python3-pyyaml-native xilstandalone libxil xiltimer"
-do_configure_prepend() {
+do_configure:prepend() {
    cd ${S}
    lopper.py ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
    install -m 0755 memory.ld ${S}/${ESW_COMPONENT_SRC}/
@@ -31,4 +31,4 @@ do_deploy() {
 }
 addtask deploy before do_build after do_package
-FILES_${PN} = "${base_libdir}/firmware/*.elf"
+FILES:${PN} = "${base_libdir}/firmware/*.elf"
diff --git a/meta-xilinx-standalone-experimental/conf/distro/xilinx-freertos.conf b/meta-xilinx-standalone-experimental/conf/distro/xilinx-freertos.conf
index cba5fd90..84638022 100644
--- a/meta-xilinx-standalone-experimental/conf/distro/xilinx-freertos.conf
+++ b/meta-xilinx-standalone-experimental/conf/distro/xilinx-freertos.conf
@@ -1,6 +1,6 @@
 require conf/distro/xilinx-standalone.inc
-DISTRO_NAME_append = " (freertos)"
+DISTRO_NAME:append = " (freertos)"
 XLNX_CMAKE_SYSTEM_NAME = "FreeRTOS"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/empty-application/empty-application_git.bb b/meta-xilinx-standalone-experimental/recipes-applications/empty-application/empty-application_git.bb
index 5faa1d34..653ae51a 100644
--- a/meta-xilinx-standalone-experimental/recipes-applications/empty-application/empty-application_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-applications/empty-application/empty-application_git.bb
@@ -6,7 +6,7 @@ DEPENDS += "libxil xiltimer"
 inherit python3native
-do_configure_prepend() {
+do_configure:prepend() {
    cd ${S}
    lopper.py ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
    install -m 0755 memory.ld ${S}/${ESW_COMPONENT_SRC}/
@@ -25,7 +25,7 @@ CUSTOM_APP_BASE_NAME ?= "${CUSTOM_APP_IMAGE_NAME}-${PKGE}-${PKGV}-${PKGR}-${MACH
 ESW_COMPONENT ??= "executable.elf"
-do_compile_append() {
+do_compile:append() {
    ${OBJCOPY} -O binary ${B}/${ESW_COMPONENT} ${B}/executable.bin
 }
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/freertos-hello-world/freertos-hello-world_git.bb b/meta-xilinx-standalone-experimental/recipes-applications/freertos-hello-world/freertos-hello-world_git.bb
index 77417c0a..9bf220fe 100644
--- a/meta-xilinx-standalone-experimental/recipes-applications/freertos-hello-world/freertos-hello-world_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-applications/freertos-hello-world/freertos-hello-world_git.bb
@@ -4,7 +4,7 @@ ESW_COMPONENT_SRC = "/lib/sw_apps/freertos_hello_world/src/"
 DEPENDS += "libxil xilstandalone freertos10-xilinx xiltimer"
-do_configure_prepend() {
+do_configure:prepend() {
    cd ${S}
    lopper.py ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
    install -m 0755 memory.ld ${S}/${ESW_COMPONENT_SRC}/
@@ -33,4 +33,4 @@ do_deploy() {
 addtask deploy before do_build after do_package
-FILES_${PN} = "${base_libdir}/firmware/freertos_hello_world*"
+FILES:${PN} = "${base_libdir}/firmware/freertos_hello_world*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-echo-server/freertos-lwip-echo-server_git.bb b/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-echo-server/freertos-lwip-echo-server_git.bb
index 1783316c..ae6d8342 100644
--- a/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-echo-server/freertos-lwip-echo-server_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-echo-server/freertos-lwip-echo-server_git.bb
@@ -4,7 +4,7 @@ ESW_COMPONENT_SRC = "/lib/sw_apps/freertos_lwip_echo_server/src/"
 DEPENDS += "libxil lwip xiltimer freertos10-xilinx"
-do_configure_prepend() {
+do_configure:prepend() {
    cd ${S}
    lopper.py ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
    install -m 0755 memory.ld ${S}/${ESW_COMPONENT_SRC}/
@@ -42,4 +42,4 @@ do_deploy() {
 addtask deploy before do_build after do_package
-FILES_${PN} = "${base_libdir}/firmware/freertos_lwip_echo*"
+FILES:${PN} = "${base_libdir}/firmware/freertos_lwip_echo*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-tcp-perf-client/freertos-lwip-tcp-perf-client_git.bb b/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-tcp-perf-client/freertos-lwip-tcp-perf-client_git.bb
index 3337870d..2380eaef 100644
--- a/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-tcp-perf-client/freertos-lwip-tcp-perf-client_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-tcp-perf-client/freertos-lwip-tcp-perf-client_git.bb
@@ -4,7 +4,7 @@ ESW_COMPONENT_SRC = "/lib/sw_apps/freertos_lwip_tcp_perf_client/src/"
 DEPENDS += "libxil lwip xiltimer freertos10-xilinx"
-do_configure_prepend() {
+do_configure:prepend() {
    cd ${S}
    lopper.py ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
    install -m 0755 memory.ld ${S}/${ESW_COMPONENT_SRC}/
@@ -42,4 +42,4 @@ do_deploy() {
 addtask deploy before do_build after do_package
-FILES_${PN} = "${base_libdir}/firmware/freertos_lwip_tcp_perf_client*"
+FILES:${PN} = "${base_libdir}/firmware/freertos_lwip_tcp_perf_client*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-tcp-perf-server/freertos-lwip-tcp-perf-server_git.bb b/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-tcp-perf-server/freertos-lwip-tcp-perf-server_git.bb
index ad0281e5..6a156c2d 100644
--- a/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-tcp-perf-server/freertos-lwip-tcp-perf-server_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-tcp-perf-server/freertos-lwip-tcp-perf-server_git.bb
@@ -4,7 +4,7 @@ ESW_COMPONENT_SRC = "/lib/sw_apps/freertos_lwip_tcp_perf_server/src/"
 DEPENDS += "libxil lwip xiltimer freertos10-xilinx"
-do_configure_prepend() {
+do_configure:prepend() {
    cd ${S}
    lopper.py ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
    install -m 0755 memory.ld ${S}/${ESW_COMPONENT_SRC}/
@@ -42,4 +42,4 @@ do_deploy() {
 addtask deploy before do_build after do_package
-FILES_${PN} = "${base_libdir}/firmware/freertos_lwip_tcp_perf_server*"
+FILES:${PN} = "${base_libdir}/firmware/freertos_lwip_tcp_perf_server*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-udp-perf-client/freertos-lwip-udp-perf-client_git.bb b/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-udp-perf-client/freertos-lwip-udp-perf-client_git.bb
index 75c81c11..bd532abf 100644
--- a/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-udp-perf-client/freertos-lwip-udp-perf-client_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-udp-perf-client/freertos-lwip-udp-perf-client_git.bb
@@ -4,7 +4,7 @@ ESW_COMPONENT_SRC = "/lib/sw_apps/freertos_lwip_udp_perf_client/src/"
 DEPENDS += "libxil lwip xiltimer freertos10-xilinx"
-do_configure_prepend() {
+do_configure:prepend() {
    cd ${S}
    lopper.py ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
    install -m 0755 memory.ld ${S}/${ESW_COMPONENT_SRC}/
@@ -42,4 +42,4 @@ do_deploy() {
 addtask deploy before do_build after do_package
-FILES_${PN} = "${base_libdir}/firmware/freertos_lwip_udp_perf_client*"
+FILES:${PN} = "${base_libdir}/firmware/freertos_lwip_udp_perf_client*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-udp-perf-server/freertos-lwip-udp-perf-server_git.bb b/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-udp-perf-server/freertos-lwip-udp-perf-server_git.bb
index d29aaa1b..83577806 100644
--- a/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-udp-perf-server/freertos-lwip-udp-perf-server_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-applications/freertos-lwip-udp-perf-server/freertos-lwip-udp-perf-server_git.bb
@@ -4,7 +4,7 @@ ESW_COMPONENT_SRC = "/lib/sw_apps/freertos_lwip_udp_perf_server/src/"
 DEPENDS += "libxil lwip xiltimer freertos10-xilinx"
-do_configure_prepend() {
+do_configure:prepend() {
    cd ${S}
    lopper.py ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
    install -m 0755 memory.ld ${S}/${ESW_COMPONENT_SRC}/
@@ -42,4 +42,4 @@ do_deploy() {
 addtask deploy before do_build after do_package
-FILES_${PN} = "${base_libdir}/firmware/freertos_lwip_udp_perf_server*"
+FILES:${PN} = "${base_libdir}/firmware/freertos_lwip_udp_perf_server*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/hello-world/hello-world_git.bb b/meta-xilinx-standalone-experimental/recipes-applications/hello-world/hello-world_git.bb
index e8799a37..8d14acf2 100644
--- a/meta-xilinx-standalone-experimental/recipes-applications/hello-world/hello-world_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-applications/hello-world/hello-world_git.bb
@@ -6,7 +6,7 @@ DEPENDS += "libxil xiltimer"
 inherit python3native
-do_configure_prepend() {
+do_configure:prepend() {
    cd ${S}
    lopper.py ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
    install -m 0755 memory.ld ${S}/${ESW_COMPONENT_SRC}/
@@ -38,4 +38,4 @@ do_deploy() {
 addtask deploy before do_build after do_package
-FILES_${PN} = "${base_libdir}/firmware/hello_world*"
+FILES:${PN} = "${base_libdir}/firmware/hello_world*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/lwip-echo-server/lwip-echo-server_git.bb b/meta-xilinx-standalone-experimental/recipes-applications/lwip-echo-server/lwip-echo-server_git.bb
index cc68de67..1aef0d73 100644
--- a/meta-xilinx-standalone-experimental/recipes-applications/lwip-echo-server/lwip-echo-server_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-applications/lwip-echo-server/lwip-echo-server_git.bb
@@ -4,7 +4,7 @@ ESW_COMPONENT_SRC = "/lib/sw_apps/lwip_echo_server/src/"
 DEPENDS += "libxil lwip xiltimer"
-do_configure_prepend() {
+do_configure:prepend() {
    cd ${S}
    lopper.py ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
    install -m 0755 memory.ld ${S}/${ESW_COMPONENT_SRC}/
@@ -42,4 +42,4 @@ do_deploy() {
 addtask deploy before do_build after do_package
-FILES_${PN} = "${base_libdir}/firmware/lwip_echo*"
+FILES:${PN} = "${base_libdir}/firmware/lwip_echo*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/lwip-tcp-perf-client/lwip-tcp-perf-client_git.bb b/meta-xilinx-standalone-experimental/recipes-applications/lwip-tcp-perf-client/lwip-tcp-perf-client_git.bb
index b65f6801..5db0c218 100644
--- a/meta-xilinx-standalone-experimental/recipes-applications/lwip-tcp-perf-client/lwip-tcp-perf-client_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-applications/lwip-tcp-perf-client/lwip-tcp-perf-client_git.bb
@@ -4,7 +4,7 @@ ESW_COMPONENT_SRC = "/lib/sw_apps/lwip_tcp_perf_client/src/"
 DEPENDS += "libxil lwip xiltimer"
-do_configure_prepend() {
+do_configure:prepend() {
    cd ${S}
    lopper.py ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
    install -m 0755 memory.ld ${S}/${ESW_COMPONENT_SRC}/
@@ -42,4 +42,4 @@ do_deploy() {
 addtask deploy before do_build after do_package
-FILES_${PN} = "${base_libdir}/firmware/lwip_tcp_perf_client*"
+FILES:${PN} = "${base_libdir}/firmware/lwip_tcp_perf_client*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/lwip-tcp-perf-server/lwip-tcp-perf-server_git.bb b/meta-xilinx-standalone-experimental/recipes-applications/lwip-tcp-perf-server/lwip-tcp-perf-server_git.bb
index ea0020e0..211d9e55 100644
--- a/meta-xilinx-standalone-experimental/recipes-applications/lwip-tcp-perf-server/lwip-tcp-perf-server_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-applications/lwip-tcp-perf-server/lwip-tcp-perf-server_git.bb
@@ -4,7 +4,7 @@ ESW_COMPONENT_SRC = "/lib/sw_apps/lwip_tcp_perf_server/src/"
 DEPENDS += "libxil lwip xiltimer"
-do_configure_prepend() {
+do_configure:prepend() {
    cd ${S}
    lopper.py ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
    install -m 0755 memory.ld ${S}/${ESW_COMPONENT_SRC}/
@@ -42,4 +42,4 @@ do_deploy() {
 addtask deploy before do_build after do_package
-FILES_${PN} = "${base_libdir}/firmware/lwip_tcp_perf_server*"
+FILES:${PN} = "${base_libdir}/firmware/lwip_tcp_perf_server*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/lwip-udp-perf-client/lwip-udp-perf-client_git.bb b/meta-xilinx-standalone-experimental/recipes-applications/lwip-udp-perf-client/lwip-udp-perf-client_git.bb
index bdd7556b..42aa07fe 100644
--- a/meta-xilinx-standalone-experimental/recipes-applications/lwip-udp-perf-client/lwip-udp-perf-client_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-applications/lwip-udp-perf-client/lwip-udp-perf-client_git.bb
@@ -4,7 +4,7 @@ ESW_COMPONENT_SRC = "/lib/sw_apps/lwip_udp_perf_client/src/"
 DEPENDS += "libxil lwip xiltimer"
-do_configure_prepend() {
+do_configure:prepend() {
    cd ${S}
    lopper.py ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
    install -m 0755 memory.ld ${S}/${ESW_COMPONENT_SRC}/
@@ -42,4 +42,4 @@ do_deploy() {
 addtask deploy before do_build after do_package
-FILES_${PN} = "${base_libdir}/firmware/lwip_udp_perf_client*"
+FILES:${PN} = "${base_libdir}/firmware/lwip_udp_perf_client*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/lwip-udp-perf-server/lwip-udp-perf-server_git.bb b/meta-xilinx-standalone-experimental/recipes-applications/lwip-udp-perf-server/lwip-udp-perf-server_git.bb
index c25e02ad..b78499fe 100644
--- a/meta-xilinx-standalone-experimental/recipes-applications/lwip-udp-perf-server/lwip-udp-perf-server_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-applications/lwip-udp-perf-server/lwip-udp-perf-server_git.bb
@@ -4,7 +4,7 @@ ESW_COMPONENT_SRC = "/lib/sw_apps/lwip_udp_perf_server/src/"
 DEPENDS += "libxil lwip xiltimer"
-do_configure_prepend() {
+do_configure:prepend() {
    cd ${S}
    lopper.py ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
    install -m 0755 memory.ld ${S}/${ESW_COMPONENT_SRC}/
@@ -42,4 +42,4 @@ do_deploy() {
 addtask deploy before do_build after do_package
-FILES_${PN} = "${base_libdir}/firmware/lwip_udp_perf_server*"
+FILES:${PN} = "${base_libdir}/firmware/lwip_udp_perf_server*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/memory-tests/memory-tests_git.bb b/meta-xilinx-standalone-experimental/recipes-applications/memory-tests/memory-tests_git.bb
index 8a06c9ff..1bca8dc5 100644
--- a/meta-xilinx-standalone-experimental/recipes-applications/memory-tests/memory-tests_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-applications/memory-tests/memory-tests_git.bb
@@ -6,7 +6,7 @@ DEPENDS += "libxil xiltimer"
 inherit python3native
-do_configure_prepend() {
+do_configure:prepend() {
    cd ${S}
    lopper.py ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} memtest
    install -m 0755 memory.ld ${S}/${ESW_COMPONENT_SRC}/
@@ -35,4 +35,4 @@ do_deploy() {
 addtask deploy before do_build after do_package
-FILES_${PN} = "${base_libdir}/firmware/memory_test*"
+FILES:${PN} = "${base_libdir}/firmware/memory_test*"
diff --git a/meta-xilinx-standalone-experimental/recipes-applications/peripheral-tests/peripheral-tests_git.bb b/meta-xilinx-standalone-experimental/recipes-applications/peripheral-tests/peripheral-tests_git.bb
index 49c12693..6275ee07 100644
--- a/meta-xilinx-standalone-experimental/recipes-applications/peripheral-tests/peripheral-tests_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-applications/peripheral-tests/peripheral-tests_git.bb
@@ -6,7 +6,7 @@ DEPENDS += "libxil xiltimer"
 inherit python3native
-do_configure_prepend() {
+do_configure:prepend() {
    cd ${S}
    lopper.py ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
    install -m 0755 memory.ld ${S}/${ESW_COMPONENT_SRC}/
@@ -46,7 +46,7 @@ PERIPHERAL_TEST_BASE_NAME ?= "${PERIPHERAL_TEST_APP_IMAGE_NAME}-${PKGE}-${PKGV}-
 ESW_COMPONENT ??= "executable.elf"
-do_compile_append() {
+do_compile:append() {
    ${OBJCOPY} -O binary ${B}/${ESW_COMPONENT} ${B}/executable.bin
 }
diff --git a/meta-xilinx-standalone-experimental/recipes-bsp/device-tree/device-tree.bbappend b/meta-xilinx-standalone-experimental/recipes-bsp/device-tree/device-tree.bbappend
index a38c1386..c36ba70b 100644
--- a/meta-xilinx-standalone-experimental/recipes-bsp/device-tree/device-tree.bbappend
+++ b/meta-xilinx-standalone-experimental/recipes-bsp/device-tree/device-tree.bbappend
@@ -1,6 +1,6 @@
 CONFIG_DTFILE ?= ""
-do_install_prepend() {
+do_install:prepend() {
    for DTB_FILE in ${CONFIG_DTFILE}; do
        install -Dm 0644 ${DTB_FILE} ${D}/boot/devicetree/$(basename ${DTB_FILE})
    done
@@ -8,7 +8,7 @@ do_install_prepend() {
 # This needs to run BEFORE the device tree version, otherwise it can error with
 # Expected filename ${DTB_FILE_NAME} doesn't exist in ${DEPLOYDIR}/devicetree
-devicetree_do_deploy_prepend() {
+devicetree_do_deploy:prepend() {
    for DTB_FILE in ${CONFIG_DTFILE}; do
        install -Dm 0644 ${DTB_FILE} ${DEPLOYDIR}/devicetree/$(basename ${DTB_FILE})
    done
diff --git a/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/fsbl-firmware_git.bbappend b/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/fsbl-firmware_git.bbappend
index d241df32..9912b020 100644
--- a/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/fsbl-firmware_git.bbappend
+++ b/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/fsbl-firmware_git.bbappend
@@ -7,11 +7,11 @@ SRC_URI = "${EMBEDDEDSW_SRCURI}"
 inherit esw
 # Not compatible with Zynq
-COMPATIBLE_MACHINE_zynq = "none"
+COMPATIBLE_MACHINE:zynq = "none"
 ESW_COMPONENT_SRC = "/lib/sw_apps/undefined/src"
-ESW_COMPONENT_SRC_zynq = "/lib/sw_apps/zynq_fsbl/src"
+ESW_COMPONENT_SRC:zynq = "/lib/sw_apps/zynq_fsbl/src"
-ESW_COMPONENT_SRC_zynqmp = "/lib/sw_apps/zynqmp_fsbl/src"
+ESW_COMPONENT_SRC:zynqmp = "/lib/sw_apps/zynqmp_fsbl/src"
 DEPENDS += "xilstandalone xiltimer xilffs xilsecure xilpm"
@@ -40,8 +40,8 @@ do_install() {
 addtask deploy before do_build after do_package
 ESW_COMPONENT = "undefined"
-ESW_COMPONENT_zynq = "zynq_fsbl.elf"
+ESW_COMPONENT:zynq = "zynq_fsbl.elf"
-ESW_COMPONENT_zynqmp = "zynqmp_fsbl.elf"
+ESW_COMPONENT:zynqmp = "zynqmp_fsbl.elf"
-CFLAGS_append_aarch64 = " -DARMA53_64"
+CFLAGS:append:aarch64 = " -DARMA53_64"
-CFLAGS_append_armrm = " -DARMR5"
+CFLAGS:append:armrm = " -DARMR5"
diff --git a/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/plm-firmware_git.bbappend b/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/plm-firmware_git.bbappend
index b7bea591..558e5fd9 100644
--- a/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/plm-firmware_git.bbappend
+++ b/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/plm-firmware_git.bbappend
@@ -10,7 +10,7 @@ ESW_COMPONENT_SRC = "/lib/sw_apps/versal_plm/src/"
 ESW_COMPONENT = "versal_plm.elf"
-do_compile_append() {
+do_compile:append() {
    ${MB_OBJCOPY} -O binary ${B}/${ESW_COMPONENT} ${B}/${ESW_COMPONENT}.bin
 }
diff --git a/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/pmu-firmware_git.bbappend b/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/pmu-firmware_git.bbappend
index 2016cc5c..dd0a3d92 100644
--- a/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/pmu-firmware_git.bbappend
+++ b/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/pmu-firmware_git.bbappend
@@ -10,7 +10,7 @@ ESW_COMPONENT_SRC = "/lib/sw_apps/zynqmp_pmufw/src"
 ESW_COMPONENT = "pmufw.elf"
-do_compile_append() {
+do_compile:append() {
    ${MB_OBJCOPY} -O binary ${B}/${ESW_COMPONENT} ${B}/${ESW_COMPONENT}.bin
 }
diff --git a/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/psm-firmware_git.bbappend b/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/psm-firmware_git.bbappend
index b4382477..9b3d6475 100644
--- a/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/psm-firmware_git.bbappend
+++ b/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/psm-firmware_git.bbappend
@@ -10,7 +10,7 @@ ESW_COMPONENT_SRC = "/lib/sw_apps/versal_psmfw/src/"
 ESW_COMPONENT = "versal_psmfw.elf"
-do_compile_append() {
+do_compile:append() {
    ${MB_OBJCOPY} -O binary ${B}/${ESW_COMPONENT} ${B}/${ESW_COMPONENT}.bin
 }
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 fe37c4df..1f6f1ef3 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
@@ -104,7 +104,7 @@ SYSTEM_DTFILE = "${CONFIG_DTFILE}"
 # We don't want the kernel to build us a device-tree
 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'))}"
 EOF
@@ -233,7 +233,7 @@ SYSTEM_DTFILE = "${CONFIG_DTFILE}"
 # We don't want the kernel to build us a device-tree
 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'))}"
 EOF
@@ -409,7 +409,7 @@ EOF
 microblaze_done=0
 # Generate microblaze tunings
 microblaze_done=0
-process_microblaze() {
+process:microblaze() {
  if [ ${microblaze_done} = 0 ]; then
    echo -n "Generating microblaze processor tunes..."
    # Process microblaze
@@ -446,7 +446,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"
@@ -485,7 +485,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"
@@ -524,7 +524,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"
@@ -634,7 +634,7 @@ parse_cpus() {
        fi
        ;;
      xlnx,microblaze)
-        process_microblaze
+        process:microblaze
        case ${os_hint} in
          None | baremetal*)
            echo "Warning: Microblaze for Baremetal ${domain} not yet implemented"
@@ -648,17 +648,17 @@ parse_cpus() {
        esac
        ;;
      pmu-microblaze)
-        process_microblaze
+        process:microblaze
        echo "Microblaze ZynqMP pmu"
        pmu-microblaze
        ;;
      pmc-microblaze)
-        process_microblaze
+        process:microblaze
        echo "Microblaze Versal pmc"
        pmc-microblaze
        ;;
      psm-microblaze)
-        process_microblaze
+        process:microblaze
        echo "Microblaze Versal psm"
        psm-microblaze
        ;;
diff --git a/meta-xilinx-standalone-experimental/recipes-core/meta/meta-xilinx-setup.bb b/meta-xilinx-standalone-experimental/recipes-core/meta/meta-xilinx-setup.bb
index 86d988c6..a2e0d364 100644
--- a/meta-xilinx-standalone-experimental/recipes-core/meta/meta-xilinx-setup.bb
+++ b/meta-xilinx-standalone-experimental/recipes-core/meta/meta-xilinx-setup.bb
@@ -45,7 +45,7 @@ do_populate_sdk[stamp-extra-info] = "${PACKAGE_ARCH}"
 REAL_MULTIMACH_TARGET_SYS = "none"
-create_sdk_files_append () {
+create_sdk_files:append () {
        install -m 0644 ${WORKDIR}/README-setup ${SDK_OUTPUT}/${SDKPATH}/.
        install -m 0755 ${WORKDIR}/dt-processor.sh ${SDK_OUTPUT}/${SDKPATH}/.
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/common_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/common_git.bb
index 22f659cd..685e5585 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/common_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/common_git.bb
@@ -16,7 +16,7 @@ PACKAGECONFIG[intc] = "${RECIPE_SYSROOT}/usr/lib/libintc.a,,intc,,"
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/common/src/"
 ESW_COMPONENT_NAME = "libcommon.a"
-do_configure_prepend() {
+do_configure:prepend() {
    LOPPER_DTC_FLAGS="-b 0 -@" lopper.py ${DTS_FILE} -- baremetalconfig_xlnx.py ${ESW_MACHINE} ${S}/XilinxProcessorIPLib/drivers/intc/src/
    LOPPER_DTC_FLAGS="-b 0 -@" lopper.py ${DTS_FILE} -- baremetalconfig_xlnx.py ${ESW_MACHINE} ${S}/XilinxProcessorIPLib/drivers/scugic/src/
    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/ospipsv_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/ospipsv_git.bb
index 702cbd05..cc71a89d 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/ospipsv_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/ospipsv_git.bb
@@ -12,7 +12,7 @@ ESW_COMPONENT_NAME = "libospipsv.a"
 addtask do_generate_driver_data before do_configure after do_prepare_recipe_sysroot
 do_prepare_recipe_sysroot[rdeptask] = "do_unpack"
-do_configure_prepend() {
+do_configure:prepend() {
    LOPPER_DTC_FLAGS="-b 0 -@" lopper.py ${DTS_FILE} -- baremetal_xparameters_xlnx.py ${ESW_MACHINE} ${S}
    install -m 0755 xparameters.h ${S}/${ESW_COMPONENT_SRC}/
 }
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/uartlite_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/uartlite_git.bb
index a686b857..5d4e5a91 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/uartlite_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/uartlite_git.bb
@@ -9,7 +9,7 @@ DEPENDS += "xilstandalone "
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/uartlite/src/"
 ESW_COMPONENT_NAME = "libuartlite.a"
-do_configure_prepend() {
+do_configure:prepend() {
    LOPPER_DTC_FLAGS="-b 0 -@" lopper.py ${DTS_FILE} -- baremetalconfig_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} stdin
    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}
    install -m 0755 xuartlite_g.c ${S}/${ESW_COMPONENT_SRC}
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/uartns550_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/uartns550_git.bb
index 42b2bd39..a1c9b670 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/uartns550_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/uartns550_git.bb
@@ -9,7 +9,7 @@ DEPENDS += "xilstandalone "
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/uartns550/src/"
 ESW_COMPONENT_NAME = "libuartns550.a"
-do_configure_prepend() {
+do_configure:prepend() {
    LOPPER_DTC_FLAGS="-b 0 -@" lopper.py ${DTS_FILE} -- baremetalconfig_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} stdin
    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}
    install -m 0755 xuartns550_g.c ${S}/${ESW_COMPONENT_SRC}
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/uartps_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/uartps_git.bb
index 4b2f3f01..339450dd 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/uartps_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/uartps_git.bb
@@ -9,7 +9,7 @@ DEPENDS += "xilstandalone "
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/uartps/src/"
 ESW_COMPONENT_NAME = "libuartps.a"
-do_configure_prepend() {
+do_configure:prepend() {
    LOPPER_DTC_FLAGS="-b 0 -@" lopper.py ${DTS_FILE} -- baremetalconfig_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} stdin
    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
    install -m 0755 xuartps_g.c ${S}/${ESW_COMPONENT_SRC}/
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/uartpsv_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/uartpsv_git.bb
index cbd45762..1b285fd8 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/uartpsv_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/uartpsv_git.bb
@@ -9,7 +9,7 @@ DEPENDS += "xilstandalone "
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/uartpsv/src/"
 ESW_COMPONENT_NAME = "libuartpsv.a"
-do_configure_prepend() {
+do_configure:prepend() {
    LOPPER_DTC_FLAGS="-b 0 -@" lopper.py ${DTS_FILE} -- baremetalconfig_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} stdin
    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
    install -m 0755 xuartpsv_g.c ${S}/${ESW_COMPONENT_SRC}/
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-frmbuf-rd_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-frmbuf-rd_git.bb
index e7eb038f..ee100489 100755
--- a/meta-xilinx-standalone-experimental/recipes-drivers/v-frmbuf-rd_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-frmbuf-rd_git.bb
@@ -9,7 +9,7 @@ DEPENDS += "xilstandalone video-common"
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/v_frmbuf_rd/src/"
 ESW_COMPONENT_NAME = "libv_frmbuf_rd.a"
-do_configure_prepend() {
+do_configure:prepend() {
    LOPPER_DTC_FLAGS="-b 0 -@" lopper.py ${DTS_FILE} -- baremetalconfig_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
    install -m 0755 xv_frmbufrd_g.c ${S}/${ESW_COMPONENT_SRC}/
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/v-frmbuf-wr_git.bb b/meta-xilinx-standalone-experimental/recipes-drivers/v-frmbuf-wr_git.bb
index 05f92ea3..7c4d1230 100755
--- a/meta-xilinx-standalone-experimental/recipes-drivers/v-frmbuf-wr_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-drivers/v-frmbuf-wr_git.bb
@@ -9,7 +9,7 @@ DEPENDS += "xilstandalone video-common"
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/v_frmbuf_wr/src/"
 ESW_COMPONENT_NAME = "libv_frmbuf_wr.a"
-do_configure_prepend() {
+do_configure:prepend() {
    LOPPER_DTC_FLAGS="-b 0 -@" lopper.py ${DTS_FILE} -- baremetalconfig_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
    install -m 0755 xv_frmbufwr_g.c ${S}/${ESW_COMPONENT_SRC}/
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/freertos10-xilinx_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/freertos10-xilinx_git.bb
index f258cba5..4ad2a9e6 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/freertos10-xilinx_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/freertos10-xilinx_git.bb
@@ -5,7 +5,7 @@ ESW_COMPONENT_NAME = "libfreertos.a"
 DEPENDS += "libxil xilstandalone  xiltimer"
-do_configure_prepend() {
+do_configure:prepend() {
    # This script should also not rely on relative paths and such
    cd ${S}
    lopper.py ${DTS_FILE} -- bmcmake_metadata_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} hwcmake_metadata ${S}
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/libxil_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/libxil_git.bb
index 9fd92cd2..48482de4 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/libxil_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/libxil_git.bb
@@ -11,7 +11,7 @@ DEPENDS += "xilstandalone "
 REQUIRED_DISTRO_FEATURES = "${DISTRO_FEATURES}"
 PACKAGECONFIG ?= "${DISTRO_FEATURES} ${MACHINE_FEATURES}"
-do_configure_prepend() {
+do_configure:prepend() {
    LOPPER_DTC_FLAGS="-b 0 -@" lopper.py ${DTS_FILE} -- baremetal_xparameters_xlnx.py ${ESW_MACHINE} ${S}
    install -m 0755 xparameters.h ${S}/${ESW_COMPONENT_SRC}/
 }
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/lwip_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/lwip_git.bb
index 8295bfdd..11e44c28 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/lwip_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/lwip_git.bb
@@ -4,16 +4,16 @@ ESW_COMPONENT_SRC = "/ThirdParty/sw_services/lwip211/src/"
 ESW_COMPONENT_NAME = "liblwip211.a"
 DEPENDS += "libxil"
-DEPENDS_append_xilinx-freertos = "freertos10-xilinx"
+DEPENDS:append_xilinx-freertos = "freertos10-xilinx"
 EXTRA_OECMAKE += "-Dlwip_api_mode=RAW_API"
 EXTRA_OECMAKE += "-Dlwip_dhcp_does_arp_check=ON"
 EXTRA_OECMAKE += "-Dlwip_dhcp=ON"
 EXTRA_OECMAKE += "-Dlwip_pbuf_pool_size=2048"
 EXTRA_OECMAKE += "-Dlwip_ipv6_enable=OFF"
-EXTRA_OECMAKE_append_xilinx-freertos += "-Dlwip_api_mode=SOCKET_API"
+EXTRA_OECMAKE:append_xilinx-freertos += "-Dlwip_api_mode=SOCKET_API"
-do_configure_prepend() {
+do_configure:prepend() {
    # This script should also not rely on relative paths and such
    cd ${S}
    lopper.py ${DTS_FILE} -- bmcmake_metadata_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} hwcmake_metadata ${S}
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/nativesdk-esw-conf_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/nativesdk-esw-conf_git.bb
index 629b6f73..63119fd4 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/nativesdk-esw-conf_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/nativesdk-esw-conf_git.bb
@@ -10,7 +10,7 @@ B = "${WORKDIR}/build"
 # Don't need any specific dependencies for this
 DEPENDS = ""
-COMPATIBLE_HOST_forcevariable = ".*"
+COMPATIBLE_HOST:forcevariable = ".*"
 ESW_COMPONENT_SRC = "/XilinxProcessorIPLib/drivers/"
@@ -27,4 +27,4 @@ do_install() {
    done
 }
-FILES_${PN} += "${datadir}/embeddedsw"
+FILES:${PN} += "${datadir}/embeddedsw"
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilffs-example_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilffs-example_git.bb
index 61643120..6df33ea0 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilffs-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilffs-example_git.bb
@@ -4,7 +4,7 @@ ESW_COMPONENT_SRC = "/lib/sw_services/xilffs/examples/"
 DEPENDS += "xilffs xiltimer"
-do_configure_prepend() {
+do_configure:prepend() {
    cd ${S}
    lopper.py ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
    install -m 0755 memory.ld ${S}/${ESW_COMPONENT_SRC}/
@@ -25,4 +25,4 @@ do_deploy() {
 }
 addtask deploy before do_build after do_package
-FILES_${PN} = "${base_libdir}/firmware/*.elf"
+FILES:${PN} = "${base_libdir}/firmware/*.elf"
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilfpga-example_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilfpga-example_git.bb
index 2685b384..b3523ab7 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilfpga-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilfpga-example_git.bb
@@ -4,7 +4,7 @@ ESW_COMPONENT_SRC = "/lib/sw_services/xilfpga/examples/"
 DEPENDS += "xilfpga"
-do_configure_prepend() {
+do_configure:prepend() {
    cd ${S}
    lopper.py ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
    install -m 0755 memory.ld ${S}/${ESW_COMPONENT_SRC}/
@@ -25,4 +25,4 @@ do_deploy() {
 }
 addtask deploy before do_build after do_package
-FILES_${PN} = "${base_libdir}/firmware/*.elf"
+FILES:${PN} = "${base_libdir}/firmware/*.elf"
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilmailbox-example_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilmailbox-example_git.bb
index da9d35d2..baadc4e7 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilmailbox-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilmailbox-example_git.bb
@@ -4,7 +4,7 @@ ESW_COMPONENT_SRC = "/lib/sw_services/xilmailbox/examples/"
 DEPENDS += "xilmailbox"
-do_configure_prepend() {
+do_configure:prepend() {
    cd ${S}
    lopper.py ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
    install -m 0755 memory.ld ${S}/${ESW_COMPONENT_SRC}/
@@ -34,4 +34,4 @@ do_deploy() {
 }
 addtask deploy before do_build after do_package
-FILES_${PN} = "${base_libdir}/firmware/*.elf"
+FILES:${PN} = "${base_libdir}/firmware/*.elf"
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilnvm-example_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilnvm-example_git.bb
index 2982bb91..4528fe98 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilnvm-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilnvm-example_git.bb
@@ -4,7 +4,7 @@ ESW_COMPONENT_SRC = "/lib/sw_services/xilnvm/examples/"
 DEPENDS += "xilnvm"
-do_configure_prepend() {
+do_configure:prepend() {
    cd ${S}
    lopper.py ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
    install -m 0755 memory.ld ${S}/${ESW_COMPONENT_SRC}/
@@ -25,4 +25,4 @@ do_deploy() {
 }
 addtask deploy before do_build after do_package
-FILES_${PN} = "${base_libdir}/firmware/*.elf"
+FILES:${PN} = "${base_libdir}/firmware/*.elf"
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilpuf-example_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilpuf-example_git.bb
index a6e1e69b..ce56933c 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilpuf-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilpuf-example_git.bb
@@ -4,7 +4,7 @@ ESW_COMPONENT_SRC = "/lib/sw_services/xilpuf/examples/"
 DEPENDS += "xilpuf"
-do_configure_prepend() {
+do_configure:prepend() {
    cd ${S}
    lopper.py ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
    install -m 0755 memory.ld ${S}/${ESW_COMPONENT_SRC}/
@@ -25,4 +25,4 @@ do_deploy() {
 }
 addtask deploy before do_build after do_package
-FILES_${PN} = "${base_libdir}/firmware/*.elf"
+FILES:${PN} = "${base_libdir}/firmware/*.elf"
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilsecure-example_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilsecure-example_git.bb
index 1d589228..d8253e59 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilsecure-example_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilsecure-example_git.bb
@@ -4,7 +4,7 @@ ESW_COMPONENT_SRC = "/lib/sw_services/xilsecure/examples/"
 DEPENDS += "xilsecure"
-do_configure_prepend() {
+do_configure:prepend() {
    cd ${S}
    lopper.py ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
    install -m 0755 memory.ld ${S}/${ESW_COMPONENT_SRC}/
@@ -25,4 +25,4 @@ do_deploy() {
 }
 addtask deploy before do_build after do_package
-FILES_${PN} = "${base_libdir}/firmware/*.elf"
+FILES:${PN} = "${base_libdir}/firmware/*.elf"
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilstandalone_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilstandalone_git.bb
index 5dc98269..495fe6a8 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilstandalone_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilstandalone_git.bb
@@ -5,7 +5,7 @@ ESW_COMPONENT_NAME = "libxilstandalone.a"
 DEPENDS += "libgloss"
-do_configure_prepend() {
+do_configure:prepend() {
    # This script should also not rely on relative paths and such
    cd ${S}
    lopper.py ${DTS_FILE} -- baremetal_bspconfig_xlnx ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xiltimer_git.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xiltimer_git.bb
index 93b64de1..3f93db74 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xiltimer_git.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xiltimer_git.bb
@@ -5,7 +5,7 @@ ESW_COMPONENT_NAME = "libxiltimer.a"
 DEPENDS += "libxil"
-do_configure_prepend() {
+do_configure:prepend() {
    # This script should also not rely on relative paths and such
    cd ${S}
    lopper.py ${DTS_FILE} -- bmcmake_metadata_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC} hwcmake_metadata ${S}
diff --git a/meta-xilinx-standalone-experimental/scripts/microblaze_dtb.py b/meta-xilinx-standalone-experimental/scripts/microblaze_dtb.py
index 1c5ed835..343ae10e 100644
--- a/meta-xilinx-standalone-experimental/scripts/microblaze_dtb.py
+++ b/meta-xilinx-standalone-experimental/scripts/microblaze_dtb.py
@@ -133,8 +133,8 @@ def MicroblazeConfig(dtbfile, out):
                TUNE_FEATURES = processProperties(fdt, node)
                out.write('AVAILTUNES += "microblaze-cpu%s"\n' % (cpu))
-                out.write('TUNE_FEATURES_tune-microblaze-cpu%s = "%s"\n' % (cpu, ' '.join(TUNE_FEATURES)))
+                out.write('TUNE_FEATURES:tune-microblaze-cpu%s = "%s"\n' % (cpu, ' '.join(TUNE_FEATURES)))
-                out.write('PACKAGE_EXTRA_ARCHS_tune-microblaze-cpu%s = "${TUNE_PKGARCH}"\n' % (cpu))
+                out.write('PACKAGE_EXTRA_ARCHS:tune-microblaze-cpu%s = "${TUNE_PKGARCH}"\n' % (cpu))
            except Exception as e:
                sys.stderr.write("Exception looking at properties: %s\n" % e)
diff --git a/meta-xilinx-standalone/conf/distro/xilinx-standalone.conf b/meta-xilinx-standalone/conf/distro/xilinx-standalone.conf
index 0447376b..dfc8fa08 100644
--- a/meta-xilinx-standalone/conf/distro/xilinx-standalone.conf
+++ b/meta-xilinx-standalone/conf/distro/xilinx-standalone.conf
@@ -1,12 +1,12 @@
 require conf/distro/xilinx-standalone.inc
-DISTRO_NAME_append = " (lto)"
+DISTRO_NAME:append = " (lto)"
 # By default we want to optimize for size.
 FULL_OPTIMIZATION = "-O2 -pipe ${DEBUG_FLAGS}"
 # Workaround for microblaze -Os bug
-FULL_OPTIMIZATION_microblaze = "-O2 -pipe ${DEBUG_FLAGS}"
+FULL_OPTIMIZATION:microblaze = "-O2 -pipe ${DEBUG_FLAGS}"
 # We also need to use Link Time Optimization for many items, make this the
 # default.
diff --git a/meta-xilinx-standalone/conf/distro/xilinx-standalone.inc b/meta-xilinx-standalone/conf/distro/xilinx-standalone.inc
index 622544fc..45039835 100644
--- a/meta-xilinx-standalone/conf/distro/xilinx-standalone.inc
+++ b/meta-xilinx-standalone/conf/distro/xilinx-standalone.inc
@@ -3,7 +3,7 @@ DISTRO_VERSION = "1.0"
 TARGET_VENDOR = "-xilinx"
 # Make sure any users get the xilinx-standalone distro override
-DISTROOVERRIDES_prepend = "${@'xilinx-standalone:' if d.getVar('DISTRO') != "xilinx-standalone" else ''}"
+DISTROOVERRIDES:prepend = "${@'xilinx-standalone:' if d.getVar('DISTRO') != "xilinx-standalone" else ''}"
 TCLIBC = "newlib"
 TCLIBCAPPEND =""
@@ -12,7 +12,7 @@ TCLIBCAPPEND =""
 SDK_VERSION = "xilinx-standalone"
 # Hold this until it gets merged in core, we need libc.a and libgloss.a for cross-canadian
-LIBC_DEPENDENCIES_append = " newlib-staticdev libgloss-staticdev"
+LIBC_DEPENDENCIES:append = " newlib-staticdev libgloss-staticdev"
 ESW_CFLAGS ?= ""
@@ -25,7 +25,7 @@ TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'cortexr5', ' -DARMR5', ''
 # Avoid using this for native, nativesdk or cross recipes
 COMPATOS = ""
 # Set the regex for target recipes only, follow TARGET_OS default
-COMPATOS_class-target = ".*-linux${LIBCEXTENSION}${ABIEXTENSION}"
+COMPATOS:class-target = ".*-linux${LIBCEXTENSION}${ABIEXTENSION}"
 COMPATIBLE_HOST ?= "${COMPATOS}"
 # Clear defaults
@@ -38,10 +38,10 @@ PREFERRED_VERSION_libmetal = "${@'standalone' if 'xilinx-standalone-exp' in d.ge
 PREFERRED_VERSION_open-amp = "${@'standalone' if 'xilinx-standalone-exp' in d.getVar('BBFILE_COLLECTIONS').split() else ''}"
 # Hold this until it gets merged in core, we need libc.a and libgloss.a for cross-canadian
-LIBC_DEPENDENCIES_append = " newlib-staticdev libgloss-staticdev"
+LIBC_DEPENDENCIES:append = " newlib-staticdev libgloss-staticdev"
 # No cached configsite files
 TOOLCHAIN_NEED_CONFIGSITE_CACHE = ""
 # Workaround for pulling in nativesdk-mingw-w64-winpthreads
-TOOLCHAIN_HOST_TASK_append_sdkmingw32 = " nativesdk-mingw-w64-winpthreads"
+TOOLCHAIN_HOST_TASK:append:sdkmingw32 = " nativesdk-mingw-w64-winpthreads"
diff --git a/meta-xilinx-standalone/conf/machine/aarch32-tc.conf b/meta-xilinx-standalone/conf/machine/aarch32-tc.conf
index 72fbc80f..22ed10ae 100644
--- a/meta-xilinx-standalone/conf/machine/aarch32-tc.conf
+++ b/meta-xilinx-standalone/conf/machine/aarch32-tc.conf
@@ -16,205 +16,205 @@ MULTILIBS += "multilib:libvtvesimdhf"
 MULTILIBS += "multilib:libv8anofp"
 MULTILIBS += "multilib:libv8asimdsoftfp multilib:libv8asimdhard"
-TUNE_CCARGS = "${TUNE_CCARGS_tune-${DEFAULTTUNE}}"
+TUNE_CCARGS = "${TUNE_CCARGS:tune-${DEFAULTTUNE}}"
-TUNE_PKGARCH = "${TUNE_PKGARCH_tune-${DEFAULTTUNE}}"
+TUNE_PKGARCH = "${TUNE_PKGARCH:tune-${DEFAULTTUNE}}"
 # Base configuration
 # CFLAGS:
 DEFAULTTUNE = "aarch32"
 AVAILTUNES += "aarch32"
-PACKAGE_EXTRA_ARCHS_tune-aarch32 = "${TUNE_PKGARCH_tune-aarch32}"
+PACKAGE_EXTRA_ARCHS:tune-aarch32 = "${TUNE_PKGARCH:tune-aarch32}"
-BASE_LIB_tune-aarch32 = "lib"
+BASE_LIB:tune-aarch32 = "lib"
-TUNE_FEATURES_tune-aarch32 = "arm"
+TUNE_FEATURES:tune-aarch32 = "arm"
-TUNE_CCARGS_tune-aarch32 = ""
+TUNE_CCARGS:tune-aarch32 = ""
-TUNE_PKGARCH_tune-aarch32 = "aarch32"
+TUNE_PKGARCH:tune-aarch32 = "aarch32"
 # arm/v5te/softfp
 # CFLAGS: -marm -march=armv5te+fp -mfloat-abi=softfp
-DEFAULTTUNE_virtclass-multilib-libarmv5tesoftfp = "armv5tesoftfp"
+DEFAULTTUNE:virtclass-multilib-libarmv5tesoftfp = "armv5tesoftfp"
 AVAILTUNES += "armv5tesoftfp"
-PACKAGE_EXTRA_ARCHS_tune-armv5tesoftfp = "${TUNE_PKGARCH_tune-armv5tesoftfp}"
+PACKAGE_EXTRA_ARCHS:tune-armv5tesoftfp = "${TUNE_PKGARCH:tune-armv5tesoftfp}"
-BASE_LIB_tune-armv5tesoftfp = "lib/arm/v5te/softfp"
+BASE_LIB:tune-armv5tesoftfp = "lib/arm/v5te/softfp"
-TUNE_FEATURES_tune-armv5tesoftfp = "arm"
+TUNE_FEATURES:tune-armv5tesoftfp = "arm"
-TUNE_CCARGS_tune-armv5tesoftfp = "-marm -march=armv5te+fp -mfloat-abi=softfp"
+TUNE_CCARGS:tune-armv5tesoftfp = "-marm -march=armv5te+fp -mfloat-abi=softfp"
-TUNE_PKGARCH_tune-armv5tesoftfp = "armv5tefp"
+TUNE_PKGARCH:tune-armv5tesoftfp = "armv5tefp"
 # arm/v5te/hard
 # CFLAGS: -marm -march=armv5te+fp -mfloat-abi=hard
-DEFAULTTUNE_virtclass-multilib-libarmv5tehard = "armv5tehard"
+DEFAULTTUNE:virtclass-multilib-libarmv5tehard = "armv5tehard"
 AVAILTUNES += "armv5tehard"
-PACKAGE_EXTRA_ARCHS_tune-armv5tehard = "${TUNE_PKGARCH_tune-armv5tehard}"
+PACKAGE_EXTRA_ARCHS:tune-armv5tehard = "${TUNE_PKGARCH:tune-armv5tehard}"
-BASE_LIB_tune-armv5tehard = "lib/arm/v5te/hard"
+BASE_LIB:tune-armv5tehard = "lib/arm/v5te/hard"
-TUNE_FEATURES_tune-armv5tehard = "arm"
+TUNE_FEATURES:tune-armv5tehard = "arm"
-TUNE_CCARGS_tune-armv5tehard = "-marm -march=armv5te+fp -mfloat-abi=hard"
+TUNE_CCARGS:tune-armv5tehard = "-marm -march=armv5te+fp -mfloat-abi=hard"
-TUNE_PKGARCH_tune-armv5tehard = "armv5tefphf"
+TUNE_PKGARCH:tune-armv5tehard = "armv5tefphf"
 # thumb/nofp
 # CFLAGS: -mthumb -mfloat-abi=soft
-DEFAULTTUNE_virtclass-multilib-libnofp = "armnofp"
+DEFAULTTUNE:virtclass-multilib-libnofp = "armnofp"
 AVAILTUNES += "armnofp"
-PACKAGE_EXTRA_ARCHS_tune-armnofp = "${TUNE_PKGARCH_tune-armnofp}"
+PACKAGE_EXTRA_ARCHS:tune-armnofp = "${TUNE_PKGARCH:tune-armnofp}"
-BASE_LIB_tune-armnofp = "lib/thumb/nofp"
+BASE_LIB:tune-armnofp = "lib/thumb/nofp"
-TUNE_FEATURES_tune-armnofp = "arm"
+TUNE_FEATURES:tune-armnofp = "arm"
-TUNE_CCARGS_tune-armnofp = "-mthumb -mfloat-abi=soft"
+TUNE_CCARGS:tune-armnofp = "-mthumb -mfloat-abi=soft"
-TUNE_PKGARCH_tune-armnofp = "armt"
+TUNE_PKGARCH:tune-armnofp = "armt"
 # thumb/v7/nofp
 # CFLAGS: -mthumb -march=armv7 -mfloat-abi=soft
-DEFAULTTUNE_virtclass-multilib-libv7nofp = "armv7nofp"
+DEFAULTTUNE:virtclass-multilib-libv7nofp = "armv7nofp"
 AVAILTUNES += "armv7nofp"
-PACKAGE_EXTRA_ARCHS_tune-armv7nofp = "${TUNE_PKGARCH_tune-armv7nofp}"
+PACKAGE_EXTRA_ARCHS:tune-armv7nofp = "${TUNE_PKGARCH:tune-armv7nofp}"
-BASE_LIB_tune-armv7nofp = "lib/thumb/v7/nofp"
+BASE_LIB:tune-armv7nofp = "lib/thumb/v7/nofp"
-TUNE_FEATURES_tune-armv7nofp = "arm"
+TUNE_FEATURES:tune-armv7nofp = "arm"
-TUNE_CCARGS_tune-armv7nofp = "-mthumb -march=armv7 -mfloat-abi=soft"
+TUNE_CCARGS:tune-armv7nofp = "-mthumb -march=armv7 -mfloat-abi=soft"
-TUNE_PKGARCH_tune-armv7nofp = "armv7t"
+TUNE_PKGARCH:tune-armv7nofp = "armv7t"
 # thumb/v7+fp/softfp
 # CFLAGS: -mthumb -march=armv7+fp -mfloat-abi=softfp
-DEFAULTTUNE_virtclass-multilib-libv7fpsoftfp = "armv7fpsoftfp"
+DEFAULTTUNE:virtclass-multilib-libv7fpsoftfp = "armv7fpsoftfp"
 AVAILTUNES += "armv7fpsoftfp"
-PACKAGE_EXTRA_ARCHS_tune-armv7fpsoftfp = "${TUNE_PKGARCH_tune-armv7fpsoftfp}"
+PACKAGE_EXTRA_ARCHS:tune-armv7fpsoftfp = "${TUNE_PKGARCH:tune-armv7fpsoftfp}"
-BASE_LIB_tune-armv7fpsoftfp = "lib/thumb/v7+fp/softfp"
+BASE_LIB:tune-armv7fpsoftfp = "lib/thumb/v7+fp/softfp"
-TUNE_FEATURES_tune-armv7fpsoftfp = "arm"
+TUNE_FEATURES:tune-armv7fpsoftfp = "arm"
-TUNE_CCARGS_tune-armv7fpsoftfp = "-mthumb -march=armv7+fp -mfloat-abi=softfp"
+TUNE_CCARGS:tune-armv7fpsoftfp = "-mthumb -march=armv7+fp -mfloat-abi=softfp"
-TUNE_PKGARCH_tune-armv7fpsoftfp = "armv7fpt"
+TUNE_PKGARCH:tune-armv7fpsoftfp = "armv7fpt"
 # thumb/v7+fp/hard
 # CFLAGS: -mthumb -march=armv7+fp -mfloat-abi=hard
-DEFAULTTUNE_virtclass-multilib-libv7fphard = "armv7fphard"
+DEFAULTTUNE:virtclass-multilib-libv7fphard = "armv7fphard"
 AVAILTUNES += "armv7fphard"
-PACKAGE_EXTRA_ARCHS_tune-armv7fphard = "${TUNE_PKGARCH_tune-armv7fphard}"
+PACKAGE_EXTRA_ARCHS:tune-armv7fphard = "${TUNE_PKGARCH:tune-armv7fphard}"
-BASE_LIB_tune-armv7fphard = "lib/thumb/v7+fp/hard"
+BASE_LIB:tune-armv7fphard = "lib/thumb/v7+fp/hard"
-TUNE_FEATURES_tune-armv7fphard = "arm"
+TUNE_FEATURES:tune-armv7fphard = "arm"
-TUNE_CCARGS_tune-armv7fphard = "-mthumb -march=armv7+fp -mfloat-abi=hard"
+TUNE_CCARGS:tune-armv7fphard = "-mthumb -march=armv7+fp -mfloat-abi=hard"
-TUNE_PKGARCH_tune-armv7fphard = "armv7fpthf"
+TUNE_PKGARCH:tune-armv7fphard = "armv7fpthf"
 # thumb/v7-a/nofp
 # CFLAGS: -mthumb -march=armv7-a -mfloat-abi=soft
-DEFAULTTUNE_virtclass-multilib-libv7anofp = "armv7anofp"
+DEFAULTTUNE:virtclass-multilib-libv7anofp = "armv7anofp"
 AVAILTUNES += "armv7anofp"
-PACKAGE_EXTRA_ARCHS_tune-armv7anofp = "${TUNE_PKGARCH_tune-armv7anofp}"
+PACKAGE_EXTRA_ARCHS:tune-armv7anofp = "${TUNE_PKGARCH:tune-armv7anofp}"
-BASE_LIB_tune-armv7anofp = "lib/thumb/v7-a/nofp"
+BASE_LIB:tune-armv7anofp = "lib/thumb/v7-a/nofp"
-TUNE_FEATURES_tune-armv7anofp = "arm"
+TUNE_FEATURES:tune-armv7anofp = "arm"
-TUNE_CCARGS_tune-armv7anofp = "-mthumb -march=armv7-a -mfloat-abi=soft"
+TUNE_CCARGS:tune-armv7anofp = "-mthumb -march=armv7-a -mfloat-abi=soft"
-TUNE_PKGARCH_tune-armv7anofp = "armv7at"
+TUNE_PKGARCH:tune-armv7anofp = "armv7at"
 # thumb/v7-a+fp/softfp
 # CFLAGS: -mthumb -march=armv7-a+fp -mfloat-abi=softfp
-DEFAULTTUNE_virtclass-multilib-libv7afpsoftfp = "armv7afpsoftfp"
+DEFAULTTUNE:virtclass-multilib-libv7afpsoftfp = "armv7afpsoftfp"
 AVAILTUNES += "armv7afpsoftfp"
-PACKAGE_EXTRA_ARCHS_tune-armv7afpsoftfp = "${TUNE_PKGARCH_tune-armv7afpsoftfp}"
+PACKAGE_EXTRA_ARCHS:tune-armv7afpsoftfp = "${TUNE_PKGARCH:tune-armv7afpsoftfp}"
-BASE_LIB_tune-armv7afpsoftfp = "lib/thumb/v7-a+fp/softfp"
+BASE_LIB:tune-armv7afpsoftfp = "lib/thumb/v7-a+fp/softfp"
-TUNE_FEATURES_tune-armv7afpsoftfp = "arm"
+TUNE_FEATURES:tune-armv7afpsoftfp = "arm"
-TUNE_CCARGS_tune-armv7afpsoftfp = "-mthumb -march=armv7-a+fp -mfloat-abi=softfp"
+TUNE_CCARGS:tune-armv7afpsoftfp = "-mthumb -march=armv7-a+fp -mfloat-abi=softfp"
-TUNE_PKGARCH_tune-armv7afpsoftfp = "armv7afpt"
+TUNE_PKGARCH:tune-armv7afpsoftfp = "armv7afpt"
 # thumb/v7-a+fp/hard
 # CFLAGS: -mthumb -march=armv7-a+fp -mfloat-abi=hard
-DEFAULTTUNE_virtclass-multilib-libv7afpthf = "armv7afpthf"
+DEFAULTTUNE:virtclass-multilib-libv7afpthf = "armv7afpthf"
 AVAILTUNES += "armv7afpthf"
-PACKAGE_EXTRA_ARCHS_tune-armv7afpthf = "${TUNE_PKGARCH_tune-armv7afpthf}"
+PACKAGE_EXTRA_ARCHS:tune-armv7afpthf = "${TUNE_PKGARCH:tune-armv7afpthf}"
-BASE_LIB_tune-armv7afpthf = "lib/thumb/v7-a+fp/hard"
+BASE_LIB:tune-armv7afpthf = "lib/thumb/v7-a+fp/hard"
-TUNE_FEATURES_tune-armv7afpthf = "arm"
+TUNE_FEATURES:tune-armv7afpthf = "arm"
-TUNE_CCARGS_tune-armv7afpthf = "-mthumb -march=armv7-a+fp -mfloat-abi=hard"
+TUNE_CCARGS:tune-armv7afpthf = "-mthumb -march=armv7-a+fp -mfloat-abi=hard"
-TUNE_PKGARCH_tune-armv7afpthf = "armv7afpthf"
+TUNE_PKGARCH:tune-armv7afpthf = "armv7afpthf"
 # thumb/v7-a+simd/softfp
 # CFLAGS: -mthumb -march=armv7-a+simd -mfloat-abi=softfp
-DEFAULTTUNE_virtclass-multilib-libv7asimdsoftfp = "armv7asimdsoftfp"
+DEFAULTTUNE:virtclass-multilib-libv7asimdsoftfp = "armv7asimdsoftfp"
 AVAILTUNES += "armv7asimdsoftfp"
-PACKAGE_EXTRA_ARCHS_tune-armv7asimdsoftfp = "${TUNE_PKGARCH_tune-armv7asimdsoftfp}"
+PACKAGE_EXTRA_ARCHS:tune-armv7asimdsoftfp = "${TUNE_PKGARCH:tune-armv7asimdsoftfp}"
-BASE_LIB_tune-armv7asimdsoftfp = "lib/thumb/v7-a+simd/softfp"
+BASE_LIB:tune-armv7asimdsoftfp = "lib/thumb/v7-a+simd/softfp"
-TUNE_FEATURES_tune-armv7asimdsoftfp = "arm"
+TUNE_FEATURES:tune-armv7asimdsoftfp = "arm"
-TUNE_CCARGS_tune-armv7asimdsoftfp = "-mthumb -march=armv7-a+simd -mfloat-abi=softfp"
+TUNE_CCARGS:tune-armv7asimdsoftfp = "-mthumb -march=armv7-a+simd -mfloat-abi=softfp"
-TUNE_PKGARCH_tune-armv7asimdsoftfp = "armv7asimdt"
+TUNE_PKGARCH:tune-armv7asimdsoftfp = "armv7asimdt"
 # thumb/v7-a+simd/hard
 # CFLAGS: -mthumb -march=armv7-a+simd -mfloat-abi=hard
-DEFAULTTUNE_virtclass-multilib-libv7asimdhard = "armv7asimdhard"
+DEFAULTTUNE:virtclass-multilib-libv7asimdhard = "armv7asimdhard"
 AVAILTUNES += "armv7asimdhard"
-PACKAGE_EXTRA_ARCHS_tune-armv7asimdhard = "${TUNE_PKGARCH_tune-armv7asimdhard}"
+PACKAGE_EXTRA_ARCHS:tune-armv7asimdhard = "${TUNE_PKGARCH:tune-armv7asimdhard}"
-BASE_LIB_tune-armv7asimdhard = "lib/thumb/v7-a+simd/hard"
+BASE_LIB:tune-armv7asimdhard = "lib/thumb/v7-a+simd/hard"
-TUNE_FEATURES_tune-armv7asimdhard = "arm"
+TUNE_FEATURES:tune-armv7asimdhard = "arm"
-TUNE_CCARGS_tune-armv7asimdhard = "-mthumb -march=armv7-a+simd -mfloat-abi=hard"
+TUNE_CCARGS:tune-armv7asimdhard = "-mthumb -march=armv7-a+simd -mfloat-abi=hard"
-TUNE_PKGARCH_tune-armv7asimdhard = "armv7asimdthf"
+TUNE_PKGARCH:tune-armv7asimdhard = "armv7asimdthf"
 # thumb/v7ve+simd/softfp
 # CFLAGS: -mthumb -march=armv7ve+simd -mfloat-abi=softfp
-DEFAULTTUNE_virtclass-multilib-libv7vesimdsoftfp = "armv7vesimdsoftfp"
+DEFAULTTUNE:virtclass-multilib-libv7vesimdsoftfp = "armv7vesimdsoftfp"
 AVAILTUNES += "armv7vesimdsoftfp"
-PACKAGE_EXTRA_ARCHS_tune-armv7vesimdsoftfp = "${TUNE_PKGARCH_tune-armv7vesimdsoftfp}"
+PACKAGE_EXTRA_ARCHS:tune-armv7vesimdsoftfp = "${TUNE_PKGARCH:tune-armv7vesimdsoftfp}"
-BASE_LIB_tune-armv7vesimdsoftfp = "lib/thumb/v7ve+simd/softfp"
+BASE_LIB:tune-armv7vesimdsoftfp = "lib/thumb/v7ve+simd/softfp"
-TUNE_FEATURES_tune-armv7vesimdsoftfp = "arm"
+TUNE_FEATURES:tune-armv7vesimdsoftfp = "arm"
-TUNE_CCARGS_tune-armv7vesimdsoftfp = "-mthumb -march=armv7ve+simd -mfloat-abi=softfp"
+TUNE_CCARGS:tune-armv7vesimdsoftfp = "-mthumb -march=armv7ve+simd -mfloat-abi=softfp"
-TUNE_PKGARCH_tune-armv7vesimdsoftfp = "armv7vesimdt"
+TUNE_PKGARCH:tune-armv7vesimdsoftfp = "armv7vesimdt"
 # thumb/v7ve+simd/hard
 # CFLAGS: -mthumb -march=armv7ve+simd -mfloat-abi=hard
-DEFAULTTUNE_virtclass-multilib-libvtvesimdhf = "armvtvesimdhf"
+DEFAULTTUNE:virtclass-multilib-libvtvesimdhf = "armvtvesimdhf"
 AVAILTUNES += "armvtvesimdhf"
-PACKAGE_EXTRA_ARCHS_tune-armvtvesimdhf = "${TUNE_PKGARCH_tune-armvtvesimdhf}"
+PACKAGE_EXTRA_ARCHS:tune-armvtvesimdhf = "${TUNE_PKGARCH:tune-armvtvesimdhf}"
-BASE_LIB_tune-armvtvesimdhf = "lib/thumb/v7ve+simd/hard"
+BASE_LIB:tune-armvtvesimdhf = "lib/thumb/v7ve+simd/hard"
-TUNE_FEATURES_tune-armvtvesimdhf = "arm"
+TUNE_FEATURES:tune-armvtvesimdhf = "arm"
-TUNE_CCARGS_tune-armvtvesimdhf = "-mthumb -march=armv7ve+simd -mfloat-abi=hard"
+TUNE_CCARGS:tune-armvtvesimdhf = "-mthumb -march=armv7ve+simd -mfloat-abi=hard"
-TUNE_PKGARCH_tune-armvtvesimdhf = "armv7vesimdthf"
+TUNE_PKGARCH:tune-armvtvesimdhf = "armv7vesimdthf"
 # thumb/v8-a/nofp
 # CFLAGS: -mthumb -march=armv8-a -mfloat-abi=soft
-DEFAULTTUNE_virtclass-multilib-libv8anofp = "armv8anofp"
+DEFAULTTUNE:virtclass-multilib-libv8anofp = "armv8anofp"
 AVAILTUNES += "armv8anofp"
-PACKAGE_EXTRA_ARCHS_tune-armv8anofp = "${TUNE_PKGARCH_tune-armv8anofp}"
+PACKAGE_EXTRA_ARCHS:tune-armv8anofp = "${TUNE_PKGARCH:tune-armv8anofp}"
-BASE_LIB_tune-armv8anofp = "lib/thumb/v8-a/nofp"
+BASE_LIB:tune-armv8anofp = "lib/thumb/v8-a/nofp"
-TUNE_FEATURES_tune-armv8anofp = "arm"
+TUNE_FEATURES:tune-armv8anofp = "arm"
-TUNE_CCARGS_tune-armv8anofp = "-mthumb -march=armv8-a -mfloat-abi=soft"
+TUNE_CCARGS:tune-armv8anofp = "-mthumb -march=armv8-a -mfloat-abi=soft"
-TUNE_PKGARCH_tune-armv8anofp = "armv8at"
+TUNE_PKGARCH:tune-armv8anofp = "armv8at"
 # thumb/v8-a+simd/softfp
 # CFLAGS: -mthumb -march=armv8-a+simd -mfloat-abi=softfp
-DEFAULTTUNE_virtclass-multilib-libv8asimdsoftfp = "armv8asimdsoftfp"
+DEFAULTTUNE:virtclass-multilib-libv8asimdsoftfp = "armv8asimdsoftfp"
 AVAILTUNES += "armv8asimdsoftfp"
-PACKAGE_EXTRA_ARCHS_tune-armv8asimdsoftfp = "${TUNE_PKGARCH_tune-armv8asimdsoftfp}"
+PACKAGE_EXTRA_ARCHS:tune-armv8asimdsoftfp = "${TUNE_PKGARCH:tune-armv8asimdsoftfp}"
-BASE_LIB_tune-armv8asimdsoftfp = "lib/thumb/v8-a+simd/softfp"
+BASE_LIB:tune-armv8asimdsoftfp = "lib/thumb/v8-a+simd/softfp"
-TUNE_FEATURES_tune-armv8asimdsoftfp = "arm"
+TUNE_FEATURES:tune-armv8asimdsoftfp = "arm"
-TUNE_CCARGS_tune-armv8asimdsoftfp = "-mthumb -march=armv8-a+simd -mfloat-abi=softfp"
+TUNE_CCARGS:tune-armv8asimdsoftfp = "-mthumb -march=armv8-a+simd -mfloat-abi=softfp"
-TUNE_PKGARCH_tune-armv8asimdsoftfp = "armv8asimdt"
+TUNE_PKGARCH:tune-armv8asimdsoftfp = "armv8asimdt"
 # thumb/v8-a+simd/hard
 # CFLAGS:  -mthumb -march=armv8-a+simd -mfloat-abi=hard
-DEFAULTTUNE_virtclass-multilib-libv8asimdhard = "armv8asimdhard"
+DEFAULTTUNE:virtclass-multilib-libv8asimdhard = "armv8asimdhard"
 AVAILTUNES += "armv8asimdhard"
-PACKAGE_EXTRA_ARCHS_tune-armv8asimdhard = "${TUNE_PKGARCH_tune-armv8asimdhard}"
+PACKAGE_EXTRA_ARCHS:tune-armv8asimdhard = "${TUNE_PKGARCH:tune-armv8asimdhard}"
-BASE_LIB_tune-armv8asimdhard = "lib/thumb/v8-a+simd/hard"
+BASE_LIB:tune-armv8asimdhard = "lib/thumb/v8-a+simd/hard"
-TUNE_FEATURES_tune-armv8asimdhard = "arm"
+TUNE_FEATURES:tune-armv8asimdhard = "arm"
-TUNE_CCARGS_tune-armv8asimdhard = "-mthumb -march=armv8-a+simd -mfloat-abi=hard"
+TUNE_CCARGS:tune-armv8asimdhard = "-mthumb -march=armv8-a+simd -mfloat-abi=hard"
-TUNE_PKGARCH_tune-armv8asimdhard = "armv8asimdthf"
+TUNE_PKGARCH:tune-armv8asimdhard = "armv8asimdthf"
diff --git a/meta-xilinx-standalone/conf/machine/aarch64-tc.conf b/meta-xilinx-standalone/conf/machine/aarch64-tc.conf
index 08c2d1c6..38ac8291 100644
--- a/meta-xilinx-standalone/conf/machine/aarch64-tc.conf
+++ b/meta-xilinx-standalone/conf/machine/aarch64-tc.conf
@@ -20,10 +20,10 @@ MULTILIBS = "multilib:libilp32"
 DEFAULTTUNE = "cortexa72-cortexa53"
 # CFLAGS: -mabi=ilp32
-DEFAULTTUNE_virtclass-multilib-libilp32 = "cortexa72-cortexa53-ilp32"
+DEFAULTTUNE:virtclass-multilib-libilp32 = "cortexa72-cortexa53-ilp32"
 AVAILTUNES += "cortexa72-cortexa53-ilp32"
-ARMPKGARCH_tune-cortexa72-cortexa53-ilp32 = "${ARMPKGARCH_tune-cortexa72-cortexa53}-ilp32"
+ARMPKGARCH:tune-cortexa72-cortexa53-ilp32 = "${ARMPKGARCH:tune-cortexa72-cortexa53}-ilp32"
-TUNE_FEATURES_tune-cortexa72-cortexa53-ilp32 = "${TUNE_FEATURES_tune-cortexa72-cortexa53} ilp32"
+TUNE_FEATURES:tune-cortexa72-cortexa53-ilp32 = "${TUNE_FEATURES:tune-cortexa72-cortexa53} ilp32"
-PACKAGE_EXTRA_ARCHS_tune-cortexa72-cortexa53-ilp32 = "${PACKAGE_EXTRA_ARCHS_tune-cortexa72-cortexa53} cortexa72-cortexa53-ilp32"
+PACKAGE_EXTRA_ARCHS:tune-cortexa72-cortexa53-ilp32 = "${PACKAGE_EXTRA_ARCHS:tune-cortexa72-cortexa53} cortexa72-cortexa53-ilp32"
-BASE_LIB_tune-cortexa72-cortexa53-ilp32 = "lib/ilp32"
+BASE_LIB:tune-cortexa72-cortexa53-ilp32 = "lib/ilp32"
diff --git a/meta-xilinx-standalone/conf/machine/arm-rm-tc.conf b/meta-xilinx-standalone/conf/machine/arm-rm-tc.conf
index c1313339..d8e68e4f 100644
--- a/meta-xilinx-standalone/conf/machine/arm-rm-tc.conf
+++ b/meta-xilinx-standalone/conf/machine/arm-rm-tc.conf
@@ -16,249 +16,249 @@ MULTILIBS += "multilib:libv7emdphard"
 MULTILIBS += "multilib:libv8mbasenofp"
 MULTILIBS += "multilib:libv8mmainnofp multilib:libv8mmainfpsoftfp multilib:libv8mmainfphard multilib:libv8mmaindpsoftfp multilib:libv8mmaindphard"
-TUNE_CCARGS = "${TUNE_CCARGS_tune-${DEFAULTTUNE}}"
+TUNE_CCARGS = "${TUNE_CCARGS:tune-${DEFAULTTUNE}}"
-TUNE_PKGARCH = "${TUNE_PKGARCH_tune-${DEFAULTTUNE}}"
+TUNE_PKGARCH = "${TUNE_PKGARCH:tune-${DEFAULTTUNE}}"
 # Base configuration
 # CFLAGS:
 DEFAULTTUNE = "armrm"
 AVAILTUNES += "armrm"
-PACKAGE_EXTRA_ARCHS_tune-armrm = "${TUNE_PKGARCH_tune-armrm}"
+PACKAGE_EXTRA_ARCHS:tune-armrm = "${TUNE_PKGARCH:tune-armrm}"
-BASE_LIB_tune-armrm = "lib"
+BASE_LIB:tune-armrm = "lib"
-TUNE_FEATURES_tune-armrm = "arm armrm"
+TUNE_FEATURES:tune-armrm = "arm armrm"
-TUNE_CCARGS_tune-armrm = ""
+TUNE_CCARGS:tune-armrm = ""
-TUNE_PKGARCH_tune-armrm = "armrm"
+TUNE_PKGARCH:tune-armrm = "armrm"
 # arm/v5te/softfp
 # CFLAGS:  -marm -march=armv5te+fp -mfloat-abi=softfp
-DEFAULTTUNE_virtclass-multilib-libarmv5tesoftfp = "armv5tesoftfp"
+DEFAULTTUNE:virtclass-multilib-libarmv5tesoftfp = "armv5tesoftfp"
 AVAILTUNES += "armv5tesoftfp"
-PACKAGE_EXTRA_ARCHS_tune-armv5tesoftfp = "${TUNE_PKGARCH_tune-armv5tesoftfp}"
+PACKAGE_EXTRA_ARCHS:tune-armv5tesoftfp = "${TUNE_PKGARCH:tune-armv5tesoftfp}"
-BASE_LIB_tune-armv5tesoftfp = "lib/arm/v5te/softfp"
+BASE_LIB:tune-armv5tesoftfp = "lib/arm/v5te/softfp"
-TUNE_FEATURES_tune-armv5tesoftfp = "arm armrm"
+TUNE_FEATURES:tune-armv5tesoftfp = "arm armrm"
-TUNE_CCARGS_tune-armv5tesoftfp = "-marm -march=armv5te+fp -mfloat-abi=softfp"
+TUNE_CCARGS:tune-armv5tesoftfp = "-marm -march=armv5te+fp -mfloat-abi=softfp"
-TUNE_PKGARCH_tune-armv5tesoftfp = "armv5tefp"
+TUNE_PKGARCH:tune-armv5tesoftfp = "armv5tefp"
 # arm/v5te/hard
 # CFLAGS: -marm -march=armv5te+fp -mfloat-abi=hard
-DEFAULTTUNE_virtclass-multilib-libarmv5tehard = "armv5tehard"
+DEFAULTTUNE:virtclass-multilib-libarmv5tehard = "armv5tehard"
 AVAILTUNES += "armv5tehard"
-PACKAGE_EXTRA_ARCHS_tune-armv5tehard = "${TUNE_PKGARCH_tune-armv5tehard}"
+PACKAGE_EXTRA_ARCHS:tune-armv5tehard = "${TUNE_PKGARCH:tune-armv5tehard}"
-BASE_LIB_tune-armv5tehard = "lib/arm/v5te/hard"
+BASE_LIB:tune-armv5tehard = "lib/arm/v5te/hard"
-TUNE_FEATURES_tune-armv5tehard = "arm armrm"
+TUNE_FEATURES:tune-armv5tehard = "arm armrm"
-TUNE_CCARGS_tune-armv5tehard = "-marm -march=armv5te+fp -mfloat-abi=hard"
+TUNE_CCARGS:tune-armv5tehard = "-marm -march=armv5te+fp -mfloat-abi=hard"
-TUNE_PKGARCH_tune-armv5tehard = "armv5tefphf"
+TUNE_PKGARCH:tune-armv5tehard = "armv5tefphf"
 # thumb/nofp
 # CFLAGS: -mthumb -mfloat-abi=soft
-DEFAULTTUNE_virtclass-multilib-libnofp = "armnofp"
+DEFAULTTUNE:virtclass-multilib-libnofp = "armnofp"
 AVAILTUNES += "armnofp"
-PACKAGE_EXTRA_ARCHS_tune-armnofp = "${TUNE_PKGARCH_tune-armnofp}"
+PACKAGE_EXTRA_ARCHS:tune-armnofp = "${TUNE_PKGARCH:tune-armnofp}"
-BASE_LIB_tune-armnofp = "lib/thumb/nofp"
+BASE_LIB:tune-armnofp = "lib/thumb/nofp"
-TUNE_FEATURES_tune-armnofp = "arm armrm"
+TUNE_FEATURES:tune-armnofp = "arm armrm"
-TUNE_CCARGS_tune-armnofp = "-mthumb -mfloat-abi=soft"
+TUNE_CCARGS:tune-armnofp = "-mthumb -mfloat-abi=soft"
-TUNE_PKGARCH_tune-armnofp = "armt"
+TUNE_PKGARCH:tune-armnofp = "armt"
 # thumb/v7/nofp
 # CFLAGS: -mthumb -march=armv7 -mfloat-abi=soft
-DEFAULTTUNE_virtclass-multilib-libv7nofp = "armv7nofp"
+DEFAULTTUNE:virtclass-multilib-libv7nofp = "armv7nofp"
 AVAILTUNES += "armv7nofp"
-PACKAGE_EXTRA_ARCHS_tune-armv7nofp = "${TUNE_PKGARCH_tune-armv7nofp}"
+PACKAGE_EXTRA_ARCHS:tune-armv7nofp = "${TUNE_PKGARCH:tune-armv7nofp}"
-BASE_LIB_tune-armv7nofp = "lib/thumb/v7/nofp"
+BASE_LIB:tune-armv7nofp = "lib/thumb/v7/nofp"
-TUNE_FEATURES_tune-armv7nofp ="arm armrm"
+TUNE_FEATURES:tune-armv7nofp ="arm armrm"
-TUNE_CCARGS_tune-armv7nofp = "-mthumb -march=armv7 -mfloat-abi=soft"
+TUNE_CCARGS:tune-armv7nofp = "-mthumb -march=armv7 -mfloat-abi=soft"
-TUNE_PKGARCH_tune-armv7nofp = "armv7t"
+TUNE_PKGARCH:tune-armv7nofp = "armv7t"
 # thumb/v7+fp/softfp
 # CFLAGS: -mthumb -march=armv7+fp -mfloat-abi=softfp
-DEFAULTTUNE_virtclass-multilib-libv7fpsoftfp = "armv7fpsoftfp"
+DEFAULTTUNE:virtclass-multilib-libv7fpsoftfp = "armv7fpsoftfp"
 AVAILTUNES += "armv7fpsoftfp"
-PACKAGE_EXTRA_ARCHS_tune-armv7fpsoftfp = "${TUNE_PKGARCH_tune-armv7fpsoftfp}"
+PACKAGE_EXTRA_ARCHS:tune-armv7fpsoftfp = "${TUNE_PKGARCH:tune-armv7fpsoftfp}"
-BASE_LIB_tune-armv7fpsoftfp = "lib/thumb/v7+fp/softfp"
+BASE_LIB:tune-armv7fpsoftfp = "lib/thumb/v7+fp/softfp"
-TUNE_FEATURES_tune-armv7fpsoftfp ="arm armrm"
+TUNE_FEATURES:tune-armv7fpsoftfp ="arm armrm"
-TUNE_CCARGS_tune-armv7fpsoftfp = "-mthumb -march=armv7+fp -mfloat-abi=softfp"
+TUNE_CCARGS:tune-armv7fpsoftfp = "-mthumb -march=armv7+fp -mfloat-abi=softfp"
-TUNE_PKGARCH_tune-armv7fpsoftfp = "armv7fpt"
+TUNE_PKGARCH:tune-armv7fpsoftfp = "armv7fpt"
 # thumb/v7+fp/hard
 # CFLAGS: -mthumb -march=armv7+fp -mfloat-abi=hard
-DEFAULTTUNE_virtclass-multilib-libv7fphard = "armv7fphard"
+DEFAULTTUNE:virtclass-multilib-libv7fphard = "armv7fphard"
 AVAILTUNES += "armv7fphard"
-PACKAGE_EXTRA_ARCHS_tune-armv7fphard = "${TUNE_PKGARCH_tune-armv7fphard}"
+PACKAGE_EXTRA_ARCHS:tune-armv7fphard = "${TUNE_PKGARCH:tune-armv7fphard}"
-BASE_LIB_tune-armv7fphard = "lib/thumb/v7+fp/hard"
+BASE_LIB:tune-armv7fphard = "lib/thumb/v7+fp/hard"
-TUNE_FEATURES_tune-armv7fphard ="arm armrm"
+TUNE_FEATURES:tune-armv7fphard ="arm armrm"
-TUNE_CCARGS_tune-armv7fphard = "-mthumb -march=armv7+fp -mfloat-abi=hard"
+TUNE_CCARGS:tune-armv7fphard = "-mthumb -march=armv7+fp -mfloat-abi=hard"
-TUNE_PKGARCH_tune-armv7fphard = "armv7fpthf"
+TUNE_PKGARCH:tune-armv7fphard = "armv7fpthf"
 # thumb/v6-m/nofp
 # CFLAGS: -mthumb -march=armv6s-m -mfloat-abi=soft
-DEFAULTTUNE_virtclass-multilib-libv6mnofp = "armv6mnofp"
+DEFAULTTUNE:virtclass-multilib-libv6mnofp = "armv6mnofp"
 # Workaround for this multilib in newlib
 # newlib/libc/sys/arm/trap.S:88: Error: lo register required -- `sub ip,sp,ip
-EXTRA_OECONF_append_pn-libv6mnofp-newlib     = " --disable-newlib-supplied-syscalls"
+EXTRA_OECONF:append:pn-libv6mnofp-newlib     = " --disable-newlib-supplied-syscalls"
 AVAILTUNES += "armv6mnofp"
-PACKAGE_EXTRA_ARCHS_tune-armv6mnofp = "${TUNE_PKGARCH_tune-armv6mnofp}"
+PACKAGE_EXTRA_ARCHS:tune-armv6mnofp = "${TUNE_PKGARCH:tune-armv6mnofp}"
-BASE_LIB_tune-armv6mnofp = "lib/thumb/v6-m/nofp"
+BASE_LIB:tune-armv6mnofp = "lib/thumb/v6-m/nofp"
-TUNE_FEATURES_tune-armv6mnofp ="arm armrm"
+TUNE_FEATURES:tune-armv6mnofp ="arm armrm"
-TUNE_CCARGS_tune-armv6mnofp = "-mthumb -march=armv6s-m -mfloat-abi=soft"
+TUNE_CCARGS:tune-armv6mnofp = "-mthumb -march=armv6s-m -mfloat-abi=soft"
-TUNE_PKGARCH_tune-armv6mnofp = "armv6smt"
+TUNE_PKGARCH:tune-armv6mnofp = "armv6smt"
 # thumb/v7-m/nofp
 # CFLAGS: -mthumb -march=armv7-m -mfloat-abi=soft
-DEFAULTTUNE_virtclass-multilib-libv7mnofp = "armv7mnofp"
+DEFAULTTUNE:virtclass-multilib-libv7mnofp = "armv7mnofp"
 AVAILTUNES += "armv7mnofp"
-PACKAGE_EXTRA_ARCHS_tune-armv7mnofp = "${TUNE_PKGARCH_tune-armv7mnofp}"
+PACKAGE_EXTRA_ARCHS:tune-armv7mnofp = "${TUNE_PKGARCH:tune-armv7mnofp}"
-BASE_LIB_tune-armv7mnofp = "lib/thumb/v7-m/nofp"
+BASE_LIB:tune-armv7mnofp = "lib/thumb/v7-m/nofp"
-TUNE_FEATURES_tune-armv7mnofp ="arm armrm"
+TUNE_FEATURES:tune-armv7mnofp ="arm armrm"
-TUNE_CCARGS_tune-armv7mnofp = "-mthumb -march=armv7-m -mfloat-abi=soft"
+TUNE_CCARGS:tune-armv7mnofp = "-mthumb -march=armv7-m -mfloat-abi=soft"
-TUNE_PKGARCH_tune-armv7mnofp = "armv7mt"
+TUNE_PKGARCH:tune-armv7mnofp = "armv7mt"
 # thumb/v7e-m/nofp
 # CFLAGS: -mthumb -march=armv7e-m -mfloat-abi=soft
-DEFAULTTUNE_virtclass-multilib-libv7emnofp = "armv7emnofp"
+DEFAULTTUNE:virtclass-multilib-libv7emnofp = "armv7emnofp"
 AVAILTUNES += "armv7emnofp"
-PACKAGE_EXTRA_ARCHS_tune-armv7emnofp = "${TUNE_PKGARCH_tune-armv7emnofp}"
+PACKAGE_EXTRA_ARCHS:tune-armv7emnofp = "${TUNE_PKGARCH:tune-armv7emnofp}"
-BASE_LIB_tune-armv7emnofp = "lib/thumb/v7e-m/nofp"
+BASE_LIB:tune-armv7emnofp = "lib/thumb/v7e-m/nofp"
-TUNE_FEATURES_tune-armv7emnofp ="arm armrm"
+TUNE_FEATURES:tune-armv7emnofp ="arm armrm"
-TUNE_CCARGS_tune-armv7emnofp = "-mthumb -march=armv7e-m -mfloat-abi=soft"
+TUNE_CCARGS:tune-armv7emnofp = "-mthumb -march=armv7e-m -mfloat-abi=soft"
-TUNE_PKGARCH_tune-armv7emnofp = "armv7emt"
+TUNE_PKGARCH:tune-armv7emnofp = "armv7emt"
 # thumb/v7e-m+fp/softfp
 # CFLAGS: -mthumb -march=armv7e-m+fp -mfloat-abi=softfp
-DEFAULTTUNE_virtclass-multilib-libv7emfpsoftfp = "armv7emfpsoftfp"
+DEFAULTTUNE:virtclass-multilib-libv7emfpsoftfp = "armv7emfpsoftfp"
 AVAILTUNES += "armv7emfpsoftfp"
-PACKAGE_EXTRA_ARCHS_tune-armv7emfpsoftfp = "${TUNE_PKGARCH_tune-armv7emfpsoftfp}"
+PACKAGE_EXTRA_ARCHS:tune-armv7emfpsoftfp = "${TUNE_PKGARCH:tune-armv7emfpsoftfp}"
-BASE_LIB_tune-armv7emfpsoftfp = "lib/thumb/v7e-m+fp/softfp"
+BASE_LIB:tune-armv7emfpsoftfp = "lib/thumb/v7e-m+fp/softfp"
-TUNE_FEATURES_tune-armv7emfpsoftfp ="arm armrm"
+TUNE_FEATURES:tune-armv7emfpsoftfp ="arm armrm"
-TUNE_CCARGS_tune-armv7emfpsoftfp = "-mthumb -march=armv7e-m+fp -mfloat-abi=softfp"
+TUNE_CCARGS:tune-armv7emfpsoftfp = "-mthumb -march=armv7e-m+fp -mfloat-abi=softfp"
-TUNE_PKGARCH_tune-armv7emfpsoftfp = "armv7emfpt"
+TUNE_PKGARCH:tune-armv7emfpsoftfp = "armv7emfpt"
 # thumb/v7e-m+fp/hard
 # CFLAGS: -mthumb -march=armv7e-m+fp -mfloat-abi=hard
-DEFAULTTUNE_virtclass-multilib-libv7emfphard = "armv7emfphard"
+DEFAULTTUNE:virtclass-multilib-libv7emfphard = "armv7emfphard"
 AVAILTUNES += "armv7emfphard"
-PACKAGE_EXTRA_ARCHS_tune-armv7emfphard = "${TUNE_PKGARCH_tune-armv7emfphard}"
+PACKAGE_EXTRA_ARCHS:tune-armv7emfphard = "${TUNE_PKGARCH:tune-armv7emfphard}"
-BASE_LIB_tune-armv7emfphard = "lib/thumb/v7e-m+fp/hard"
+BASE_LIB:tune-armv7emfphard = "lib/thumb/v7e-m+fp/hard"
-TUNE_FEATURES_tune-armv7emfphard ="arm armrm"
+TUNE_FEATURES:tune-armv7emfphard ="arm armrm"
-TUNE_CCARGS_tune-armv7emfphard = "-mthumb -march=armv7e-m+fp -mfloat-abi=hard"
+TUNE_CCARGS:tune-armv7emfphard = "-mthumb -march=armv7e-m+fp -mfloat-abi=hard"
-TUNE_PKGARCH_tune-armv7emfphard = "armv7emfpthf"
+TUNE_PKGARCH:tune-armv7emfphard = "armv7emfpthf"
 # thumb/v7e-m+dp/softfp
 # CFLAGS: -mthumb -march=armv7e-m+fp.dp -mfloat-abi=softfp
-DEFAULTTUNE_virtclass-multilib-libv7emdpsoftfp = "armv7emdpsoftfp"
+DEFAULTTUNE:virtclass-multilib-libv7emdpsoftfp = "armv7emdpsoftfp"
 AVAILTUNES += "armv7emdpsoftfp"
-PACKAGE_EXTRA_ARCHS_tune-armv7emdpsoftfp = "${TUNE_PKGARCH_tune-armv7emdpsoftfp}"
+PACKAGE_EXTRA_ARCHS:tune-armv7emdpsoftfp = "${TUNE_PKGARCH:tune-armv7emdpsoftfp}"
-BASE_LIB_tune-armv7emdpsoftfp = "lib/thumb/v7e-m+dp/softfp"
+BASE_LIB:tune-armv7emdpsoftfp = "lib/thumb/v7e-m+dp/softfp"
-TUNE_FEATURES_tune-armv7emdpsoftfp ="arm armrm"
+TUNE_FEATURES:tune-armv7emdpsoftfp ="arm armrm"
-TUNE_CCARGS_tune-armv7emdpsoftfp = "-mthumb -march=armv7e-m+fp.dp -mfloat-abi=softfp"
+TUNE_CCARGS:tune-armv7emdpsoftfp = "-mthumb -march=armv7e-m+fp.dp -mfloat-abi=softfp"
-TUNE_PKGARCH_tune-armv7emdpsoftfp = "armv7emdp"
+TUNE_PKGARCH:tune-armv7emdpsoftfp = "armv7emdp"
 # thumb/v7e-m+dp/hard
 # CFLAGS: -mthumb -march=armv7e-m+fp.dp -mfloat-abi=hard
-DEFAULTTUNE_virtclass-multilib-libv7emdphard = "armv7emdphard"
+DEFAULTTUNE:virtclass-multilib-libv7emdphard = "armv7emdphard"
 AVAILTUNES += "armv7emdphard"
-PACKAGE_EXTRA_ARCHS_tune-armv7emdphard = "${TUNE_PKGARCH_tune-armv7emdphard}"
+PACKAGE_EXTRA_ARCHS:tune-armv7emdphard = "${TUNE_PKGARCH:tune-armv7emdphard}"
-BASE_LIB_tune-armv7emdphard = "lib/thumb/v7e-m+dp/hard"
+BASE_LIB:tune-armv7emdphard = "lib/thumb/v7e-m+dp/hard"
-TUNE_FEATURES_tune-armv7emdphard ="arm armrm"
+TUNE_FEATURES:tune-armv7emdphard ="arm armrm"
-TUNE_CCARGS_tune-armv7emdphard = "-mthumb -march=armv7e-m+fp.dp -mfloat-abi=hard"
+TUNE_CCARGS:tune-armv7emdphard = "-mthumb -march=armv7e-m+fp.dp -mfloat-abi=hard"
-TUNE_PKGARCH_tune-armv7emdphard = "armv7emdpthf"
+TUNE_PKGARCH:tune-armv7emdphard = "armv7emdpthf"
 # thumb/v8-m.base/nofp
 # CFLAGS: -mthumb -march=armv8-m.base -mfloat-abi=soft
-DEFAULTTUNE_virtclass-multilib-libv8mbasenofp = "armv8mbasenofp"
+DEFAULTTUNE:virtclass-multilib-libv8mbasenofp = "armv8mbasenofp"
 # Workaround for this multilib in newlib
 # newlib/libc/sys/arm/trap.S:88: Error: lo register required -- `sub ip,sp,ip'
-EXTRA_OECONF_append_pn-libv8mbasenofp-newlib = " --disable-newlib-supplied-syscalls"
+EXTRA_OECONF:append:pn-libv8mbasenofp-newlib = " --disable-newlib-supplied-syscalls"
 AVAILTUNES += "armv8mbasenofp"
-PACKAGE_EXTRA_ARCHS_tune-armv8mbasenofp = "${TUNE_PKGARCH_tune-armv8mbasenofp}"
+PACKAGE_EXTRA_ARCHS:tune-armv8mbasenofp = "${TUNE_PKGARCH:tune-armv8mbasenofp}"
-BASE_LIB_tune-armv8mbasenofp = "lib/thumb/v8-m.base/nofp"
+BASE_LIB:tune-armv8mbasenofp = "lib/thumb/v8-m.base/nofp"
-TUNE_FEATURES_tune-armv8mbasenofp ="arm armrm"
+TUNE_FEATURES:tune-armv8mbasenofp ="arm armrm"
-TUNE_CCARGS_tune-armv8mbasenofp = "-mthumb -march=armv8-m.base -mfloat-abi=soft"
+TUNE_CCARGS:tune-armv8mbasenofp = "-mthumb -march=armv8-m.base -mfloat-abi=soft"
-TUNE_PKGARCH_tune-armv8mbasenofp = "armv8mbaset"
+TUNE_PKGARCH:tune-armv8mbasenofp = "armv8mbaset"
 # thumb/v8-m.main/nofp
 # CFLAGS: -mthumb -march=armv8-m.main -mfloat-abi=soft
-DEFAULTTUNE_virtclass-multilib-libv8mmainnofp = "armv8mmainnofp"
+DEFAULTTUNE:virtclass-multilib-libv8mmainnofp = "armv8mmainnofp"
 AVAILTUNES += "armv8mmainnofp"
-PACKAGE_EXTRA_ARCHS_tune-armv8mmainnofp = "${TUNE_PKGARCH_tune-armv8mmainnofp}"
+PACKAGE_EXTRA_ARCHS:tune-armv8mmainnofp = "${TUNE_PKGARCH:tune-armv8mmainnofp}"
-BASE_LIB_tune-armv8mmainnofp = "lib/thumb/v8-m.main/nofp"
+BASE_LIB:tune-armv8mmainnofp = "lib/thumb/v8-m.main/nofp"
-TUNE_FEATURES_tune-armv8mmainnofp ="arm armrm"
+TUNE_FEATURES:tune-armv8mmainnofp ="arm armrm"
-TUNE_CCARGS_tune-armv8mmainnofp = "-mthumb -march=armv8-m.main -mfloat-abi=soft"
+TUNE_CCARGS:tune-armv8mmainnofp = "-mthumb -march=armv8-m.main -mfloat-abi=soft"
-TUNE_PKGARCH_tune-armv8mmainnofp = "armv8mmaint"
+TUNE_PKGARCH:tune-armv8mmainnofp = "armv8mmaint"
 # thumb/v8-m.main+fp/softfp
 # CFLAGS: -mthumb -march=armv8-m.main+fp -mfloat-abi=softfp
-DEFAULTTUNE_virtclass-multilib-libv8mmainfpsoftfp = "armv8mmainfpsoftfp"
+DEFAULTTUNE:virtclass-multilib-libv8mmainfpsoftfp = "armv8mmainfpsoftfp"
 AVAILTUNES += "armv8mmainfpsoftfp"
-PACKAGE_EXTRA_ARCHS_tune-armv8mmainfpsoftfp = "${TUNE_PKGARCH_tune-armv8mmainfpsoftfp}"
+PACKAGE_EXTRA_ARCHS:tune-armv8mmainfpsoftfp = "${TUNE_PKGARCH:tune-armv8mmainfpsoftfp}"
-BASE_LIB_tune-armv8mmainfpsoftfp = "lib/thumb/v8-m.main+fp/softfp"
+BASE_LIB:tune-armv8mmainfpsoftfp = "lib/thumb/v8-m.main+fp/softfp"
-TUNE_FEATURES_tune-armv8mmainfpsoftfp ="arm armrm"
+TUNE_FEATURES:tune-armv8mmainfpsoftfp ="arm armrm"
-TUNE_CCARGS_tune-armv8mmainfpsoftfp = "-mthumb -march=armv8-m.main+fp -mfloat-abi=softfp"
+TUNE_CCARGS:tune-armv8mmainfpsoftfp = "-mthumb -march=armv8-m.main+fp -mfloat-abi=softfp"
-TUNE_PKGARCH_tune-armv8mmainfpsoftfp = "armv8mmainfpt"
+TUNE_PKGARCH:tune-armv8mmainfpsoftfp = "armv8mmainfpt"
 # thumb/v8-m.main+fp/hard
 # CFLAGS: -mthumb -march=armv8-m.main+fp -mfloat-abi=hard
-DEFAULTTUNE_virtclass-multilib-libv8mmainfphard = "armv8mmainfphard"
+DEFAULTTUNE:virtclass-multilib-libv8mmainfphard = "armv8mmainfphard"
 AVAILTUNES += "armv8mmainfphard"
-PACKAGE_EXTRA_ARCHS_tune-armv8mmainfphard = "${TUNE_PKGARCH_tune-armv8mmainfphard}"
+PACKAGE_EXTRA_ARCHS:tune-armv8mmainfphard = "${TUNE_PKGARCH:tune-armv8mmainfphard}"
-BASE_LIB_tune-armv8mmainfphard = "lib/thumb/v8-m.main+fp/hard"
+BASE_LIB:tune-armv8mmainfphard = "lib/thumb/v8-m.main+fp/hard"
-TUNE_FEATURES_tune-armv8mmainfphard ="arm armrm"
+TUNE_FEATURES:tune-armv8mmainfphard ="arm armrm"
-TUNE_CCARGS_tune-armv8mmainfphard = "-mthumb -march=armv8-m.main+fp -mfloat-abi=hard"
+TUNE_CCARGS:tune-armv8mmainfphard = "-mthumb -march=armv8-m.main+fp -mfloat-abi=hard"
-TUNE_PKGARCH_tune-armv8mmainfphard = "armv8mmainfpthf"
+TUNE_PKGARCH:tune-armv8mmainfphard = "armv8mmainfpthf"
 # thumb/v8-m.main+dp/softfp
 # CFLAGS: -mthumb -march=armv8-m.main+fp.dp -mfloat-abi=softfp
-DEFAULTTUNE_virtclass-multilib-libv8mmaindpsoftfp = "armv8mmaindpsoftfp"
+DEFAULTTUNE:virtclass-multilib-libv8mmaindpsoftfp = "armv8mmaindpsoftfp"
 AVAILTUNES += "armv8mmaindpsoftfp"
-PACKAGE_EXTRA_ARCHS_tune-armv8mmaindpsoftfp = "${TUNE_PKGARCH_tune-armv8mmaindpsoftfp}"
+PACKAGE_EXTRA_ARCHS:tune-armv8mmaindpsoftfp = "${TUNE_PKGARCH:tune-armv8mmaindpsoftfp}"
-BASE_LIB_tune-armv8mmaindpsoftfp = "lib/thumb/v8-m.main+dp/softfp"
+BASE_LIB:tune-armv8mmaindpsoftfp = "lib/thumb/v8-m.main+dp/softfp"
-TUNE_FEATURES_tune-armv8mmaindpsoftfp ="arm armrm"
+TUNE_FEATURES:tune-armv8mmaindpsoftfp ="arm armrm"
-TUNE_CCARGS_tune-armv8mmaindpsoftfp = "-mthumb -march=armv8-m.main+fp.dp -mfloat-abi=softfp"
+TUNE_CCARGS:tune-armv8mmaindpsoftfp = "-mthumb -march=armv8-m.main+fp.dp -mfloat-abi=softfp"
-TUNE_PKGARCH_tune-armv8mmaindpsoftfp = "armv8mmainfpdpt"
+TUNE_PKGARCH:tune-armv8mmaindpsoftfp = "armv8mmainfpdpt"
 # thumb/v8-m.main+dp/hard
 # CFLAGS: -mthumb -march=armv8-m.main+fp.dp -mfloat-abi=hard
-DEFAULTTUNE_virtclass-multilib-libv8mmaindphard = "armv8mmaindphard"
+DEFAULTTUNE:virtclass-multilib-libv8mmaindphard = "armv8mmaindphard"
 AVAILTUNES += "armv8mmaindphard"
-PACKAGE_EXTRA_ARCHS_tune-armv8mmaindphard = "${TUNE_PKGARCH_tune-armv8mmaindphard}"
+PACKAGE_EXTRA_ARCHS:tune-armv8mmaindphard = "${TUNE_PKGARCH:tune-armv8mmaindphard}"
-BASE_LIB_tune-armv8mmaindphard = "lib/thumb/v8-m.main+dp/hard"
+BASE_LIB:tune-armv8mmaindphard = "lib/thumb/v8-m.main+dp/hard"
-TUNE_FEATURES_tune-armv8mmaindphard ="arm armrm"
+TUNE_FEATURES:tune-armv8mmaindphard ="arm armrm"
-TUNE_CCARGS_tune-armv8mmaindphard = "-mthumb -march=armv8-m.main+fp.dp -mfloat-abi=hard"
+TUNE_CCARGS:tune-armv8mmaindphard = "-mthumb -march=armv8-m.main+fp.dp -mfloat-abi=hard"
-TUNE_PKGARCH_tune-armv8mmaindphard = "armv8mmainfpdpthf"
+TUNE_PKGARCH:tune-armv8mmaindphard = "armv8mmainfpdpthf"
diff --git a/meta-xilinx-standalone/conf/machine/microblaze-tc.conf b/meta-xilinx-standalone/conf/machine/microblaze-tc.conf
index bc80ad75..372a8fba 100644
--- a/meta-xilinx-standalone/conf/machine/microblaze-tc.conf
+++ b/meta-xilinx-standalone/conf/machine/microblaze-tc.conf
@@ -7,7 +7,7 @@ INHERIT += "xlnx-standalone"
 PACKAGEQA_EXTRA_MACHDEFFUNCS .= '${@bb.utils.contains("TUNE_FEATURES", "64-bit", " xlnx_mb64_dict", "", d)}'
 # GNU hash style not supported
-LINKER_HASH_STYLE_microblaze = ""
+LINKER_HASH_STYLE:microblaze = ""
 # Define all of the multilibs supproted by this configuration
 MULTILIB_GLOBAL_VARIANTS = "${@extend_variants(d,'MULTILIBS','multilib')}"
@@ -66,476 +66,476 @@ MULTILIBS += "multilib:libmblem64bspmfpd"
 DEFAULTTUNE = "microblaze"
 AVAILTUNES += "microblaze"
-BASE_LIB_tune-microblaze = "lib"
+BASE_LIB:tune-microblaze = "lib"
-TUNE_FEATURES_tune-microblaze = "microblaze bigendian"
+TUNE_FEATURES:tune-microblaze = "microblaze bigendian"
-PACKAGE_EXTRA_ARCHS_tune-microblaze = "${TUNE_PKGARCH}"
+PACKAGE_EXTRA_ARCHS:tune-microblaze = "${TUNE_PKGARCH}"
 # le
 # CFLAGS: -mlittle-endian
-DEFAULTTUNE_virtclass-multilib-libmble = "microblazele"
+DEFAULTTUNE:virtclass-multilib-libmble = "microblazele"
 AVAILTUNES += "microblazele"
-BASE_LIB_tune-microblazele = "lib/le"
+BASE_LIB:tune-microblazele = "lib/le"
-TUNE_FEATURES_tune-microblazele = "microblaze"
+TUNE_FEATURES:tune-microblazele = "microblaze"
-PACKAGE_EXTRA_ARCHS_tune-microblazele = "${TUNE_PKGARCH}"
+PACKAGE_EXTRA_ARCHS:tune-microblazele = "${TUNE_PKGARCH}"
 # bs
 # CFLAGS: -mxl-barrel-shift
-DEFAULTTUNE_virtclass-multilib-libmbbs = "microblazebs"
+DEFAULTTUNE:virtclass-multilib-libmbbs = "microblazebs"
 AVAILTUNES += "microblazebs"
-BASE_LIB_tune-microblazebs = "lib/bs"
+BASE_LIB:tune-microblazebs = "lib/bs"
-TUNE_FEATURES_tune-microblazebs = "microblaze bigendian barrel-shift"
+TUNE_FEATURES:tune-microblazebs = "microblaze bigendian barrel-shift"
-PACKAGE_EXTRA_ARCHS_tune-microblazebs = "${TUNE_PKGARCH}"
+PACKAGE_EXTRA_ARCHS:tune-microblazebs = "${TUNE_PKGARCH}"
 # p
 # CFLAGS: -mxl-pattern-compare
-DEFAULTTUNE_virtclass-multilib-libmbp = "microblazep"
+DEFAULTTUNE:virtclass-multilib-libmbp = "microblazep"
 AVAILTUNES += "microblazep"
-BASE_LIB_tune-microblazep = "lib/p"
+BASE_LIB:tune-microblazep = "lib/p"
-TUNE_FEATURES_tune-microblazep = "microblaze bigendian pattern-compare"
+TUNE_FEATURES:tune-microblazep = "microblaze bigendian pattern-compare"
-PACKAGE_EXTRA_ARCHS_tune-microblazep = "${TUNE_PKGARCH}"
+PACKAGE_EXTRA_ARCHS:tune-microblazep = "${TUNE_PKGARCH}"
 # m
 # CFLAGS: -mno-xl-soft-mul
-DEFAULTTUNE_virtclass-multilib-libmbm = "microblazem"
+DEFAULTTUNE:virtclass-multilib-libmbm = "microblazem"
 AVAILTUNES += "microblazem"
-BASE_LIB_tune-microblazem = "lib/m"
+BASE_LIB:tune-microblazem = "lib/m"
-TUNE_FEATURES_tune-microblazem = "microblaze bigendian multiply-low"
+TUNE_FEATURES:tune-microblazem = "microblaze bigendian multiply-low"
-PACKAGE_EXTRA_ARCHS_tune-microblazem = "${TUNE_PKGARCH}"
+PACKAGE_EXTRA_ARCHS:tune-microblazem = "${TUNE_PKGARCH}"
 # fpd
 # CFLAGS: -mhard-float
-DEFAULTTUNE_virtclass-multilib-libmbfpd = "microblazefpd"
+DEFAULTTUNE:virtclass-multilib-libmbfpd = "microblazefpd"
 AVAILTUNES += "microblazefpd"
-BASE_LIB_tune-microblazefpd = "lib/fpd"
+BASE_LIB:tune-microblazefpd = "lib/fpd"
-TUNE_FEATURES_tune-microblazefpd = "microblaze bigendian fpu-hard"
+TUNE_FEATURES:tune-microblazefpd = "microblaze bigendian fpu-hard"
-PACKAGE_EXTRA_ARCHS_tune-microblazefpd = "${TUNE_PKGARCH}"
+PACKAGE_EXTRA_ARCHS:tune-microblazefpd = "${TUNE_PKGARCH}"
 # m/fpd
 # CFLAGS: -mno-xl-soft-mul -mhard-float
-DEFAULTTUNE_virtclass-multilib-libmbmfpd = "microblazemfpd"
+DEFAULTTUNE:virtclass-multilib-libmbmfpd = "microblazemfpd"
 AVAILTUNES += "microblazemfpd"
-BASE_LIB_tune-microblazemfpd = "lib/m/fpd"
+BASE_LIB:tune-microblazemfpd = "lib/m/fpd"
-TUNE_FEATURES_tune-microblazemfpd = "microblaze bigendian multiply-low fpu-hard"
+TUNE_FEATURES:tune-microblazemfpd = "microblaze bigendian multiply-low fpu-hard"
-PACKAGE_EXTRA_ARCHS_tune-microblazemfpd = "${TUNE_PKGARCH}"
+PACKAGE_EXTRA_ARCHS:tune-microblazemfpd = "${TUNE_PKGARCH}"
 # p/m
 # CFLAGS: -mxl-pattern-compare -mno-xl-soft-mul
-DEFAULTTUNE_virtclass-multilib-libmbpm = "microblazepm"
+DEFAULTTUNE:virtclass-multilib-libmbpm = "microblazepm"
 AVAILTUNES += "microblazepm"
-BASE_LIB_tune-microblazepm = "lib/p/m"
+BASE_LIB:tune-microblazepm = "lib/p/m"
-TUNE_FEATURES_tune-microblazepm = "microblaze bigendian pattern-compare multiply-low"
+TUNE_FEATURES:tune-microblazepm = "microblaze bigendian pattern-compare multiply-low"
-PACKAGE_EXTRA_ARCHS_tune-microblazepm = "${TUNE_PKGARCH}"
+PACKAGE_EXTRA_ARCHS:tune-microblazepm = "${TUNE_PKGARCH}"
 # p/fpd
 # CFLAGS: -mxl-pattern-compare -mhard-float
-DEFAULTTUNE_virtclass-multilib-libmbpfpd = "microblazepfpd"
+DEFAULTTUNE:virtclass-multilib-libmbpfpd = "microblazepfpd"
 AVAILTUNES += "microblazepfpd"
-BASE_LIB_tune-microblazepfpd = "lib/p/fpd"
+BASE_LIB:tune-microblazepfpd = "lib/p/fpd"
-TUNE_FEATURES_tune-microblazepfpd = "microblaze bigendian pattern-compare fpu-hard"
+TUNE_FEATURES:tune-microblazepfpd = "microblaze bigendian pattern-compare fpu-hard"
-PACKAGE_EXTRA_ARCHS_tune-microblazepfpd = "${TUNE_PKGARCH}"
+PACKAGE_EXTRA_ARCHS:tune-microblazepfpd = "${TUNE_PKGARCH}"
 # p/m/fpd
 # CFLAGS: -mxl-pattern-compare -mno-xl-soft-mul -mhard-float
-DEFAULTTUNE_virtclass-multilib-libmbpmfpd = "microblazepmfpd"
+DEFAULTTUNE:virtclass-multilib-libmbpmfpd = "microblazepmfpd"
 AVAILTUNES += "microblazepmfpd"
-BASE_LIB_tune-microblazepmfpd = "lib/p/m/fpd"
+BASE_LIB:tune-microblazepmfpd = "lib/p/m/fpd"
-TUNE_FEATURES_tune-microblazepmfpd = "microblaze bigendian pattern-compare multiply-low fpu-hard"
+TUNE_FEATURES:tune-microblazepmfpd = "microblaze bigendian pattern-compare multiply-low fpu-hard"
-PACKAGE_EXTRA_ARCHS_tune-microblazepmfpd = "${TUNE_PKGARCH}"
+PACKAGE_EXTRA_ARCHS:tune-microblazepmfpd = "${TUNE_PKGARCH}"
 # bs/p
 # CFLAGS: -mxl-barrel-shift -mxl-pattern-compare
-DEFAULTTUNE_virtclass-multilib-libmbbsp = "microblazebsp"
+DEFAULTTUNE:virtclass-multilib-libmbbsp = "microblazebsp"
 AVAILTUNES += "microblazebsp"
-BASE_LIB_tune-microblazebsp = "lib/bs/p"
+BASE_LIB:tune-microblazebsp = "lib/bs/p"
-TUNE_FEATURES_tune-microblazebsp = "microblaze bigendian barrel-shift pattern-compare"
+TUNE_FEATURES:tune-microblazebsp = "microblaze bigendian barrel-shift pattern-compare"
-PACKAGE_EXTRA_ARCHS_tune-microblazebsp = "${TUNE_PKGARCH}"
+PACKAGE_EXTRA_ARCHS:tune-microblazebsp = "${TUNE_PKGARCH}"
 # bs/m
 # CFLAGS: -mxl-barrel-shift -mno-xl-soft-mul
-DEFAULTTUNE_virtclass-multilib-libmbbsm = "microblazebsm"
+DEFAULTTUNE:virtclass-multilib-libmbbsm = "microblazebsm"
 AVAILTUNES += "microblazebsm"
-BASE_LIB_tune-microblazebsm = "lib/bs/m"
+BASE_LIB:tune-microblazebsm = "lib/bs/m"
-TUNE_FEATURES_tune-microblazebsm = "microblaze bigendian barrel-shift multiply-low"
+TUNE_FEATURES:tune-microblazebsm = "microblaze bigendian barrel-shift multiply-low"
-PACKAGE_EXTRA_ARCHS_tune-microblazebsm = "${TUNE_PKGARCH}"
+PACKAGE_EXTRA_ARCHS:tune-microblazebsm = "${TUNE_PKGARCH}"
 # bs/fpd
 # CFLAGS: -mxl-barrel-shift -mhard-float
-DEFAULTTUNE_virtclass-multilib-libmbbsfpd = "microblazebsfpd"
+DEFAULTTUNE:virtclass-multilib-libmbbsfpd = "microblazebsfpd"
 AVAILTUNES += "microblazebsfpd"
-BASE_LIB_tune-microblazebsfpd = "lib/bs/fpd"
+BASE_LIB:tune-microblazebsfpd = "lib/bs/fpd"
-TUNE_FEATURES_tune-microblazebsfpd = "microblaze bigendian barrel-shift fpu-hard"
+TUNE_FEATURES:tune-microblazebsfpd = "microblaze bigendian barrel-shift fpu-hard"
-PACKAGE_EXTRA_ARCHS_tune-microblazebsfpd = "${TUNE_PKGARCH}"
+PACKAGE_EXTRA_ARCHS:tune-microblazebsfpd = "${TUNE_PKGARCH}"
 # bs/m/fpd
 # CFLAGS: -mxl-barrel-shift -mno-xl-soft-mul -mhard-float
-DEFAULTTUNE_virtclass-multilib-libmbbsmfpd = "microblazebsmfpd"
+DEFAULTTUNE:virtclass-multilib-libmbbsmfpd = "microblazebsmfpd"
 AVAILTUNES += "microblazebsmfpd"
-BASE_LIB_tune-microblazebsmfpd = "lib/bs/m/fpd"
+BASE_LIB:tune-microblazebsmfpd = "lib/bs/m/fpd"
-TUNE_FEATURES_tune-microblazebsmfpd = "microblaze bigendian barrel-shift multiply-low fpu-hard"
+TUNE_FEATURES:tune-microblazebsmfpd = "microblaze bigendian barrel-shift multiply-low fpu-hard"
-PACKAGE_EXTRA_ARCHS_tune-microblazebsmfpd = "${TUNE_PKGARCH}"
+PACKAGE_EXTRA_ARCHS:tune-microblazebsmfpd = "${TUNE_PKGARCH}"
 # bs/p/m
 # CFLAGS: -mxl-barrel-shift -mxl-pattern-compare -mno-xl-soft-mul
-DEFAULTTUNE_virtclass-multilib-libmbbspm = "microblazebspm"
+DEFAULTTUNE:virtclass-multilib-libmbbspm = "microblazebspm"
 AVAILTUNES += "microblazebspm"
-BASE_LIB_tune-microblazebspm = "lib/bs/p/m"
+BASE_LIB:tune-microblazebspm = "lib/bs/p/m"
-TUNE_FEATURES_tune-microblazebspm = "microblaze bigendian barrel-shift pattern-compare multiply-low"
+TUNE_FEATURES:tune-microblazebspm = "microblaze bigendian barrel-shift pattern-compare multiply-low"
-PACKAGE_EXTRA_ARCHS_tune-microblazebspm = "${TUNE_PKGARCH}"
+PACKAGE_EXTRA_ARCHS:tune-microblazebspm = "${TUNE_PKGARCH}"
 # bs/p/fpd
 # CFLAGS: -mxl-barrel-shift -mxl-pattern-compare -mhard-float
-DEFAULTTUNE_virtclass-multilib-libmbbspfpd = "microblazebspfpd"
+DEFAULTTUNE:virtclass-multilib-libmbbspfpd = "microblazebspfpd"
 AVAILTUNES += "microblazebspfpd"
-BASE_LIB_tune-microblazebspfpd = "lib/bs/p/fpd"
+BASE_LIB:tune-microblazebspfpd = "lib/bs/p/fpd"
-TUNE_FEATURES_tune-microblazebspfpd = "microblaze bigendian barrel-shift pattern-compare fpu-hard"
+TUNE_FEATURES:tune-microblazebspfpd = "microblaze bigendian barrel-shift pattern-compare fpu-hard"
-PACKAGE_EXTRA_ARCHS_tune-microblazebspfpd = "${TUNE_PKGARCH}"
+PACKAGE_EXTRA_ARCHS:tune-microblazebspfpd = "${TUNE_PKGARCH}"
 # bs/p/m/fpd
 # CFLAGS: -mxl-barrel-shift -mxl-pattern-compare -mno-xl-soft-mul -mhard-float
-DEFAULTTUNE_virtclass-multilib-libmbbspmfpd = "microblazebspmfpd"
+DEFAULTTUNE:virtclass-multilib-libmbbspmfpd = "microblazebspmfpd"
 AVAILTUNES += "microblazebspmfpd"
-BASE_LIB_tune-microblazebspmfpd = "lib/bs/p/m/fpd"
+BASE_LIB:tune-microblazebspmfpd = "lib/bs/p/m/fpd"
-TUNE_FEATURES_tune-microblazebspmfpd = "microblaze bigendian barrel-shift pattern-compare multiply-low fpu-hard"
+TUNE_FEATURES:tune-microblazebspmfpd = "microblaze bigendian barrel-shift pattern-compare multiply-low fpu-hard"
-PACKAGE_EXTRA_ARCHS_tune-microblazebspmfpd = "${TUNE_PKGARCH}"
+PACKAGE_EXTRA_ARCHS:tune-microblazebspmfpd = "${TUNE_PKGARCH}"
 # le/m64
 # CFLAGS: -mlittle-endian -m64
-DEFAULTTUNE_virtclass-multilib-libmblem64 = "microblazele64"
+DEFAULTTUNE:virtclass-multilib-libmblem64 = "microblazele64"
 AVAILTUNES += "microblazele64"
-BASE_LIB_tune-microblazele64 = "lib/le/m64"
+BASE_LIB:tune-microblazele64 = "lib/le/m64"
-TUNE_FEATURES_tune-microblazele64 = "microblaze 64-bit"
+TUNE_FEATURES:tune-microblazele64 = "microblaze 64-bit"
-PACKAGE_EXTRA_ARCHS_tune-microblazele64 = "${TUNE_PKGARCH}"
+PACKAGE_EXTRA_ARCHS:tune-microblazele64 = "${TUNE_PKGARCH}"
 # le/bs
 # CFLAGS: -mlittle-endian -mxl-barrel-shift
-DEFAULTTUNE_virtclass-multilib-libmblebs = "microblazelebs"
+DEFAULTTUNE:virtclass-multilib-libmblebs = "microblazelebs"
 AVAILTUNES += "microblazelebs"
-BASE_LIB_tune-microblazelebs = "lib/le/bs"
+BASE_LIB:tune-microblazelebs = "lib/le/bs"
-TUNE_FEATURES_tune-microblazelebs = "microblaze barrel-shift"
+TUNE_FEATURES:tune-microblazelebs = "microblaze barrel-shift"
-PACKAGE_EXTRA_ARCHS_tune-microblazelebs = "${TUNE_PKGARCH}"
+PACKAGE_EXTRA_ARCHS:tune-microblazelebs = "${TUNE_PKGARCH}"
 # le/p
 # CFLAGS: -mlittle-endian -mxl-pattern-compare
-DEFAULTTUNE_virtclass-multilib-libmblep = "microblazelep"
+DEFAULTTUNE:virtclass-multilib-libmblep = "microblazelep"
 AVAILTUNES += "microblazelep"
-BASE_LIB_tune-microblazelep = "lib/le/p"
+BASE_LIB:tune-microblazelep = "lib/le/p"
-TUNE_FEATURES_tune-microblazelep = "microblaze pattern-compare"
+TUNE_FEATURES:tune-microblazelep = "microblaze pattern-compare"
-PACKAGE_EXTRA_ARCHS_tune-microblazelep = "${TUNE_PKGARCH}"
+PACKAGE_EXTRA_ARCHS:tune-microblazelep = "${TUNE_PKGARCH}"
 # le/m
 # CFLAGS: -mlittle-endian -mno-xl-soft-mul
-DEFAULTTUNE_virtclass-multilib-libmblem = "microblazelem"
+DEFAULTTUNE:virtclass-multilib-libmblem = "microblazelem"
 AVAILTUNES += "microblazelem"
-BASE_LIB_tune-microblazelem = "lib/le/m"
+BASE_LIB:tune-microblazelem = "lib/le/m"
-TUNE_FEATURES_tune-microblazelem = "microblaze multiply-low"
+TUNE_FEATURES:tune-microblazelem = "microblaze multiply-low"
-PACKAGE_EXTRA_ARCHS_tune-microblazelem = "${TUNE_PKGARCH}"
+PACKAGE_EXTRA_ARCHS:tune-microblazelem = "${TUNE_PKGARCH}"
 # le/fpd
 # CFLAGS: -mlittle-endian -mhard-float
-DEFAULTTUNE_virtclass-multilib-libmblefpd = "microblazelefpd"
+DEFAULTTUNE:virtclass-multilib-libmblefpd = "microblazelefpd"
 AVAILTUNES += "microblazelefpd"
-BASE_LIB_tune-microblazelefpd = "lib/le/fpd"
+BASE_LIB:tune-microblazelefpd = "lib/le/fpd"
-TUNE_FEATURES_tune-microblazelefpd = "microblaze fpu-hard"
+TUNE_FEATURES:tune-microblazelefpd = "microblaze fpu-hard"
-PACKAGE_EXTRA_ARCHS_tune-microblazelefpd = "${TUNE_PKGARCH}"
+PACKAGE_EXTRA_ARCHS:tune-microblazelefpd = "${TUNE_PKGARCH}"
 # le/m/fpd
 # CFLAGS: -mlittle-endian -mno-xl-soft-mul -mhard-float
-DEFAULTTUNE_virtclass-multilib-libmblemfpd = "microblazelemfpd"
+DEFAULTTUNE:virtclass-multilib-libmblemfpd = "microblazelemfpd"
 AVAILTUNES += "microblazelemfpd"
-BASE_LIB_tune-microblazelemfpd = "lib/le/m/fpd"
+BASE_LIB:tune-microblazelemfpd = "lib/le/m/fpd"
-TUNE_FEATURES_tune-microblazelemfpd = "microblaze multiply-low fpu-hard"
+TUNE_FEATURES:tune-microblazelemfpd = "microblaze multiply-low fpu-hard"
-PACKAGE_EXTRA_ARCHS_tune-microblazelemfpd = "${TUNE_PKGARCH}"
+PACKAGE_EXTRA_ARCHS:tune-microblazelemfpd = "${TUNE_PKGARCH}"
 # le/p/m
 # CFLAGS: -mlittle-endian -mxl-pattern-compare -mno-xl-soft-mul
-DEFAULTTUNE_virtclass-multilib-libmblepm = "microblazelepm"
+DEFAULTTUNE:virtclass-multilib-libmblepm = "microblazelepm"
 AVAILTUNES += "microblazelepm"
-BASE_LIB_tune-microblazelepm = "lib/le/p/m"
+BASE_LIB:tune-microblazelepm = "lib/le/p/m"
-TUNE_FEATURES_tune-microblazelepm = "microblaze pattern-compare multiply-low"
+TUNE_FEATURES:tune-microblazelepm = "microblaze pattern-compare multiply-low"
-PACKAGE_EXTRA_ARCHS_tune-microblazelepm = "${TUNE_PKGARCH}"
+PACKAGE_EXTRA_ARCHS:tune-microblazelepm = "${TUNE_PKGARCH}"
 # le/p/fpd
 # CFLAGS: -mlittle-endian -mxl-pattern-compare -mhard-float
-DEFAULTTUNE_virtclass-multilib-libmblepfpd = "microblazelepfpd"
+DEFAULTTUNE:virtclass-multilib-libmblepfpd = "microblazelepfpd"
 AVAILTUNES += "microblazelepfpd"
-BASE_LIB_tune-microblazelepfpd = "lib/le/p/fpd"
+BASE_LIB:tune-microblazelepfpd = "lib/le/p/fpd"
-TUNE_FEATURES_tune-microblazelepfpd = "microblaze pattern-compare fpu-hard"
+TUNE_FEATURES:tune-microblazelepfpd = "microblaze pattern-compare fpu-hard"
-PACKAGE_EXTRA_ARCHS_tune-microblazelepfpd = "${TUNE_PKGARCH}"
+PACKAGE_EXTRA_ARCHS:tune-microblazelepfpd = "${TUNE_PKGARCH}"
 # le/p/m/fpd
 # CFLAGS: -mlittle-endian -mxl-pattern-compare -mno-xl-soft-mul -mhard-float
-DEFAULTTUNE_virtclass-multilib-libmblepmfpd = "microblazelepmfpd"
+DEFAULTTUNE:virtclass-multilib-libmblepmfpd = "microblazelepmfpd"
 AVAILTUNES += "microblazelepmfpd"
-BASE_LIB_tune-microblazelepmfpd = "lib/le/p/m/fpd"
+BASE_LIB:tune-microblazelepmfpd = "lib/le/p/m/fpd"
-TUNE_FEATURES_tune-microblazelepmfpd = "microblaze pattern-compare multiply-low fpu-hard"
+TUNE_FEATURES:tune-microblazelepmfpd = "microblaze pattern-compare multiply-low fpu-hard"
-PACKAGE_EXTRA_ARCHS_tune-microblazelepmfpd = "${TUNE_PKGARCH}"
+PACKAGE_EXTRA_ARCHS:tune-microblazelepmfpd = "${TUNE_PKGARCH}"
 # le/bs/p
 # CFLAGS: -mlittle-endian -mxl-barrel-shift -mxl-pattern-compare
-DEFAULTTUNE_virtclass-multilib-libmblebsp = "microblazelebsp"
+DEFAULTTUNE:virtclass-multilib-libmblebsp = "microblazelebsp"
 AVAILTUNES += "microblazelebsp"
-BASE_LIB_tune-microblazelebsp = "lib/le/bs/p"
+BASE_LIB:tune-microblazelebsp = "lib/le/bs/p"
-TUNE_FEATURES_tune-microblazelebsp = "microblaze barrel-shift pattern-compare"
+TUNE_FEATURES:tune-microblazelebsp = "microblaze barrel-shift pattern-compare"
-PACKAGE_EXTRA_ARCHS_tune-microblazelebsp = "${TUNE_PKGARCH}"
+PACKAGE_EXTRA_ARCHS:tune-microblazelebsp = "${TUNE_PKGARCH}"
 # le/bs/m
 # CFLAGS: -mlittle-endian -mxl-barrel-shift -mno-xl-soft-mul
-DEFAULTTUNE_virtclass-multilib-libmblebsm = "microblazelebsm"
+DEFAULTTUNE:virtclass-multilib-libmblebsm = "microblazelebsm"
 AVAILTUNES += "microblazelebsm"
-BASE_LIB_tune-microblazelebsm = "lib/le/bs/m"
+BASE_LIB:tune-microblazelebsm = "lib/le/bs/m"
-TUNE_FEATURES_tune-microblazelebsm = "microblaze barrel-shift multiply-low"
+TUNE_FEATURES:tune-microblazelebsm = "microblaze barrel-shift multiply-low"
-PACKAGE_EXTRA_ARCHS_tune-microblazelebsm = "${TUNE_PKGARCH}"
+PACKAGE_EXTRA_ARCHS:tune-microblazelebsm = "${TUNE_PKGARCH}"
 # le/bs/fpd
 # CFLAGS: -mlittle-endian -mxl-barrel-shift -mhard-float
-DEFAULTTUNE_virtclass-multilib-libmblebsfpd = "microblazelebsfpd"
+DEFAULTTUNE:virtclass-multilib-libmblebsfpd = "microblazelebsfpd"
 AVAILTUNES += "microblazelebsfpd"
-BASE_LIB_tune-microblazelebsfpd = "lib/le/bs/fpd"
+BASE_LIB:tune-microblazelebsfpd = "lib/le/bs/fpd"
-TUNE_FEATURES_tune-microblazelebsfpd = "microblaze barrel-shift fpu-hard"
+TUNE_FEATURES:tune-microblazelebsfpd = "microblaze barrel-shift fpu-hard"
-PACKAGE_EXTRA_ARCHS_tune-microblazelebsfpd = "${TUNE_PKGARCH}"
+PACKAGE_EXTRA_ARCHS:tune-microblazelebsfpd = "${TUNE_PKGARCH}"
 # le/bs/m/fpd
 # CFLAGS: -mlittle-endian -mxl-barrel-shift -mno-xl-soft-mul -mhard-float
-DEFAULTTUNE_virtclass-multilib-libmblebsmfpd = "microblazelebsmfpd"
+DEFAULTTUNE:virtclass-multilib-libmblebsmfpd = "microblazelebsmfpd"
 AVAILTUNES += "microblazelebsmfpd"
-BASE_LIB_tune-microblazelebsmfpd = "lib/le/bs/m/fpd"
+BASE_LIB:tune-microblazelebsmfpd = "lib/le/bs/m/fpd"
-TUNE_FEATURES_tune-microblazelebsmfpd = "microblaze barrel-shift multiply-low fpu-hard"
+TUNE_FEATURES:tune-microblazelebsmfpd = "microblaze barrel-shift multiply-low fpu-hard"
-PACKAGE_EXTRA_ARCHS_tune-microblazelebsmfpd = "${TUNE_PKGARCH}"
+PACKAGE_EXTRA_ARCHS:tune-microblazelebsmfpd = "${TUNE_PKGARCH}"
 # le/bs/p/m
 # CFLAGS: -mlittle-endian -mxl-barrel-shift -mxl-pattern-compare -mno-xl-soft-mul
-DEFAULTTUNE_virtclass-multilib-libmblebspm = "microblazelebspm"
+DEFAULTTUNE:virtclass-multilib-libmblebspm = "microblazelebspm"
 AVAILTUNES += "microblazelebspm"
-BASE_LIB_tune-microblazelebspm = "lib/le/bs/p/m"
+BASE_LIB:tune-microblazelebspm = "lib/le/bs/p/m"
-TUNE_FEATURES_tune-microblazelebspm = "microblaze barrel-shift pattern-compare multiply-low"
+TUNE_FEATURES:tune-microblazelebspm = "microblaze barrel-shift pattern-compare multiply-low"
-PACKAGE_EXTRA_ARCHS_tune-microblazelebspm = "${TUNE_PKGARCH}"
+PACKAGE_EXTRA_ARCHS:tune-microblazelebspm = "${TUNE_PKGARCH}"
 # le/bs/p/fpd
 # CFLAGS: -mlittle-endian -mxl-barrel-shift -mxl-pattern-compare -mhard-float
-DEFAULTTUNE_virtclass-multilib-libmblebspfpd = "microblazelebspfpd"
+DEFAULTTUNE:virtclass-multilib-libmblebspfpd = "microblazelebspfpd"
 AVAILTUNES += "microblazelebspfpd"
-BASE_LIB_tune-microblazelebspfpd = "lib/le/bs/p/fpd"
+BASE_LIB:tune-microblazelebspfpd = "lib/le/bs/p/fpd"
-TUNE_FEATURES_tune-microblazelebspfpd = "microblaze barrel-shift pattern-compare fpu-hard"
+TUNE_FEATURES:tune-microblazelebspfpd = "microblaze barrel-shift pattern-compare fpu-hard"
-PACKAGE_EXTRA_ARCHS_tune-microblazelebspfpd = "${TUNE_PKGARCH}"
+PACKAGE_EXTRA_ARCHS:tune-microblazelebspfpd = "${TUNE_PKGARCH}"
 # le/bs/p/m/fpd
 # CFLAGS: -mlittle-endian -mxl-barrel-shift -mxl-pattern-compare -mno-xl-soft-mul -mhard-float
-DEFAULTTUNE_virtclass-multilib-libmblebspmfpd = "microblazelebspmfpd"
+DEFAULTTUNE:virtclass-multilib-libmblebspmfpd = "microblazelebspmfpd"
 AVAILTUNES += "microblazelebspmfpd"
-BASE_LIB_tune-microblazelebspmfpd = "lib/le/bs/p/m/fpd"
+BASE_LIB:tune-microblazelebspmfpd = "lib/le/bs/p/m/fpd"
-TUNE_FEATURES_tune-microblazelebspmfpd = "microblaze barrel-shift pattern-compare multiply-low fpu-hard"
+TUNE_FEATURES:tune-microblazelebspmfpd = "microblaze barrel-shift pattern-compare multiply-low fpu-hard"
-PACKAGE_EXTRA_ARCHS_tune-microblazelebspmfpd = "${TUNE_PKGARCH}"
+PACKAGE_EXTRA_ARCHS:tune-microblazelebspmfpd = "${TUNE_PKGARCH}"
 # le/m64/bs
 # CFLAGS: -mlittle-endian -m64 -mxl-barrel-shift
-DEFAULTTUNE_virtclass-multilib-libmblem64bs = "microblazele64bs"
+DEFAULTTUNE:virtclass-multilib-libmblem64bs = "microblazele64bs"
 AVAILTUNES += "microblazele64bs"
-BASE_LIB_tune-microblazele64bs = "lib/le/m64/bs"
+BASE_LIB:tune-microblazele64bs = "lib/le/m64/bs"
-TUNE_FEATURES_tune-microblazele64bs = "microblaze 64-bit barrel-shift"
+TUNE_FEATURES:tune-microblazele64bs = "microblaze 64-bit barrel-shift"
-PACKAGE_EXTRA_ARCHS_tune-microblazele64bs = "${TUNE_PKGARCH}"
+PACKAGE_EXTRA_ARCHS:tune-microblazele64bs = "${TUNE_PKGARCH}"
 # le/m64/p
 # CFLAGS: -mlittle-endian -m64 -mxl-pattern-compare
-DEFAULTTUNE_virtclass-multilib-libmblem64p = "microblazele64p"
+DEFAULTTUNE:virtclass-multilib-libmblem64p = "microblazele64p"
 AVAILTUNES += "microblazele64p"
-BASE_LIB_tune-microblazele64p = "lib/le/m64/p"
+BASE_LIB:tune-microblazele64p = "lib/le/m64/p"
-TUNE_FEATURES_tune-microblazele64p = "microblaze 64-bit pattern-compare"
+TUNE_FEATURES:tune-microblazele64p = "microblaze 64-bit pattern-compare"
-PACKAGE_EXTRA_ARCHS_tune-microblazele64p = "${TUNE_PKGARCH}"
+PACKAGE_EXTRA_ARCHS:tune-microblazele64p = "${TUNE_PKGARCH}"
 # le/m64/m
 # CFLAGS: -mlittle-endian -m64 -mno-xl-soft-mul
-DEFAULTTUNE_virtclass-multilib-libmblem64m = "microblazele64m"
+DEFAULTTUNE:virtclass-multilib-libmblem64m = "microblazele64m"
 AVAILTUNES += "microblazele64m"
-BASE_LIB_tune-microblazele64m = "lib/le/m64/m"
+BASE_LIB:tune-microblazele64m = "lib/le/m64/m"
-TUNE_FEATURES_tune-microblazele64m = "microblaze 64-bit multiply-low"
+TUNE_FEATURES:tune-microblazele64m = "microblaze 64-bit multiply-low"
-PACKAGE_EXTRA_ARCHS_tune-microblazele64m = "${TUNE_PKGARCH}"
+PACKAGE_EXTRA_ARCHS:tune-microblazele64m = "${TUNE_PKGARCH}"
 # le/m64/fpd
 # CFLAGS: -mlittle-endian -m64 -mhard-float
-DEFAULTTUNE_virtclass-multilib-libmblem64fpd = "microblazele64fpd"
+DEFAULTTUNE:virtclass-multilib-libmblem64fpd = "microblazele64fpd"
 AVAILTUNES += "microblazele64fpd"
-BASE_LIB_tune-microblazele64fpd = "lib/le/m64/fpd"
+BASE_LIB:tune-microblazele64fpd = "lib/le/m64/fpd"
-TUNE_FEATURES_tune-microblazele64fpd = "microblaze 64-bit fpu-hard"
+TUNE_FEATURES:tune-microblazele64fpd = "microblaze 64-bit fpu-hard"
-PACKAGE_EXTRA_ARCHS_tune-microblazele64fpd = "${TUNE_PKGARCH}"
+PACKAGE_EXTRA_ARCHS:tune-microblazele64fpd = "${TUNE_PKGARCH}"
 # le/m64/m/fpd
 # CFLAGS: -mlittle-endian -m64 -mno-xl-soft-mul -mhard-float
-DEFAULTTUNE_virtclass-multilib-libmblem64mfpd = "microblazele64mfpd"
+DEFAULTTUNE:virtclass-multilib-libmblem64mfpd = "microblazele64mfpd"
 AVAILTUNES += "microblazele64mfpd"
-BASE_LIB_tune-microblazele64mfpd = "lib/le/m64/m/fpd"
+BASE_LIB:tune-microblazele64mfpd = "lib/le/m64/m/fpd"
-TUNE_FEATURES_tune-microblazele64mfpd = "microblaze 64-bit multiply-low fpu-hard"
+TUNE_FEATURES:tune-microblazele64mfpd = "microblaze 64-bit multiply-low fpu-hard"
-PACKAGE_EXTRA_ARCHS_tune-microblazele64mfpd = "${TUNE_PKGARCH}"
+PACKAGE_EXTRA_ARCHS:tune-microblazele64mfpd = "${TUNE_PKGARCH}"
 # le/m64/p/m
 # CFLAGS: -mlittle-endian -m64 -mxl-pattern-compare -mno-xl-soft-mul
-DEFAULTTUNE_virtclass-multilib-libmblem64pm = "microblazele64pm"
+DEFAULTTUNE:virtclass-multilib-libmblem64pm = "microblazele64pm"
 AVAILTUNES += "microblazele64pm"
-BASE_LIB_tune-microblazele64pm = "lib/le/m64/p/m"
+BASE_LIB:tune-microblazele64pm = "lib/le/m64/p/m"
-TUNE_FEATURES_tune-microblazele64pm = "microblaze 64-bit pattern-compare multiply-low"
+TUNE_FEATURES:tune-microblazele64pm = "microblaze 64-bit pattern-compare multiply-low"
-PACKAGE_EXTRA_ARCHS_tune-microblazele64pm = "${TUNE_PKGARCH}"
+PACKAGE_EXTRA_ARCHS:tune-microblazele64pm = "${TUNE_PKGARCH}"
 # le/m64/p/fpd
 # CFLAGS: -mlittle-endian -m64 -mxl-pattern-compare -mhard-float
-DEFAULTTUNE_virtclass-multilib-libmblem64pfpd = "microblazele64pfpd"
+DEFAULTTUNE:virtclass-multilib-libmblem64pfpd = "microblazele64pfpd"
 AVAILTUNES += "microblazele64pfpd"
-BASE_LIB_tune-microblazele64pfpd = "lib/le/m64/p/fpd"
+BASE_LIB:tune-microblazele64pfpd = "lib/le/m64/p/fpd"
-TUNE_FEATURES_tune-microblazele64pfpd = "microblaze 64-bit pattern-compare fpu-hard"
+TUNE_FEATURES:tune-microblazele64pfpd = "microblaze 64-bit pattern-compare fpu-hard"
-PACKAGE_EXTRA_ARCHS_tune-microblazele64pfpd = "${TUNE_PKGARCH}"
+PACKAGE_EXTRA_ARCHS:tune-microblazele64pfpd = "${TUNE_PKGARCH}"
 # le/m64/p/m/fpd
 # CFLAGS: -mlittle-endian -m64 -mxl-pattern-compare -mno-xl-soft-mul -mhard-float
-DEFAULTTUNE_virtclass-multilib-libmblem64pmfpd = "microblazele64pmfpd"
+DEFAULTTUNE:virtclass-multilib-libmblem64pmfpd = "microblazele64pmfpd"
 AVAILTUNES += "microblazele64pmfpd"
-BASE_LIB_tune-microblazele64pmfpd = "lib/le/m64/p/m/fpd"
+BASE_LIB:tune-microblazele64pmfpd = "lib/le/m64/p/m/fpd"
-TUNE_FEATURES_tune-microblazele64pmfpd = "microblaze 64-bit pattern-compare multiply-low fpu-hard"
+TUNE_FEATURES:tune-microblazele64pmfpd = "microblaze 64-bit pattern-compare multiply-low fpu-hard"
-PACKAGE_EXTRA_ARCHS_tune-microblazele64pmfpd = "${TUNE_PKGARCH}"
+PACKAGE_EXTRA_ARCHS:tune-microblazele64pmfpd = "${TUNE_PKGARCH}"
 # le/m64/bs/p
 # CFLAGS: -mlittle-endian -m64 -mxl-barrel-shift -mxl-pattern-compare
-DEFAULTTUNE_virtclass-multilib-libmblem64bsp = "microblazele64bsp"
+DEFAULTTUNE:virtclass-multilib-libmblem64bsp = "microblazele64bsp"
 AVAILTUNES += "microblazele64bsp"
-BASE_LIB_tune-microblazele64bsp = "lib/le/m64/bs/p"
+BASE_LIB:tune-microblazele64bsp = "lib/le/m64/bs/p"
-TUNE_FEATURES_tune-microblazele64bsp = "microblaze 64-bit barrel-shift pattern-compare"
+TUNE_FEATURES:tune-microblazele64bsp = "microblaze 64-bit barrel-shift pattern-compare"
-PACKAGE_EXTRA_ARCHS_tune-microblazele64bsp = "${TUNE_PKGARCH}"
+PACKAGE_EXTRA_ARCHS:tune-microblazele64bsp = "${TUNE_PKGARCH}"
 # le/m64/bs/m
 # CFLAGS: -mlittle-endian -m64 -mxl-barrel-shift -mno-xl-soft-mul
-DEFAULTTUNE_virtclass-multilib-libmblem64bsm = "microblazele64bsm"
+DEFAULTTUNE:virtclass-multilib-libmblem64bsm = "microblazele64bsm"
 AVAILTUNES += "microblazele64bsm"
-BASE_LIB_tune-microblazele64bsm = "lib/le/m64/bs/m"
+BASE_LIB:tune-microblazele64bsm = "lib/le/m64/bs/m"
-TUNE_FEATURES_tune-microblazele64bsm = "microblaze 64-bit barrel-shift multiply-low"
+TUNE_FEATURES:tune-microblazele64bsm = "microblaze 64-bit barrel-shift multiply-low"
-PACKAGE_EXTRA_ARCHS_tune-microblazele64bsm = "${TUNE_PKGARCH}"
+PACKAGE_EXTRA_ARCHS:tune-microblazele64bsm = "${TUNE_PKGARCH}"
 # le/m64/bs/fpd
 # CFLAGS: -mlittle-endian -m64 -mxl-barrel-shift -mhard-float
-DEFAULTTUNE_virtclass-multilib-libmblem64bsfpd = "microblazele64bsfpd"
+DEFAULTTUNE:virtclass-multilib-libmblem64bsfpd = "microblazele64bsfpd"
 AVAILTUNES += "microblazele64bsfpd"
-BASE_LIB_tune-microblazele64bsfpd = "lib/le/m64/bs/fpd"
+BASE_LIB:tune-microblazele64bsfpd = "lib/le/m64/bs/fpd"
-TUNE_FEATURES_tune-microblazele64bsfpd = "microblaze 64-bit barrel-shift fpu-hard"
+TUNE_FEATURES:tune-microblazele64bsfpd = "microblaze 64-bit barrel-shift fpu-hard"
-PACKAGE_EXTRA_ARCHS_tune-microblazele64bsfpd = "${TUNE_PKGARCH}"
+PACKAGE_EXTRA_ARCHS:tune-microblazele64bsfpd = "${TUNE_PKGARCH}"
 # le/m64/bs/m/fpd
 # CFLAGS: -mlittle-endian -m64 -mxl-barrel-shift -mno-xl-soft-mul -mhard-float
-DEFAULTTUNE_virtclass-multilib-libmblem64bsmfpd = "microblazele64bsmfpd"
+DEFAULTTUNE:virtclass-multilib-libmblem64bsmfpd = "microblazele64bsmfpd"
 AVAILTUNES += "microblazele64bsmfpd"
-BASE_LIB_tune-microblazele64bsmfpd = "lib/le/m64/bs/m/fpd"
+BASE_LIB:tune-microblazele64bsmfpd = "lib/le/m64/bs/m/fpd"
-TUNE_FEATURES_tune-microblazele64bsmfpd = "microblaze 64-bit barrel-shift multiply-low fpu-hard"
+TUNE_FEATURES:tune-microblazele64bsmfpd = "microblaze 64-bit barrel-shift multiply-low fpu-hard"
-PACKAGE_EXTRA_ARCHS_tune-microblazele64bsmfpd = "${TUNE_PKGARCH}"
+PACKAGE_EXTRA_ARCHS:tune-microblazele64bsmfpd = "${TUNE_PKGARCH}"
 # le/m64/bs/p/m
 # CFLAGS: -mlittle-endian -m64 -mxl-barrel-shift -mxl-pattern-compare -mno-xl-soft-mul
-DEFAULTTUNE_virtclass-multilib-libmblem64bspm = "microblazele64bspm"
+DEFAULTTUNE:virtclass-multilib-libmblem64bspm = "microblazele64bspm"
 AVAILTUNES += "microblazele64bspm"
-BASE_LIB_tune-microblazele64bspm = "lib/le/m64/bs/p/m"
+BASE_LIB:tune-microblazele64bspm = "lib/le/m64/bs/p/m"
-TUNE_FEATURES_tune-microblazele64bspm = "microblaze 64-bit barrel-shift pattern-compare multiply-low"
+TUNE_FEATURES:tune-microblazele64bspm = "microblaze 64-bit barrel-shift pattern-compare multiply-low"
-PACKAGE_EXTRA_ARCHS_tune-microblazele64bspm = "${TUNE_PKGARCH}"
+PACKAGE_EXTRA_ARCHS:tune-microblazele64bspm = "${TUNE_PKGARCH}"
 # le/m64/bs/p/fpd
 # CFLAGS: -mlittle-endian -m64 -mxl-barrel-shift -mxl-pattern-compare -mhard-float
-DEFAULTTUNE_virtclass-multilib-libmblem64bspfpd = "microblazele64bspfpd"
+DEFAULTTUNE:virtclass-multilib-libmblem64bspfpd = "microblazele64bspfpd"
 AVAILTUNES += "microblazele64bspfpd"
-BASE_LIB_tune-microblazele64bspfpd = "lib/le/m64/bs/p/fpd"
+BASE_LIB:tune-microblazele64bspfpd = "lib/le/m64/bs/p/fpd"
-TUNE_FEATURES_tune-microblazele64bspfpd = "microblaze 64-bit barrel-shift pattern-compare fpu-hard"
+TUNE_FEATURES:tune-microblazele64bspfpd = "microblaze 64-bit barrel-shift pattern-compare fpu-hard"
-PACKAGE_EXTRA_ARCHS_tune-microblazele64bspfpd = "${TUNE_PKGARCH}"
+PACKAGE_EXTRA_ARCHS:tune-microblazele64bspfpd = "${TUNE_PKGARCH}"
 # le/m64/bs/p/m/fpd
 # CFLAGS: -mlittle-endian -m64 -mxl-barrel-shift -mxl-pattern-compare -mno-xl-soft-mul -mhard-float
-DEFAULTTUNE_virtclass-multilib-libmblem64bspmfpd = "microblazele64bspmfpd"
+DEFAULTTUNE:virtclass-multilib-libmblem64bspmfpd = "microblazele64bspmfpd"
 AVAILTUNES += "microblazele64bspmfpd"
-BASE_LIB_tune-microblazele64bspmfpd = "lib/le/m64/bs/p/m/fpd"
+BASE_LIB:tune-microblazele64bspmfpd = "lib/le/m64/bs/p/m/fpd"
-TUNE_FEATURES_tune-microblazele64bspmfpd = "microblaze 64-bit barrel-shift pattern-compare multiply-low fpu-hard"
+TUNE_FEATURES:tune-microblazele64bspmfpd = "microblaze 64-bit barrel-shift pattern-compare multiply-low fpu-hard"
-PACKAGE_EXTRA_ARCHS_tune-microblazele64bspmfpd = "${TUNE_PKGARCH}"
+PACKAGE_EXTRA_ARCHS:tune-microblazele64bspmfpd = "${TUNE_PKGARCH}"
diff --git a/meta-xilinx-standalone/conf/machine/microblaze-versal-fw.conf b/meta-xilinx-standalone/conf/machine/microblaze-versal-fw.conf
index 30e24c33..fecbf1b2 100644
--- a/meta-xilinx-standalone/conf/machine/microblaze-versal-fw.conf
+++ b/meta-xilinx-standalone/conf/machine/microblaze-versal-fw.conf
@@ -5,7 +5,7 @@ DEFAULTTUNE ?= "microblaze"
 require conf/machine/versal-generic.conf
 AVAILTUNES += "microblaze"
-TUNE_FEATURES_tune-microblaze = "microblaze v10.0 barrel-shift pattern-compare fpu-soft"
+TUNE_FEATURES:tune-microblaze = "microblaze v10.0 barrel-shift pattern-compare fpu-soft"
-PACKAGE_EXTRA_ARCHS_tune-microblaze = "${TUNE_PKGARCH}"
+PACKAGE_EXTRA_ARCHS:tune-microblaze = "${TUNE_PKGARCH}"
-LINKER_HASH_STYLE_microblaze = ""
+LINKER_HASH_STYLE:microblaze = ""
diff --git a/meta-xilinx-standalone/conf/machine/microblaze-zynqmp-pmu.conf b/meta-xilinx-standalone/conf/machine/microblaze-zynqmp-pmu.conf
index e1d26849..9df63e61 100644
--- a/meta-xilinx-standalone/conf/machine/microblaze-zynqmp-pmu.conf
+++ b/meta-xilinx-standalone/conf/machine/microblaze-zynqmp-pmu.conf
@@ -7,7 +7,7 @@ require conf/machine/zynqmp-generic.conf
 # Endianess, multiplier, barrel shift, pattern compare, floating point double or single, are the possibilities
 AVAILTUNES += "microblaze"
-TUNE_FEATURES_tune-microblaze = "microblaze v9.2 barrel-shift pattern-compare reorder fpu-soft"
+TUNE_FEATURES:tune-microblaze = "microblaze v9.2 barrel-shift pattern-compare reorder fpu-soft"
-PACKAGE_EXTRA_ARCHS_tune-microblaze = "${TUNE_PKGARCH}"
+PACKAGE_EXTRA_ARCHS:tune-microblaze = "${TUNE_PKGARCH}"
-LINKER_HASH_STYLE_microblaze = ""
+LINKER_HASH_STYLE:microblaze = ""
diff --git a/meta-xilinx-standalone/conf/multiconfig/versal-fw.conf b/meta-xilinx-standalone/conf/multiconfig/versal-fw.conf
index f1a6cab0..3629b373 100644
--- a/meta-xilinx-standalone/conf/multiconfig/versal-fw.conf
+++ b/meta-xilinx-standalone/conf/multiconfig/versal-fw.conf
@@ -1,8 +1,8 @@
 # To be used with a versal machine
 # Re-use the main machine, which SHOULD allow us to override the default tune!
 DEFAULTTUNE = "microblaze"
-TUNE_FEATURES_tune-microblaze = "microblaze v10.0 barrel-shift pattern-compare fpu-soft"
+TUNE_FEATURES:tune-microblaze = "microblaze v10.0 barrel-shift pattern-compare fpu-soft"
-#LINKER_HASH_STYLE_microblaze = ""
+#LINKER_HASH_STYLE:microblaze = ""
 DISTRO = "xilinx-standalone"
diff --git a/meta-xilinx-standalone/conf/multiconfig/zynqmp-pmufw.conf b/meta-xilinx-standalone/conf/multiconfig/zynqmp-pmufw.conf
index 618c3c2d..17d8a6a3 100644
--- a/meta-xilinx-standalone/conf/multiconfig/zynqmp-pmufw.conf
+++ b/meta-xilinx-standalone/conf/multiconfig/zynqmp-pmufw.conf
@@ -1,8 +1,8 @@
 # To be used with a zynqmp machine
 # Re-use the main machine, which SHOULD allow us to override the default tune!
 DEFAULTTUNE = "microblaze"
-TUNE_FEATURES_tune-microblaze = "microblaze v9.2 barrel-shift pattern-compare reorder fpu-soft"
+TUNE_FEATURES:tune-microblaze = "microblaze v9.2 barrel-shift pattern-compare reorder fpu-soft"
-#LINKER_HASH_STYLE_microblaze = ""
+#LINKER_HASH_STYLE:microblaze = ""
 DISTRO = "xilinx-standalone"
diff --git a/meta-xilinx-standalone/recipes-bsp/device-tree/device-tree.bbappend b/meta-xilinx-standalone/recipes-bsp/device-tree/device-tree.bbappend
index e6d1e65d..013f0401 100644
--- a/meta-xilinx-standalone/recipes-bsp/device-tree/device-tree.bbappend
+++ b/meta-xilinx-standalone/recipes-bsp/device-tree/device-tree.bbappend
@@ -2,12 +2,12 @@ COMPATIBLE_HOST_xilinx-standalone = "${HOST_SYS}"
 COMPATIBLE_MACHINE_cortexa53-zynqmp = ".*"
 COMPATIBLE_MACHINE_cortexr5-zynqmp = ".*"
-COMPATIBLE_MACHINE_microblaze-pmu = ".*"
+COMPATIBLE_MACHINE:microblaze-pmu = ".*"
-COMPATIBLE_MACHINE_microblaze-plm = ".*"
+COMPATIBLE_MACHINE:microblaze-plm = ".*"
 COMPATIBLE_MACHINE_cortexa72-versal = ".*"
 COMPATIBLE_MACHINE_cortexr5-versal = ".*"
 COMPATIBLE_MACHINE_cortexa9-zynq = ".*"
 # Enable @ flag on dtc which is required by libxil
-DTC_FLAGS_append_xilinx-standalone = " -@"
+DTC_FLAGS:append_xilinx-standalone = " -@"
-DT_INCLUDE_append_xilinx-standalone = " ${WORKDIR}/git/device_tree/data/kernel_dtsi/${XILINX_RELEASE_VERSION}/include/"
+DT_INCLUDE:append_xilinx-standalone = " ${WORKDIR}/git/device_tree/data/kernel_dtsi/${XILINX_RELEASE_VERSION}/include/"
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware.inc
index 2e1b6c6a..03292633 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware.inc
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware.inc
@@ -4,8 +4,8 @@ inherit xlnx-embeddedsw deploy
 COMPATIBLE_HOST = ".*-(elf|eabi)"
 COMPATIBLE_MACHINE = "none"
-COMPATIBLE_MACHINE_zynq = ".*"
+COMPATIBLE_MACHINE:zynq = ".*"
-COMPATIBLE_MACHINE_zynqmp = ".*"
+COMPATIBLE_MACHINE:zynqmp = ".*"
 # Specify a default in case boardvariant isn't available
 BOARDVARIANT_ARCH ??= "${MACHINE_ARCH}"
@@ -14,8 +14,8 @@ PACKAGE_ARCH = "${BOARDVARIANT_ARCH}"
 S = "${WORKDIR}/git"
 APP_DIR = "undefined"
-APP_DIR_zynq = "zynq_fsbl"
+APP_DIR:zynq = "zynq_fsbl"
-APP_DIR_zynqmp = "zynqmp_fsbl"
+APP_DIR:zynqmp = "zynqmp_fsbl"
 B = "${S}/lib/sw_apps/${APP_DIR}/src"
@@ -32,8 +32,8 @@ EXTRA_COMPILER_FLAGS = "-g -Wall -Wextra -Os -flto -ffat-lto-objects"
 ARCHIVER = "${AR}"
 BSP_DIR ?= "${B}/../misc/undefined"
-BSP_DIR_zynq   ?= "${B}/../misc/zynq_fsbl_bsp"
+BSP_DIR:zynq   ?= "${B}/../misc/zynq_fsbl_bsp"
-BSP_DIR_zynqmp ?= "${B}/../misc/zynqmp_fsbl_bsp"
+BSP_DIR:zynqmp ?= "${B}/../misc/zynqmp_fsbl_bsp"
 BSP_TARGETS_DIR ?= "${BSP_DIR}/psu_cortexa53_0/libsrc"
 # FSBL components expect AS to be CC.
@@ -47,7 +47,7 @@ def bsp_make_vars(d):
 EXTRA_OEMAKE = "${@bsp_make_vars(d)}"
-ARM_INSTRUCTION_SET_eabi_arm = "arm"
+ARM_INSTRUCTION_SET:eabi:arm = "arm"
 do_compile() {
    oe_runmake
 }
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2021.2.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2021.2.bb
index f6fbf8b2..3f9740a0 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2021.2.bb
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_2021.2.bb
@@ -8,4 +8,4 @@ SRC_URI += " \
           "
 # This version does not build for zynq
-COMPATIBLE_MACHINE_zynq = "none"
+COMPATIBLE_MACHINE:zynq = "none"
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_git.bb b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_git.bb
index 65cb3433..697431ad 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_git.bb
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware_git.bb
@@ -10,4 +10,4 @@ SRC_URI += " \
           "
 # This version does not build for zynq
-COMPATIBLE_MACHINE_zynq = "none"
+COMPATIBLE_MACHINE:zynq = "none"
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware.inc
index 02687da3..08f4b4e1 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware.inc
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware.inc
@@ -5,7 +5,7 @@ inherit xlnx-embeddedsw deploy
 COMPATIBLE_HOST = "microblaze.*-elf"
 COMPATIBLE_MACHINE = "none"
-COMPATIBLE_MACHINE_versal = ".*"
+COMPATIBLE_MACHINE:versal = ".*"
 # Specify a default in case boardvariant isn't available
 BOARDVARIANT_ARCH ??= "${MACHINE_ARCH}"
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware.inc
index 81fc0774..9912fa0b 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware.inc
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware.inc
@@ -4,7 +4,7 @@ inherit xlnx-embeddedsw deploy
 COMPATIBLE_HOST = "microblaze.*-elf"
 COMPATIBLE_MACHINE = "none"
-COMPATIBLE_MACHINE_zynqmp = ".*"
+COMPATIBLE_MACHINE:zynqmp = ".*"
 # Specify a default in case boardvariant isn't available
 BOARDVARIANT_ARCH ??= "${MACHINE_ARCH}"
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware.inc
index 3ba47bb5..806592c2 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware.inc
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware.inc
@@ -5,7 +5,7 @@ inherit xlnx-embeddedsw deploy
 COMPATIBLE_HOST = "microblaze.*-elf"
 COMPATIBLE_MACHINE = "none"
-COMPATIBLE_MACHINE_versal = ".*"
+COMPATIBLE_MACHINE:versal = ".*"
 # Specify a default in case boardvariant isn't available
 BOARDVARIANT_ARCH ??= "${MACHINE_ARCH}"
diff --git a/meta-xilinx-standalone/recipes-core/meta/gnu-toolchain-canadian.bb b/meta-xilinx-standalone/recipes-core/meta/gnu-toolchain-canadian.bb
index ca8885b8..8b323c41 100644
--- a/meta-xilinx-standalone/recipes-core/meta/gnu-toolchain-canadian.bb
+++ b/meta-xilinx-standalone/recipes-core/meta/gnu-toolchain-canadian.bb
@@ -19,7 +19,7 @@ do_install () {
 INHIBIT_DEFAULT_DEPS = "1"
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
-FILES_${PN} = "${bindir}"
+FILES:${PN} = "${bindir}"
 PACKAGES = "${PN}"
diff --git a/meta-xilinx-standalone/recipes-core/newlib/libgloss_4.%.bbappend b/meta-xilinx-standalone/recipes-core/newlib/libgloss_4.%.bbappend
index 646d0e9a..0301c572 100644
--- a/meta-xilinx-standalone/recipes-core/newlib/libgloss_4.%.bbappend
+++ b/meta-xilinx-standalone/recipes-core/newlib/libgloss_4.%.bbappend
@@ -1,10 +1,10 @@
 COMPATIBLE_HOST = ".*-elf"
-COMPATIBLE_HOST_arm = "[^-]*-[^-]*-eabi"
+COMPATIBLE_HOST:arm = "[^-]*-[^-]*-eabi"
 # When building multiple, we need to depend on the multilib newlib
-DEPENDS_append_xilinx-standalone = " ${MLPREFIX}newlib"
+DEPENDS:append_xilinx-standalone = " ${MLPREFIX}newlib"
-EXTRA_OECONF_append_xilinx-standalone = " \
+EXTRA_OECONF:append_xilinx-standalone = " \
        --enable-newlib-io-c99-formats \
        --enable-newlib-io-long-long \
        --enable-newlib-io-float \
diff --git a/meta-xilinx-standalone/recipes-core/newlib/newlib_4.%.bbappend b/meta-xilinx-standalone/recipes-core/newlib/newlib_4.%.bbappend
index 90522cfb..0d958f68 100644
--- a/meta-xilinx-standalone/recipes-core/newlib/newlib_4.%.bbappend
+++ b/meta-xilinx-standalone/recipes-core/newlib/newlib_4.%.bbappend
@@ -1,7 +1,7 @@
 COMPATIBLE_HOST = ".*-elf"
-COMPATIBLE_HOST_arm = "[^-]*-[^-]*-eabi"
+COMPATIBLE_HOST:arm = "[^-]*-[^-]*-eabi"
-EXTRA_OECONF_append_xilinx-standalone = " \
+EXTRA_OECONF:append_xilinx-standalone = " \
        --enable-newlib-io-c99-formats \
        --enable-newlib-io-long-long \
        --enable-newlib-io-float \
@@ -9,12 +9,12 @@ EXTRA_OECONF_append_xilinx-standalone = " \
 "
 # Avoid trimmping CCARGS from CC by newlib configure
-do_configure_prepend_xilinx-standalone(){
+do_configure:prepend_xilinx-standalone(){
    export CC_FOR_TARGET="${CC}"
 }
 # Fix for multilib newlib installations
-do_install_prepend_xilinx-standalone() {
+do_install:prepend_xilinx-standalone() {
        mkdir -p $(dirname ${D}${libdir})
        mkdir -p $(dirname ${D}${includedir})
 }
diff --git a/meta-xilinx-standalone/recipes-core/packagegroups/packagegroup-cross-canadian.bbappend b/meta-xilinx-standalone/recipes-core/packagegroups/packagegroup-cross-canadian.bbappend
index 456ec6c1..1df5430f 100644
--- a/meta-xilinx-standalone/recipes-core/packagegroups/packagegroup-cross-canadian.bbappend
+++ b/meta-xilinx-standalone/recipes-core/packagegroups/packagegroup-cross-canadian.bbappend
@@ -5,7 +5,7 @@
 GNUTCLINKS = "gnu-toolchain-canadian-${TARGET_SYS}"
 # Without the := the eval during do_package is occasionally missing multilibs
-RDEPENDS_${PN}_xilinx-standalone := " \
+RDEPENDS:${PN}_xilinx-standalone := " \
    ${@all_multilib_tune_values(d, 'GNUTCLINKS')} \
    ${BINUTILS} \
    ${GCC} \
diff --git a/meta-xilinx-standalone/recipes-core/packagegroups/packagegroup-newlib-standalone-sdk-target.bb b/meta-xilinx-standalone/recipes-core/packagegroups/packagegroup-newlib-standalone-sdk-target.bb
index b64554d3..5534e1d9 100644
--- a/meta-xilinx-standalone/recipes-core/packagegroups/packagegroup-newlib-standalone-sdk-target.bb
+++ b/meta-xilinx-standalone/recipes-core/packagegroups/packagegroup-newlib-standalone-sdk-target.bb
@@ -6,7 +6,7 @@ PACKAGE_ARCH = "${TUNE_PKGARCH}"
 inherit packagegroup
-RDEPENDS_${PN} = "\
+RDEPENDS:${PN} = "\
    libgcc-dev \
    libstdc++-dev \
    ${LIBC_DEPENDENCIES} \
diff --git a/meta-xilinx-standalone/recipes-devtools/binutils/binutils-xilinx-standalone.inc b/meta-xilinx-standalone/recipes-devtools/binutils/binutils-xilinx-standalone.inc
index ac569736..0d647c31 100644
--- a/meta-xilinx-standalone/recipes-devtools/binutils/binutils-xilinx-standalone.inc
+++ b/meta-xilinx-standalone/recipes-devtools/binutils/binutils-xilinx-standalone.inc
@@ -1,7 +1,7 @@
 LDGOLD_xilinx-standalone = ""
 LDGOLD_ALTS_xilinx-standalone = ""
-EXTRA_OECONF_append_xilinx-standalone = " \
+EXTRA_OECONF:append_xilinx-standalone = " \
        --disable-gprof \
        --disable-shared \
        --enable-lto \
@@ -10,10 +10,10 @@ EXTRA_OECONF_append_xilinx-standalone = " \
 "
 # CortexR5 and 32-bit arm are both "arm"
-EXTRA_OECONF_append_xilinx-standalone_arm = " \
+EXTRA_OECONF:append_xilinx-standalone:arm = " \
        --enable-interwork \
 "
-EXTRA_OECONF_append_xilinx-standalone_microblaze = " \
+EXTRA_OECONF:append_xilinx-standalone:microblaze = " \
        --disable-initfini-array \
 "
diff --git a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-configure-xilinx-standalone.inc b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-configure-xilinx-standalone.inc
index b9bfe83d..dcc82297 100644
--- a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-configure-xilinx-standalone.inc
+++ b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-configure-xilinx-standalone.inc
@@ -2,6 +2,6 @@
 LINKER_HASH_STYLE_xilinx-standalone = ""
 SYMVERS_CONF_xilinx-standalone = ""
-EXTRA_OECONF_append_xilinx-standalone_microblaze = " --disable-initfini_array"
+EXTRA_OECONF:append_xilinx-standalone:microblaze = " --disable-initfini_array"
-EXTRA_OECONF_append_xilinx-standalone_microblaze = " --disable-__cxa_atexit"
+EXTRA_OECONF:append_xilinx-standalone:microblaze = " --disable-__cxa_atexit"
diff --git a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-cross-canadian_%.bbappend b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-cross-canadian_%.bbappend
index 15234848..50681be2 100644
--- a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-cross-canadian_%.bbappend
+++ b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-cross-canadian_%.bbappend
@@ -4,7 +4,7 @@ require gcc-xilinx-standalone.inc
 # We want to use the stock multilib configs, when available
 EXTRACONFFUNCS_xilinx-standalone = ""
-EXTRA_OECONF_append_xilinx-standalone = " \
+EXTRA_OECONF:append_xilinx-standalone = " \
        --enable-multilib \
 "
diff --git a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-runtime_%.bbappend b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-runtime_%.bbappend
index 7057a057..ecfb8bb3 100644
--- a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-runtime_%.bbappend
+++ b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-runtime_%.bbappend
@@ -2,7 +2,7 @@ require gcc-configure-xilinx-standalone.inc
 COMPATIBLE_HOST = "${HOST_SYS}"
-EXTRA_OECONF_append_xilinx-standalone_class-target = " \
+EXTRA_OECONF:append_xilinx-standalone:class-target = " \
        --disable-libstdcxx-pch \
        --with-newlib \
        --disable-threads \
@@ -11,7 +11,7 @@ EXTRA_OECONF_append_xilinx-standalone_class-target = " \
        --disable-libitm \
 "
-EXTRA_OECONF_append_xilinx-standalone_aarch64_class-target = " \
+EXTRA_OECONF:append_xilinx-standalone:aarch64:class-target = " \
        --disable-multiarch \
        --with-arch=armv8-a \
        "
@@ -19,18 +19,18 @@ EXTRA_OECONF_append_xilinx-standalone_aarch64_class-target = " \
 # Both arm and armrm overrides are set w/ cortex r5
 # So only set rmprofile if armrm is defined.
 ARM_PROFILE = "aprofile"
-ARM_PROFILE_armrm = "rmprofile"
+ARM_PROFILE:armrm = "rmprofile"
-EXTRA_OECONF_append_xilinx-standalone_arm_class-target = " \
+EXTRA_OECONF:append_xilinx-standalone:arm:class-target = " \
        --with-multilib-list=${ARM_PROFILE} \
        "
-EXTRA_OECONF_append_xilinx-standalone_armrm_class-target = " \
+EXTRA_OECONF:append_xilinx-standalone:armrm:class-target = " \
        --disable-tls \
        --disable-decimal-float \
        "
-EXTRA_OECONF_append_xilinx-standalone_microblaze_class-target = " \
+EXTRA_OECONF:append_xilinx-standalone:microblaze:class-target = " \
        --enable-target-optspace \
        --without-long-double-128 \
        "
@@ -38,9 +38,9 @@ EXTRA_OECONF_append_xilinx-standalone_microblaze_class-target = " \
 # Changes local to gcc-runtime...
 # Dont build libitm, etc.
-RUNTIMETARGET_xilinx-standalone_class-target = "libstdc++-v3"
+RUNTIMETARGET_xilinx-standalone:class-target = "libstdc++-v3"
-do_install_append_xilinx-standalone_class-target() {
+do_install:append_xilinx-standalone:class-target() {
        # Fixup what gcc-runtime normally would do, we don't want linux directories!
        rm -rf ${D}${includedir}/c++/${BINV}/${TARGET_ARCH}${TARGET_VENDOR}-linux
@@ -69,6 +69,6 @@ do_install_append_xilinx-standalone_class-target() {
        fi
 }
-FILES_${PN}-dbg_append_xilinx-standalone_class-target = "\
+FILES:${PN}-dbg:append_xilinx-standalone:class-target = "\
    ${libdir}/libstdc++.a-gdb.py \
 "
diff --git a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-source_11.%.bbappend b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-source_11.%.bbappend
index d3abc611..f2c9051d 100644
--- a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-source_11.%.bbappend
+++ b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-source_11.%.bbappend
@@ -1,12 +1,12 @@
 COMPATIBLE_HOST = "${HOST_SYS}"
 # Add MicroBlaze Patches (only when using MicroBlaze)
-FILESEXTRAPATHS_append_microblaze_xilinx-standalone := ":${THISDIR}/gcc-10"
+FILESEXTRAPATHS:append:microblaze_xilinx-standalone := ":${THISDIR}/gcc-10"
-SRC_URI_append_microblaze_xilinx-standalone = " \
+SRC_URI:append:microblaze_xilinx-standalone = " \
        file://additional-microblaze-multilibs.patch \
 "
-CHECK_FOR_MICROBLAZE_microblaze = "1"
+CHECK_FOR_MICROBLAZE:microblaze = "1"
 python() {
    if d.getVar('CHECK_FOR_MICROBLAZE') == '1':
diff --git a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-xilinx-standalone.inc b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-xilinx-standalone.inc
index 29f67aff..ff3402a0 100644
--- a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-xilinx-standalone.inc
+++ b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-xilinx-standalone.inc
@@ -1,4 +1,4 @@
-EXTRA_OECONF_append_xilinx-standalone = " \
+EXTRA_OECONF:append_xilinx-standalone = " \
        --disable-libstdcxx-pch \
        --with-newlib \
        --disable-threads \
@@ -7,7 +7,7 @@ EXTRA_OECONF_append_xilinx-standalone = " \
        --disable-libitm \
 "
-EXTRA_OECONF_append_xilinx-standalone_aarch64 = " \
+EXTRA_OECONF:append_xilinx-standalone:aarch64 = " \
        --disable-multiarch \
        --with-arch=armv8-a \
        "
@@ -15,17 +15,17 @@ EXTRA_OECONF_append_xilinx-standalone_aarch64 = " \
 # Both arm and armrm overrides are set w/ cortex r5
 # So only set rmprofile if armrm is defined.
 ARM_PROFILE = "aprofile"
-ARM_PROFILE_armrm = "rmprofile"
+ARM_PROFILE:armrm = "rmprofile"
-EXTRA_OECONF_append_xilinx-standalone_arm = " \
+EXTRA_OECONF:append_xilinx-standalone:arm = " \
        --with-multilib-list=${ARM_PROFILE} \
        "
-EXTRA_OECONF_append_xilinx-standalone_armrm = " \
+EXTRA_OECONF:append_xilinx-standalone:armrm = " \
        --disable-tls \
        --disable-decimal-float \
        "
-EXTRA_OECONF_append_xilinx-standalone_microblaze = " \
+EXTRA_OECONF:append_xilinx-standalone:microblaze = " \
        --enable-target-optspace \
        --without-long-double-128 \
        "
diff --git a/meta-xilinx-standalone/recipes-devtools/gcc/libgcc_%.bbappend b/meta-xilinx-standalone/recipes-devtools/gcc/libgcc_%.bbappend
index 17529a03..a9a389b2 100644
--- a/meta-xilinx-standalone/recipes-devtools/gcc/libgcc_%.bbappend
+++ b/meta-xilinx-standalone/recipes-devtools/gcc/libgcc_%.bbappend
@@ -2,7 +2,7 @@ require gcc-configure-xilinx-standalone.inc
 COMPATIBLE_HOST = "${HOST_SYS}"
-python do_multilib_install_xilinx-standalone_class-target () {
+python do_multilib_install_xilinx-standalone:class-target () {
    pass
 }
@@ -19,11 +19,11 @@ standalone_fixup () {
 }
 FIXUP_FUNCTION = ""
-FIXUP_FUNCTION_xilinx-standalone_class-target = " standalone_fixup"
+FIXUP_FUNCTION_xilinx-standalone:class-target = " standalone_fixup"
 do_install[postfuncs] .= "${FIXUP_FUNCTION}"
-FILES_${PN}-dev_append_xilinx-standalone_class-target = " \
+FILES:${PN}-dev:append_xilinx-standalone:class-target = " \
        ${libdir}/*.a \
        ${libdir}/*.o \
 "
diff --git a/meta-xilinx-standalone/recipes-devtools/gcc/mb-convert.sh b/meta-xilinx-standalone/recipes-devtools/gcc/mb-convert.sh
index e05145ec..ab689444 100755
--- a/meta-xilinx-standalone/recipes-devtools/gcc/mb-convert.sh
+++ b/meta-xilinx-standalone/recipes-devtools/gcc/mb-convert.sh
@@ -37,9 +37,9 @@ sed -e 's,;, ,' |
      echo 'DEFAULTTUNE = "microblaze"'
      echo
      echo 'AVAILTUNES += "microblaze"'
-      echo 'BASE_LIB_tune-microblaze = "lib"'
+      echo 'BASE_LIB:tune-microblaze = "lib"'
-      echo 'TUNE_FEATURES_tune-microblaze = "microblaze bigendian"'
+      echo 'TUNE_FEATURES:tune-microblaze = "microblaze bigendian"'
-      echo 'PACKAGE_EXTRA_ARCHS_tune-microblaze = "${TUNE_PKGARCH}"'
+      echo 'PACKAGE_EXTRA_ARCHS:tune-microblaze = "${TUNE_PKGARCH}"'
      continue
    fi
@@ -51,10 +51,10 @@ sed -e 's,;, ,' |
    echo
    echo "# $mlib"
    echo "# CFLAGS:${cflags}"
-    echo "DEFAULTTUNE_virtclass-multilib-$multilib = \"$tune\""
+    echo "DEFAULTTUNE:virtclass-multilib-$multilib = \"$tune\""
    echo
    echo "AVAILTUNES += \"$tune\""
-    echo "BASE_LIB_tune-$tune = \"lib/$mlib\""
+    echo "BASE_LIB:tune-$tune = \"lib/$mlib\""
-    echo "TUNE_FEATURES_tune-$tune = \"${features}\""
+    echo "TUNE_FEATURES:tune-$tune = \"${features}\""
-    echo "PACKAGE_EXTRA_ARCHS_tune-$tune = \"\${TUNE_PKGARCH}\""
+    echo "PACKAGE_EXTRA_ARCHS:tune-$tune = \"\${TUNE_PKGARCH}\""
  done
author	Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com>	2021-09-28 22:12:04 -0700
committer	Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com>	2021-09-28 22:12:06 -0700
commit	6921a88182ce51763fcf61273972df99dc2faee5 (patch)
tree	6505b60113f6192f347991a3a82b8bc6fb02b8d9
parent	1d2c0f073d3102c3f8ff043d2c3039e6d360118f (diff)
download	meta-xilinx-6921a88182ce51763fcf61273972df99dc2faee5.tar.gz