layer: Convert to new override syntax

Signed-off-by: Khem Raj <raj.khem@gmail.com>

classes/fsl-eula-unpack.bbclass

@@ -79,11 +79,11 @@ FSL_EULA_FILE_MD5SUM ?= \
 
 LIC_FILES_CHKSUM_LAYER ?= "file://${FSL_EULA_FILE};md5=${FSL_EULA_FILE_MD5SUM}"
 LIC_FILES_CHKSUM_LAYER[vardepsexclude] += "FSL_EULA_FILE"
-LIC_FILES_CHKSUM_append = " ${LIC_FILES_CHKSUM_LAYER}"
+LIC_FILES_CHKSUM:append = " ${LIC_FILES_CHKSUM_LAYER}"
 
 LIC_FILES_CHKSUM[vardepsexclude] += "FSL_EULA_FILE"
 
-do_fetch_prepend() {
+do_fetch:prepend() {
     if "Proprietary" not in d.getVar("LICENSE"):
         bb.fatal("The recipe LICENSE should include Proprietary but is " + d.getVar("LICENSE") + ".")
 }

classes/fsl-u-boot-localversion.bbclass

@@ -14,7 +14,7 @@ LOCALVERSION ??= "+fslc"
 
 UBOOT_LOCALVERSION = "${LOCALVERSION}"
 
-do_compile_prepend() {
+do_compile:prepend() {
 	if [ "${SCMVERSION}" = "y" ]; then
 		# Add GIT revision to the local version
 		head=`cd ${S} ; git rev-parse --verify --short HEAD 2> /dev/null`

classes/fsl-vivante-kernel-driver-handler.bbclass

@@ -41,15 +41,15 @@ python fsl_vivante_kernel_driver_handler () {
         return
 
     if use_vivante_kernel_driver_module != "1":
-        e.data.appendVar('RPROVIDES_${KERNEL_PACKAGE_NAME}-base', ' kernel-module-imx-gpu-viv')
+        e.data.appendVar('RPROVIDES:${KERNEL_PACKAGE_NAME}-base', ' kernel-module-imx-gpu-viv')
-        e.data.appendVar('RREPLACES_${KERNEL_PACKAGE_NAME}-base', ' kernel-module-imx-gpu-viv')
+        e.data.appendVar('RREPLACES:${KERNEL_PACKAGE_NAME}-base', ' kernel-module-imx-gpu-viv')
-        e.data.appendVar('RCONFLICTS_${KERNEL_PACKAGE_NAME}-base', ' kernel-module-imx-gpu-viv')
+        e.data.appendVar('RCONFLICTS:${KERNEL_PACKAGE_NAME}-base', ' kernel-module-imx-gpu-viv')
 }
 
 addhandler fsl_vivante_kernel_driver_handler
 fsl_vivante_kernel_driver_handler[eventmask] = "bb.event.RecipePreFinalise"
 
-do_configure_append () {
+do_configure:append () {
     if [ "${MACHINE_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT}" = "1" ]; then
         config="${B}/.config"
 

classes/image_types_fsl.bbclass

@@ -9,9 +9,9 @@ UBOOT_SUFFIX ?= "bin"
 MXSBOOT_NAND_ARGS ?= ""
 
 # U-Boot mxsboot generation for uSD
-do_image_uboot_mxsboot_sdcard[depends] += "u-boot-mxsboot-native:do_populate_sysroot \
+do_image_uboot:mxsboot_sdcard[depends] += "u-boot-mxsboot-native:do_populate_sysroot \
                                            u-boot:do_deploy"
-IMAGE_CMD_uboot-mxsboot-sdcard() {
+IMAGE_CMD:uboot-mxsboot-sdcard() {
     mxsboot sd ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.${UBOOT_SUFFIX} \
                ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.uboot-mxsboot-sdcard
     ln -sf ${IMAGE_NAME}.rootfs.uboot-mxsboot-sdcard \
@@ -19,9 +19,9 @@ IMAGE_CMD_uboot-mxsboot-sdcard() {
 }
 
 # U-Boot mxsboot generation for NAND
-do_image_uboot_mxsboot_nand[depends] += "u-boot-mxsboot-native:do_populate_sysroot \
+do_image_uboot:mxsboot_nand[depends] += "u-boot-mxsboot-native:do_populate_sysroot \
                                          u-boot:do_deploy"
-IMAGE_CMD_uboot-mxsboot-nand() {
+IMAGE_CMD:uboot-mxsboot-nand() {
     mxsboot ${MXSBOOT_NAND_ARGS} nand \
             ${DEPLOY_DIR_IMAGE}/u-boot-${MACHINE}.${UBOOT_SUFFIX} \
             ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.uboot-mxsboot-nand
@@ -33,11 +33,11 @@ IMAGE_CMD_uboot-mxsboot-nand() {
 # image stream built before the wic generation
 do_image_wic[depends] += " \
     ${@bb.utils.contains('IMAGE_FSTYPES', 'uboot-mxsboot-sdcard', \
-                                          '${IMAGE_BASENAME}:do_image_uboot_mxsboot_sdcard', '', d)} \
+                                          '${IMAGE_BASENAME}:do_image_uboot:mxsboot_sdcard', '', d)} \
 "
 
 # We need to apply a fixup inside of the partition table
-IMAGE_CMD_wic_append_mxs() {
+IMAGE_CMD:wic:append:mxs() {
 	# Change partition type for mxs processor family
 	bbnote "Setting partition type to 0x53 as required for mxs' SoC family."
 	echo -n S | dd of=$out${IMAGE_NAME_SUFFIX}.wic bs=1 count=1 seek=450 conv=notrunc

classes/imx-boot-container.bbclass

@@ -23,7 +23,7 @@
 
 # Define ATF binary file to be deployed to the U-Boot build folder
 ATF_MACHINE_NAME = "bl31-${ATF_PLATFORM}.bin"
-ATF_MACHINE_NAME_append = "${@bb.utils.contains('MACHINE_FEATURES', 'optee', '-optee', '', d)}"
+ATF_MACHINE_NAME:append = "${@bb.utils.contains('MACHINE_FEATURES', 'optee', '-optee', '', d)}"
 
 # This package aggregates output deployed by other packages, so set the
 # appropriate dependencies for populate binaries task
@@ -76,7 +76,7 @@ addtask do_resolve_and_populate_binaries before do_compile after do_configure
 # This effectively would allow the usage of the same WKS file for those
 # derivatives that are using the boot container from U-Boot and those
 # that are not yet have support for it enabled.
-do_deploy_append() {
+do_deploy:append() {
     # Deploy the resulted flash.bin for WIC to pick it up
     if [ -n "${UBOOT_CONFIG}" ]; then
         for config in ${UBOOT_MACHINE}; do

classes/kernel-imximage.bbclass

@@ -17,7 +17,7 @@
 #
 # Copyright 2017 (C) O.S. Systems Software LTDA.
 
-DEPENDS_append = ' u-boot-mkimage-native'
+DEPENDS:append = ' u-boot-mkimage-native'
 
 IMXIMAGE_ENTRYPOINT ?= "${UBOOT_ENTRYPOINT}"
 
@@ -55,6 +55,6 @@ gen_imximage() {
 	done
 }
 
-do_deploy_append() {
+do_deploy:append() {
 	gen_imximage
 }

classes/kernel-itbimage.bbclass

@@ -459,7 +459,7 @@ addtask assemble_fitimage_initramfs before do_deploy after do_install
 
 
 kernel_do_deploy[vardepsexclude] = "DATETIME"
-kernel_do_deploy_append() {
+kernel_do_deploy:append() {
 	# Update deploy directory
 	if echo ${KERNEL_IMAGETYPES} | grep -wq "itbImage"; then
 		cd ${B}

classes/mfgtool-initramfs-image.bbclass

@@ -13,7 +13,7 @@ FEATURE_PACKAGES_extfs = "packagegroup-fsl-mfgtool-extfs"
 FEATURE_PACKAGES_f2fs = "packagegroup-fsl-mfgtool-f2fs"
 
 IMAGE_FSTYPES = "cpio.gz.u-boot"
-IMAGE_FSTYPES_mxs = "cpio.gz.u-boot"
+IMAGE_FSTYPES:mxs = "cpio.gz.u-boot"
 IMAGE_ROOTFS_SIZE ?= "8192"
 
 # Filesystems enabled by default

classes/qoriq_build_64bit_kernel.bbclass

@@ -1,13 +1,13 @@
 inherit features_check
-REQUIRED_DISTRO_FEATURES_e6500 += "multiarch"
+REQUIRED_DISTRO_FEATURES:e6500 += "multiarch"
 
 python () {
     promote_kernel = d.getVar('BUILD_64BIT_KERNEL', False)
     if promote_kernel == "1":
         sys_multilib = 'powerpc64' + d.getVar('TARGET_VENDOR', False) + 'mllib64-' + d.getVar('HOST_OS', False)
         tc_options = d.getVar('TOOLCHAIN_OPTIONS', False) + '/../lib64-' + d.getVar("MACHINE", False)
-        d.setVar('DEPENDS_append', ' lib64-gcc-cross-powerpc64 lib64-libgcc')
+        d.setVar('DEPENDS:append', ' lib64-gcc-cross-powerpc64 lib64-libgcc')
-        d.setVar('PATH_append', ':' + d.getVar('STAGING_BINDIR_NATIVE', False) + '/' + sys_multilib)
+        d.setVar('PATH:append', ':' + d.getVar('STAGING_BINDIR_NATIVE', False) + '/' + sys_multilib)
         d.setVar('KERNEL_CC', d.getVar('CCACHE', False) + sys_multilib + '-' + 'gcc' + d.getVar('HOST_CC_KERNEL_ARCH', False) + tc_options)
         d.setVar('KERNEL_LD', d.getVar('CCACHE', False) + sys_multilib + '-' + 'ld.bfd' + d.getVar('HOST_LD_KERNEL_ARCH', False) + tc_options)
         d.setVar('KERNEL_AR', d.getVar('CCACHE', False) + sys_multilib + '-' + 'ar' + d.getVar('HOST_AR_KERNEL_ARCH', False))

classes/use-imx-headers.bbclass

@@ -13,12 +13,12 @@
 #
 # Copyright 2018 (C) O.S. Systems Software LTDA.
 
-DEPENDS_append_imx = " linux-imx-headers"
+DEPENDS:append_imx = " linux-imx-headers"
 
 # Set runtime dependency of -dev for package inheriting this class to
 # linux-imx-headers-dev package. This is required in order to propagate
 # headers into the SDK
-RDEPENDS_${PN}-dev += "linux-imx-headers-dev"
+RDEPENDS:${PN}-dev += "linux-imx-headers-dev"
 
 PACKAGE_ARCH_imx ?= "${MACHINE_SOCARCH}"
 
@@ -34,4 +34,4 @@ STAGING_INCDIR_IMX = "${STAGING_INCDIR}/imx"
 # Typical example here would be imx-vpu-hantro recipe, which requires NXP
 # BSP and is not compatible with mainline.
 COMPATIBLE_HOST = '(null)'
-COMPATIBLE_HOST_use-nxp-bsp = '.*'
+COMPATIBLE_HOST:use-nxp-bsp = '.*'

classes/use-imx-security-controller-firmware.bbclass

@@ -18,11 +18,11 @@
 
 SECO_FIRMWARE_NAME              ?= ""
 
-SECO_FIRMWARE_NAME_mx8qm         = "mx8qmb0-ahab-container.img"
+SECO_FIRMWARE_NAME:mx8qm         = "mx8qmb0-ahab-container.img"
-SECO_FIRMWARE_NAME_mx8qxp        = \
+SECO_FIRMWARE_NAME:mx8qxp        = \
     "${@bb.utils.contains('MACHINE_FEATURES', 'soc-revb0', 'mx8qxb0-ahab-container.img', \
                                                            'mx8qxc0-ahab-container.img', d)}"
-SECO_FIRMWARE_NAME_mx8dxl        = "mx8dxla1-ahab-container.img"
+SECO_FIRMWARE_NAME:mx8dxl        = "mx8dxla1-ahab-container.img"
 
 python () {
     if "mx8m" in d.getVar('MACHINEOVERRIDES').split(":"):

conf/machine/imx6qdlsabreauto.conf

@@ -26,7 +26,7 @@ KERNEL_DEVICETREE = " \
     imx6dl-sabreauto.dtb imx6dl-sabreauto-gpmi-weim.dtb imx6dl-sabreauto-ecspi.dtb \
     imx6dl-sabreauto-flexcan1.dtb imx6dl-sabreauto-enetirq.dtb \
 "
-KERNEL_DEVICETREE_use-mainline-bsp = " \
+KERNEL_DEVICETREE:use-mainline-bsp = " \
     imx6qp-sabreauto.dtb \
     imx6q-sabreauto.dtb \
     imx6dl-sabreauto.dtb \
@@ -34,18 +34,18 @@ KERNEL_DEVICETREE_use-mainline-bsp = " \
 
 ### u-boot-fslc settings ###
 
-SPL_BINARY_pn-u-boot-fslc = "SPL"
+SPL_BINARY:pn-u-boot-fslc = "SPL"
-UBOOT_MACHINE_pn-u-boot-fslc ?= "mx6sabreauto_defconfig"
+UBOOT_MACHINE:pn-u-boot-fslc ?= "mx6sabreauto_defconfig"
-UBOOT_SUFFIX_pn-u-boot-fslc = "img"
+UBOOT_SUFFIX:pn-u-boot-fslc = "img"
 
 ### u-boot-imx settings ###
 
 # The u-boot-imx does not provide unified functionality for DL/Q/QP SoC
 # variants. Change the defconfig to the targeted SoC variant.
-SPL_BINARY_pn-u-boot-imx = ""
+SPL_BINARY:pn-u-boot-imx = ""
-UBOOT_MACHINE_pn-u-boot-imx = "mx6qsabreauto_defconfig"
+UBOOT_MACHINE:pn-u-boot-imx = "mx6qsabreauto_defconfig"
-UBOOT_MAKE_TARGET_pn-u-boot-imx = "u-boot.imx"
+UBOOT_MAKE_TARGET:pn-u-boot-imx = "u-boot.imx"
-UBOOT_SUFFIX_pn-u-boot-imx = "imx"
+UBOOT_SUFFIX:pn-u-boot-imx = "imx"
 
 WKS_FILE = " \
     ${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', \
@@ -54,6 +54,6 @@ WKS_FILE = " \
 
 SERIAL_CONSOLES = "115200;ttymxc3"
 
-MACHINE_FIRMWARE_append_mx6 = " linux-firmware-ath6k"
+MACHINE_FIRMWARE:append:mx6 = " linux-firmware-ath6k"
 
 MACHINE_FEATURES += " pci wifi bluetooth"

conf/machine/imx6qdlsabresd.conf

@@ -35,7 +35,7 @@ KERNEL_DEVICETREE = " \
 	imx6dl-sabresd-hdcp.dtb \
 	imx6dl-sabresd-ldo.dtb \
 "
-KERNEL_DEVICETREE_use-mainline-bsp = " \
+KERNEL_DEVICETREE:use-mainline-bsp = " \
     imx6qp-sabresd.dtb \
     imx6q-sabresd.dtb \
     imx6dl-sabresd.dtb \
@@ -43,18 +43,18 @@ KERNEL_DEVICETREE_use-mainline-bsp = " \
 
 ### u-boot-fslc settings ###
 
-SPL_BINARY_pn-u-boot-fslc = "SPL"
+SPL_BINARY:pn-u-boot-fslc = "SPL"
-UBOOT_MACHINE_pn-u-boot-fslc ?= "mx6sabresd_defconfig"
+UBOOT_MACHINE:pn-u-boot-fslc ?= "mx6sabresd_defconfig"
-UBOOT_SUFFIX_pn-u-boot-fslc = "img"
+UBOOT_SUFFIX:pn-u-boot-fslc = "img"
 
 ### u-boot-imx settings ###
 
 # The u-boot-imx does not provide unified functionality for DL/Q/QP SoC
 # variants. Change the defconfig to the targeted SoC variant.
-SPL_BINARY_pn-u-boot-imx = ""
+SPL_BINARY:pn-u-boot-imx = ""
-UBOOT_MACHINE_pn-u-boot-imx ?= "mx6qsabresd_defconfig"
+UBOOT_MACHINE:pn-u-boot-imx ?= "mx6qsabresd_defconfig"
-UBOOT_MAKE_TARGET_pn-u-boot-imx = "u-boot.imx"
+UBOOT_MAKE_TARGET:pn-u-boot-imx = "u-boot.imx"
-UBOOT_SUFFIX_pn-u-boot-imx = "imx"
+UBOOT_SUFFIX:pn-u-boot-imx = "imx"
 
 WKS_FILE = " \
     ${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', \
@@ -63,6 +63,6 @@ WKS_FILE = " \
 
 SERIAL_CONSOLES = "115200;ttymxc0"
 
-MACHINE_FIRMWARE_append_mx6 = " linux-firmware-ath6k"
+MACHINE_FIRMWARE:append:mx6 = " linux-firmware-ath6k"
 
 MACHINE_FEATURES += " pci wifi bluetooth"

conf/machine/imx6slevk.conf

@@ -10,7 +10,7 @@ include conf/machine/include/imx-base.inc
 include conf/machine/include/tune-cortexa9.inc
 
 KERNEL_DEVICETREE = "imx6sl-evk.dtb"
-KERNEL_DEVICETREE_append_use-nxp-bsp = " \
+KERNEL_DEVICETREE:append:use-nxp-bsp = " \
     imx6sl-evk-btwifi.dtb \
     imx6sl-evk-csi.dtb \
     imx6sl-evk-ldo.dtb \

conf/machine/imx6sllevk.conf

@@ -23,7 +23,7 @@ UBOOT_CONFIG[sd-optee] = "mx6sllevk_optee_config,sdcard"
 UBOOT_CONFIG[epdc]     = "mx6sllevk_epdc_config"
 UBOOT_CONFIG[mfgtool]  = "mx6sllevk_config"
 
-OPTEE_BIN_EXT_imx6sllevk = "6sllevk"
+OPTEE_BIN_EXT:imx6sllevk = "6sllevk"
 
 SERIAL_CONSOLES = "115200;ttymxc0"
 

conf/machine/imx6sxsabreauto.conf

@@ -10,7 +10,7 @@ require conf/machine/include/imx-base.inc
 require conf/machine/include/tune-cortexa9.inc
 
 KERNEL_DEVICETREE = "imx6sx-sabreauto.dtb"
-KERNEL_DEVICETREE_use-mainline-bsp = "imx6sx-sabreauto.dtb"
+KERNEL_DEVICETREE:use-mainline-bsp = "imx6sx-sabreauto.dtb"
 
 UBOOT_MAKE_TARGET = "u-boot.imx"
 UBOOT_SUFFIX = "imx"
@@ -29,6 +29,6 @@ OPTEE_BIN_EXT = "6sxauto"
 
 SERIAL_CONSOLES = "115200;ttymxc3"
 
-MACHINE_FIRMWARE_append_mx6 = " linux-firmware-ath6k"
+MACHINE_FIRMWARE:append:mx6 = " linux-firmware-ath6k"
 
 MACHINE_FEATURES += " pci wifi bluetooth"

conf/machine/imx6sxsabresd.conf

@@ -14,7 +14,7 @@ KERNEL_DEVICETREE = " \
     imx6sx-sdb-reva.dtb \
     imx6sx-sdb-sai.dtb \
 "
-KERNEL_DEVICETREE_append_use-nxp-bsp = " \
+KERNEL_DEVICETREE:append:use-nxp-bsp = " \
     imx6sx-sdb-btwifi.dtb \
     imx6sx-sdb-emmc.dtb \
     imx6sx-sdb-lcdif1.dtb \
@@ -43,6 +43,6 @@ OPTEE_BIN_EXT = "6sxsdb"
 
 SERIAL_CONSOLES = "115200;ttymxc0"
 
-MACHINE_FIRMWARE_append_mx6 = " linux-firmware-ath6k"
+MACHINE_FIRMWARE:append:mx6 = " linux-firmware-ath6k"
 
 MACHINE_FEATURES += "pci wifi bluetooth bcm4339 bcm43455"

conf/machine/imx6ulevk.conf

@@ -21,19 +21,19 @@ KERNEL_DEVICETREE = " \
 	imx6ul-14x14-evk-emmc.dtb \
 	imx6ul-14x14-evk-gpmi-weim.dtb \
 "
-KERNEL_DEVICETREE_use-mainline-bsp = "imx6ul-14x14-evk.dtb"
+KERNEL_DEVICETREE:use-mainline-bsp = "imx6ul-14x14-evk.dtb"
 
 ### u-boot-fslc settings ###
 
-SPL_BINARY_pn-u-boot-fslc = "SPL"
+SPL_BINARY:pn-u-boot-fslc = "SPL"
-UBOOT_SUFFIX_pn-u-boot-fslc = "img"
+UBOOT_SUFFIX:pn-u-boot-fslc = "img"
 
 ### u-boot-imx settings ###
 
 # The u-boot-imx does not provide SPL support
-SPL_BINARY_pn-u-boot-imx = ""
+SPL_BINARY:pn-u-boot-imx = ""
-UBOOT_MAKE_TARGET_pn-u-boot-imx = "u-boot.imx"
+UBOOT_MAKE_TARGET:pn-u-boot-imx = "u-boot.imx"
-UBOOT_SUFFIX_pn-u-boot-imx = "imx"
+UBOOT_SUFFIX:pn-u-boot-imx = "imx"
 
 WKS_FILE = " \
     ${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', \

conf/machine/imx6ullevk.conf

@@ -15,7 +15,7 @@ KERNEL_DEVICETREE = " \
 	imx6ull-14x14-evk.dtb \
 "
 
-KERNEL_DEVICETREE_append_use-nxp-bsp = " \
+KERNEL_DEVICETREE:append:use-nxp-bsp = " \
 	imx6ull-14x14-evk-btwifi.dtb \
 	imx6ull-14x14-evk-btwifi-oob.dtb \
 	imx6ull-14x14-evk-emmc.dtb \

conf/machine/imx6ulz-14x14-evk.conf

@@ -14,7 +14,7 @@ MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455"
 KERNEL_DEVICETREE = " \
     imx6ulz-14x14-evk.dtb \
 "
-KERNEL_DEVICETREE_append_use-nxp-bsp = " \
+KERNEL_DEVICETREE:append:use-nxp-bsp = " \
     imx6ulz-14x14-evk-btwifi.dtb \
     imx6ulz-14x14-evk-emmc.dtb \
     imx6ulz-14x14-evk-gpmi-weim.dtb \

conf/machine/imx7dsabresd.conf

@@ -12,7 +12,7 @@ require conf/machine/include/tune-cortexa7.inc
 MACHINE_FEATURES += "pci wifi bluetooth bcm4339 bcm43455"
 
 KERNEL_DEVICETREE = "imx7d-sdb.dtb"
-KERNEL_DEVICETREE_append_use-nxp-bsp = " \
+KERNEL_DEVICETREE:append:use-nxp-bsp = " \
 	imx7d-sdb-epdc.dtb \
 	imx7d-sdb-gpmi-weim.dtb \
 	imx7d-sdb-m4.dtb \

conf/machine/imx7ulpevk.conf

@@ -14,10 +14,10 @@ MACHINE_FEATURES += "pci wifi bluetooth bcm43430"
 KERNEL_DEVICETREE = " \
 	imx7ulp-evk.dtb \
 "
-KERNEL_DEVICETREE_append_use-mainline-bsp = " \
+KERNEL_DEVICETREE:append:use-mainline-bsp = " \
 	imx7ulp-com.dtb \
 "
-KERNEL_DEVICETREE_append_use-nxp-bsp = " \
+KERNEL_DEVICETREE:append:use-nxp-bsp = " \
 	imx7ulp-evk-ft5416.dtb \
 	imx7ulp-evk-mipi.dtb \
 	imx7ulp-evkb.dtb \

conf/machine/imx8dxl-lpddr4-evk.conf

@@ -5,7 +5,7 @@
 
 require conf/machine/include/imx8dxl-evk.inc
 KERNEL_DEVICETREE_BASENAME = "imx8dxl-evk"
-KERNEL_DEVICETREE_append_use-nxp-bsp = " \
+KERNEL_DEVICETREE:append:use-nxp-bsp = " \
     freescale/${KERNEL_DEVICETREE_BASENAME}-enet0.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-enet0-tja1100.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-inmate.dtb \

conf/machine/imx8mm-ddr4-evk.conf

@@ -7,7 +7,7 @@
 require include/imx8mm-evk.inc
 
 KERNEL_DEVICETREE_BASENAME = "${MACHINE}"
-KERNEL_DEVICETREE_append_use-nxp-bsp = " \
+KERNEL_DEVICETREE:append:use-nxp-bsp = " \
     freescale/${KERNEL_DEVICETREE_BASENAME}-revb-rm67191.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-revb.dtb \
 "

conf/machine/imx8mm-lpddr4-evk.conf

@@ -8,7 +8,7 @@ require include/imx8mm-evk.inc
 
 # The device tree name is implicit for LPDDR4, so can't use MACHINE here
 KERNEL_DEVICETREE_BASENAME = "imx8mm-evk"
-KERNEL_DEVICETREE_append_use-nxp-bsp = " \
+KERNEL_DEVICETREE:append:use-nxp-bsp = " \
 	freescale/${KERNEL_DEVICETREE_BASENAME}-8mic-revE.dtb \
 	freescale/${KERNEL_DEVICETREE_BASENAME}-8mic-swpdm.dtb \
 	freescale/${KERNEL_DEVICETREE_BASENAME}-ak4497.dtb \

conf/machine/imx8mn-ddr4-evk.conf

@@ -7,7 +7,7 @@
 require include/imx8mn-evk.inc
 
 KERNEL_DEVICETREE_BASENAME = "${MACHINE}"
-KERNEL_DEVICETREE_append_use-nxp-bsp = " \
+KERNEL_DEVICETREE:append:use-nxp-bsp = " \
     freescale/${KERNEL_DEVICETREE_BASENAME}-usd-wifi.dtb \
 "
 UBOOT_CONFIG_BASENAME = "imx8mn_ddr4_evk"

conf/machine/imx8mn-lpddr4-evk.conf

@@ -8,7 +8,7 @@ require include/imx8mn-evk.inc
 
 # The device tree name is implicit for LPDDR4, so can't use MACHINE here
 KERNEL_DEVICETREE_BASENAME = "imx8mn-evk"
-KERNEL_DEVICETREE_append_use-nxp-bsp = " \
+KERNEL_DEVICETREE:append:use-nxp-bsp = " \
     freescale/${KERNEL_DEVICETREE_BASENAME}-8mic-revE.dtb \
 "
 UBOOT_CONFIG_BASENAME = "imx8mn_evk"

conf/machine/imx8mp-ddr4-evk.conf

@@ -8,7 +8,7 @@ require include/imx8mp-evk.inc
 
 # FIXME: This machine is not yet supported by u-boot-fslc, so for now
 # use u-boot-imx for mainline.
-IMX_DEFAULT_BOOTLOADER_use-mainline-bsp = "u-boot-imx"
+IMX_DEFAULT_BOOTLOADER:use-mainline-bsp = "u-boot-imx"
 
 KERNEL_DEVICETREE_BASENAME = "${MACHINE}"
 

conf/machine/imx8mp-lpddr4-evk.conf

@@ -11,7 +11,7 @@ KERNEL_DEVICETREE_BASENAME = "imx8mp-evk"
 
 # NXP kernel has additional DTB files for various board configuration and
 # derivates. Include them here for NXP BSP only
-KERNEL_DEVICETREE_append_use-nxp-bsp = " \
+KERNEL_DEVICETREE:append:use-nxp-bsp = " \
 	freescale/imx8mp-ab2.dtb \
 	freescale/imx8mp-evk-basler.dtb \
 	freescale/imx8mp-evk-basler-ov2775.dtb \

conf/machine/imx8mq-evk.conf

@@ -12,14 +12,14 @@ require conf/machine/include/tune-cortexa53.inc
 IMX_DEFAULT_BSP = "nxp"
 
 MACHINE_FEATURES += "pci wifi bluetooth optee bcm43455 bcm4356"
-MACHINE_FEATURES_append_use-nxp-bsp = " bcm4359"
+MACHINE_FEATURES:append:use-nxp-bsp = " bcm4359"
 
-MACHINE_SOCARCH_FILTER_append_mx8mq = " virtual/libopenvg virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa virtual/libgl virtual/libg2d"
+MACHINE_SOCARCH_FILTER:append:mx8mq = " virtual/libopenvg virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa virtual/libgl virtual/libg2d"
 
 KERNEL_DEVICETREE = " \
 	freescale/imx8mq-evk.dtb \
 "
-KERNEL_DEVICETREE_append_use-nxp-bsp = " \
+KERNEL_DEVICETREE:append:use-nxp-bsp = " \
 	freescale/imx8mq-evk-ak4497.dtb \
 	freescale/imx8mq-evk-audio-tdm.dtb \
 	freescale/imx8mq-evk-dcss-adv7535.dtb \
@@ -40,8 +40,8 @@ KERNEL_DEVICETREE_append_use-nxp-bsp = " \
 	freescale/imx8mq-evk-usdhc2-m2.dtb \
 "
 
-IMX_DEFAULT_BOOTLOADER_use-nxp-bsp = "u-boot-imx"
+IMX_DEFAULT_BOOTLOADER:use-nxp-bsp = "u-boot-imx"
-IMX_DEFAULT_BOOTLOADER_use-mainline-bsp = "u-boot-fslc"
+IMX_DEFAULT_BOOTLOADER:use-mainline-bsp = "u-boot-fslc"
 
 UBOOT_SUFFIX = "bin"
 
@@ -77,7 +77,7 @@ IMX_BOOT_SEEK = "33"
 OPTEE_BIN_EXT = "8mq"
 
 # Add additional firmware
-MACHINE_FIRMWARE_append = " linux-firmware-ath10k"
+MACHINE_FIRMWARE:append = " linux-firmware-ath10k"
 
 # Use gstreamer 1.16 from meta-freescale
 PREFERRED_VERSION_gstreamer1.0 ?= "1.16.imx"

conf/machine/imx8qm-mek.conf

@@ -11,10 +11,10 @@ require conf/machine/include/tune-cortexa72-cortexa53.inc
 IMX_DEFAULT_BSP = "nxp"
 
 MACHINE_FEATURES += "pci optee bcm43455 bcm4356"
-MACHINE_FEATURES_append_use-nxp-bsp = " bcm4359"
+MACHINE_FEATURES:append:use-nxp-bsp = " bcm4359"
 
 # Don't include kernels in standard images
-RDEPENDS_${KERNEL_PACKAGE_NAME}-base = ""
+RDEPENDS:${KERNEL_PACKAGE_NAME}-base = ""
 
 LOADADDR = ""
 
@@ -55,8 +55,8 @@ UBOOT_MAKE_TARGET = \
 SPL_BINARY = \
     "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'spl/u-boot-spl.bin', \
                                                        '', d)}"
-IMX_DEFAULT_BOOTLOADER_use-nxp-bsp = "u-boot-imx"
+IMX_DEFAULT_BOOTLOADER:use-nxp-bsp = "u-boot-imx"
-IMX_DEFAULT_BOOTLOADER_use-mainline-bsp = "u-boot-fslc"
+IMX_DEFAULT_BOOTLOADER:use-mainline-bsp = "u-boot-fslc"
 
 UBOOT_SUFFIX = "bin"
 
@@ -86,4 +86,4 @@ IMX_BOOT_SOC_TARGET = "iMX8QM"
 BOARD_TYPE = "mek"
 
 # Add additional firmware
-MACHINE_FIRMWARE_append = " linux-firmware-ath10k"
+MACHINE_FIRMWARE:append = " linux-firmware-ath10k"

conf/machine/imx8qxp-mek.conf

@@ -8,7 +8,7 @@ MACHINEOVERRIDES =. "mx8qxp:"
 require include/imx8x-mek.inc
 
 KERNEL_DEVICETREE_BASENAME = "${MACHINE}"
-KERNEL_DEVICETREE_append_use-nxp-bsp = " \
+KERNEL_DEVICETREE:append:use-nxp-bsp = " \
 	freescale/${KERNEL_DEVICETREE_BASENAME}-a0.dtb \
 	freescale/${KERNEL_DEVICETREE_BASENAME}-dom0.dtb \
 	freescale/${KERNEL_DEVICETREE_BASENAME}-dpu-lcdif.dtb \

conf/machine/include/e5500-64b.inc

@@ -8,4 +8,4 @@ MACHINEOVERRIDES =. "e5500-64b:"
 
 require conf/multilib.conf
 MULTILIBS ?= "multilib:lib32"
-DEFAULTTUNE_virtclass-multilib-lib32 ?= "ppce5500"
+DEFAULTTUNE:virtclass-multilib-lib32 ?= "ppce5500"

conf/machine/include/e6500-64b.inc

@@ -8,4 +8,4 @@ MACHINEOVERRIDES =. "e6500-64b:"
 
 require conf/multilib.conf
 MULTILIBS ?= "multilib:lib32"
-DEFAULTTUNE_virtclass-multilib-lib32 ?= "ppce6500"
+DEFAULTTUNE:virtclass-multilib-lib32 ?= "ppce6500"

conf/machine/include/e6500.inc

@@ -9,4 +9,4 @@ BUILD_64BIT_KERNEL = "1"
 
 require conf/multilib.conf
 MULTILIBS ?= "multilib:lib64"
-DEFAULTTUNE_virtclass-multilib-lib64 ?= "ppc64e6500"
+DEFAULTTUNE:virtclass-multilib-lib64 ?= "ppc64e6500"

conf/machine/include/imx-base.inc

@@ -13,8 +13,8 @@ require conf/machine/include/utilities.inc
 IMX_DEFAULT_BSP ?= "mainline"
 
 # Those are SoC families we'd like to force the use of mainline BSP.
-IMX_DEFAULT_BSP_mxs ?= "mainline"
+IMX_DEFAULT_BSP:mxs ?= "mainline"
-IMX_DEFAULT_BSP_mx5 ?= "mainline"
+IMX_DEFAULT_BSP:mx5 ?= "mainline"
 
 MACHINEOVERRIDES =. "use-${IMX_DEFAULT_BSP}-bsp:"
 
@@ -32,16 +32,16 @@ UBOOT_BINARY ?= "u-boot.${UBOOT_SUFFIX}"
 # ,----[ imx6qdlsabresd.conf ]
 # | ### u-boot-fslc settings ###
 # |
-# | SPL_BINARY_pn-u-boot-fslc = "SPL"
+# | SPL_BINARY:pn-u-boot-fslc = "SPL"
-# | UBOOT_MACHINE_pn-u-boot-fslc ?= "mx6sabresd_defconfig"
+# | UBOOT_MACHINE:pn-u-boot-fslc ?= "mx6sabresd_defconfig"
-# | UBOOT_SUFFIX_pn-u-boot-fslc = "img"
+# | UBOOT_SUFFIX:pn-u-boot-fslc = "img"
 # |
 # | ### u-boot-imx settings ###
 # |
 # | # The u-boot-imx does not provide unified functionality for DL/Q/QP SoC
 # | # variants. Change the defconfig to the targeted SoC variant.
-# | UBOOT_MACHINE_pn-u-boot-imx ?= "mx6qsabresd_defconfig"
+# | UBOOT_MACHINE:pn-u-boot-imx ?= "mx6qsabresd_defconfig"
-# | UBOOT_SUFFIX_pn-u-boot-imx = "imx"
+# | UBOOT_SUFFIX:pn-u-boot-imx = "imx"
 # `----
 #
 # As result, the 'UBOOT_SUFFIX' is dynamically set based on the preferred U-Boot
@@ -61,7 +61,7 @@ UBOOT_BINARY ?= "u-boot.${UBOOT_SUFFIX}"
 # | UBOOT_MACHINE = "mx53loco_config"
 # `----
 IMX_DEFAULT_BOOTLOADER ??= "u-boot-fslc"
-UBOOT_SUFFIX ?= "${UBOOT_SUFFIX_pn-${IMX_DEFAULT_BOOTLOADER}}"
+UBOOT_SUFFIX ?= "${UBOOT_SUFFIX:pn-${IMX_DEFAULT_BOOTLOADER}}"
 
 # We need to export the original variable to allow it to be used when generating
 # wic based images.
@@ -75,33 +75,33 @@ PREFERRED_PROVIDER_virtual/bootloader ??= "${IMX_DEFAULT_BOOTLOADER}"
 
 PREFERRED_PROVIDER_u-boot-mxsboot-native ??= "u-boot-fslc-mxsboot-native"
 
-UBOOT_ENTRYPOINT_mxs    = "0x40008000"
+UBOOT_ENTRYPOINT:mxs    = "0x40008000"
-UBOOT_ENTRYPOINT_mx51   = "0x90008000"
+UBOOT_ENTRYPOINT:mx51   = "0x90008000"
-UBOOT_ENTRYPOINT_mx53   = "0x70008000"
+UBOOT_ENTRYPOINT:mx53   = "0x70008000"
-UBOOT_ENTRYPOINT_mx6    = "0x10008000"
+UBOOT_ENTRYPOINT:mx6    = "0x10008000"
-UBOOT_ENTRYPOINT_mx6sl  = "0x80008000"
+UBOOT_ENTRYPOINT:mx6sl  = "0x80008000"
-UBOOT_ENTRYPOINT_mx6sll = "0x80008000"
+UBOOT_ENTRYPOINT:mx6sll = "0x80008000"
-UBOOT_ENTRYPOINT_mx6sx  = "0x80008000"
+UBOOT_ENTRYPOINT:mx6sx  = "0x80008000"
-UBOOT_ENTRYPOINT_mx6ul  = "0x80008000"
+UBOOT_ENTRYPOINT:mx6ul  = "0x80008000"
-UBOOT_ENTRYPOINT_mx6ull = "0x80008000"
+UBOOT_ENTRYPOINT:mx6ull = "0x80008000"
-UBOOT_ENTRYPOINT_mx6ulz = "0x80008000"
+UBOOT_ENTRYPOINT:mx6ulz = "0x80008000"
-UBOOT_ENTRYPOINT_mx7    = "0x80008000"
+UBOOT_ENTRYPOINT:mx7    = "0x80008000"
-UBOOT_ENTRYPOINT_mx7ulp = "0x60008000"
+UBOOT_ENTRYPOINT:mx7ulp = "0x60008000"
-UBOOT_ENTRYPOINT_mx8m   = "0x40480000"
+UBOOT_ENTRYPOINT:mx8m   = "0x40480000"
-UBOOT_ENTRYPOINT_vf = "0x80008000"
+UBOOT_ENTRYPOINT:vf = "0x80008000"
 
 # Some derivates can utilize the boot container provided by U-Boot,
 # below variable sets that those machines which have a imx-boot-container
 # in their MACHINEOVERRIDES can inherit a imx-boot-container class
 UBOOT_PROVIDES_BOOT_CONTAINER = "0"
-UBOOT_PROVIDES_BOOT_CONTAINER_imx-boot-container = "1"
+UBOOT_PROVIDES_BOOT_CONTAINER:imx-boot-container = "1"
 
 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 XSERVER_DRIVER                  = "xf86-video-fbdev"
-XSERVER_DRIVER_imxgpu2d         = "xf86-video-imx-vivante"
+XSERVER_DRIVER:imxgpu2d         = "xf86-video-imx-vivante"
-XSERVER_DRIVER_vf               = "xf86-video-modesetting"
+XSERVER_DRIVER:vf               = "xf86-video-modesetting"
-XSERVER_DRIVER_append_mx8       = " xf86-video-modesetting"
+XSERVER_DRIVER:append:mx8       = " xf86-video-modesetting"
-XSERVER_DRIVER_use-mainline-bsp = " \
+XSERVER_DRIVER:use-mainline-bsp = " \
     xf86-video-fbdev \
     xf86-video-modesetting \
     xserver-xorg-extension-glx \
@@ -118,41 +118,41 @@ MACHINE_EXTRA_RRECOMMENDS = "kernel-modules"
 # ARM_INSTRUCTION_SET = "thumb"
 #
 # handled by software
-# DEFAULTTUNE_mx6 ?= "cortexa9t-neon"
+# DEFAULTTUNE:mx6 ?= "cortexa9t-neon"
 # handled by hardware
-DEFAULTTUNE_mx6    ?= "cortexa9thf-neon"
+DEFAULTTUNE:mx6    ?= "cortexa9thf-neon"
-DEFAULTTUNE_mx6ul  ?= "cortexa7thf-neon"
+DEFAULTTUNE:mx6ul  ?= "cortexa7thf-neon"
-DEFAULTTUNE_mx6ull ?= "cortexa7thf-neon"
+DEFAULTTUNE:mx6ull ?= "cortexa7thf-neon"
-DEFAULTTUNE_mx6ulz ?= "cortexa7thf-neon"
+DEFAULTTUNE:mx6ulz ?= "cortexa7thf-neon"
-DEFAULTTUNE_mx7    ?= "cortexa7thf-neon"
+DEFAULTTUNE:mx7    ?= "cortexa7thf-neon"
-DEFAULTTUNE_vf     ?= "cortexa5thf-neon"
+DEFAULTTUNE:vf     ?= "cortexa5thf-neon"
 
-DEFAULTTUNE_mx8m   ?= "cortexa53-crypto"
+DEFAULTTUNE:mx8m   ?= "cortexa53-crypto"
-DEFAULTTUNE_mx8qm  ?= "cortexa72-cortexa53-crypto"
+DEFAULTTUNE:mx8qm  ?= "cortexa72-cortexa53-crypto"
-DEFAULTTUNE_mx8qxp ?= "cortexa35-crypto"
+DEFAULTTUNE:mx8qxp ?= "cortexa35-crypto"
 
 INHERIT += "machine-overrides-extender"
 
-MACHINEOVERRIDES_EXTENDER_mx25   = "use-mainline-bsp"
+MACHINEOVERRIDES_EXTENDER:mx25   = "use-mainline-bsp"
-MACHINEOVERRIDES_EXTENDER_mx6q   = "imxfbdev:imxipu:imxvpu:imxgpu:imxgpu2d:imxgpu3d"
+MACHINEOVERRIDES_EXTENDER:mx6q   = "imxfbdev:imxipu:imxvpu:imxgpu:imxgpu2d:imxgpu3d"
-MACHINEOVERRIDES_EXTENDER_mx6dl  = "imxfbdev:imxpxp:imxipu:imxvpu:imxgpu:imxgpu2d:imxgpu3d:imxepdc"
+MACHINEOVERRIDES_EXTENDER:mx6dl  = "imxfbdev:imxpxp:imxipu:imxvpu:imxgpu:imxgpu2d:imxgpu3d:imxepdc"
-MACHINEOVERRIDES_EXTENDER_mx6sx  = "imxfbdev:imxpxp:imxgpu:imxgpu2d:imxgpu3d"
+MACHINEOVERRIDES_EXTENDER:mx6sx  = "imxfbdev:imxpxp:imxgpu:imxgpu2d:imxgpu3d"
-MACHINEOVERRIDES_EXTENDER_mx6sl  = "imxfbdev:imxpxp:imxgpu:imxgpu2d:imxepdc"
+MACHINEOVERRIDES_EXTENDER:mx6sl  = "imxfbdev:imxpxp:imxgpu:imxgpu2d:imxepdc"
-MACHINEOVERRIDES_EXTENDER_mx6sll = "imxfbdev:imxpxp:imxepdc"
+MACHINEOVERRIDES_EXTENDER:mx6sll = "imxfbdev:imxpxp:imxepdc"
-MACHINEOVERRIDES_EXTENDER_mx6ul  = "imxfbdev:imxpxp"
+MACHINEOVERRIDES_EXTENDER:mx6ul  = "imxfbdev:imxpxp"
-MACHINEOVERRIDES_EXTENDER_mx6ull = "imxfbdev:imxpxp:imxepdc"
+MACHINEOVERRIDES_EXTENDER:mx6ull = "imxfbdev:imxpxp:imxepdc"
-MACHINEOVERRIDES_EXTENDER_mx6ulz = "imxfbdev:imxpxp:imxepdc"
+MACHINEOVERRIDES_EXTENDER:mx6ulz = "imxfbdev:imxpxp:imxepdc"
-MACHINEOVERRIDES_EXTENDER_mx7d   = "imxfbdev:imxpxp:imxepdc"
+MACHINEOVERRIDES_EXTENDER:mx7d   = "imxfbdev:imxpxp:imxepdc"
-MACHINEOVERRIDES_EXTENDER_mx7ulp = "imxfbdev:imxpxp:imxgpu:imxgpu2d:imxgpu3d"
+MACHINEOVERRIDES_EXTENDER:mx7ulp = "imxfbdev:imxpxp:imxgpu:imxgpu2d:imxgpu3d"
-MACHINEOVERRIDES_EXTENDER_mx8qm  = "imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d"
+MACHINEOVERRIDES_EXTENDER:mx8qm  = "imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d"
-MACHINEOVERRIDES_EXTENDER_mx8mm  = "imxdrm:imxvpu:imxgpu:imxgpu2d:imxgpu3d"
+MACHINEOVERRIDES_EXTENDER:mx8mm  = "imxdrm:imxvpu:imxgpu:imxgpu2d:imxgpu3d"
-MACHINEOVERRIDES_EXTENDER_mx8mn  = "imxdrm:imxgpu:imxgpu3d"
+MACHINEOVERRIDES_EXTENDER:mx8mn  = "imxdrm:imxgpu:imxgpu3d"
-MACHINEOVERRIDES_EXTENDER_mx8mp  = "imxdrm:imxvpu:imxgpu:imxgpu2d:imxgpu3d"
+MACHINEOVERRIDES_EXTENDER:mx8mp  = "imxdrm:imxvpu:imxgpu:imxgpu2d:imxgpu3d"
-MACHINEOVERRIDES_EXTENDER_mx8mq  = "imxdrm:imxvpu:imxgpu:imxgpu3d"
+MACHINEOVERRIDES_EXTENDER:mx8mq  = "imxdrm:imxvpu:imxgpu:imxgpu3d"
-MACHINEOVERRIDES_EXTENDER_mx8qxp = "imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d"
+MACHINEOVERRIDES_EXTENDER:mx8qxp = "imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d"
-MACHINEOVERRIDES_EXTENDER_mx8dxl = "imxfbdev"
+MACHINEOVERRIDES_EXTENDER:mx8dxl = "imxfbdev"
 
-MACHINEOVERRIDES_EXTENDER_FILTER_OUT_use-mainline-bsp = " \
+MACHINEOVERRIDES_EXTENDER_FILTER_OUT:use-mainline-bsp = " \
     imx \
     \
     mx6 \
@@ -182,40 +182,40 @@ MACHINEOVERRIDES_EXTENDER_FILTER_OUT_use-mainline-bsp = " \
 
 # Sub-architecture support
 MACHINE_SOCARCH_SUFFIX ?= ""
-MACHINE_SOCARCH_SUFFIX_mx6q = "-mx6qdl"
+MACHINE_SOCARCH_SUFFIX:mx6q = "-mx6qdl"
-MACHINE_SOCARCH_SUFFIX_mx6dl = "-mx6qdl"
+MACHINE_SOCARCH_SUFFIX:mx6dl = "-mx6qdl"
-MACHINE_SOCARCH_SUFFIX_mx6sx = "-mx6sx"
+MACHINE_SOCARCH_SUFFIX:mx6sx = "-mx6sx"
-MACHINE_SOCARCH_SUFFIX_mx6sl = "-mx6sl"
+MACHINE_SOCARCH_SUFFIX:mx6sl = "-mx6sl"
-MACHINE_SOCARCH_SUFFIX_mx6sll= "-mx6sll"
+MACHINE_SOCARCH_SUFFIX:mx6sll= "-mx6sll"
-MACHINE_SOCARCH_SUFFIX_mx7d = "-mx7d"
+MACHINE_SOCARCH_SUFFIX:mx7d = "-mx7d"
-MACHINE_SOCARCH_SUFFIX_mx7ulp = "-mx7ulp"
+MACHINE_SOCARCH_SUFFIX:mx7ulp = "-mx7ulp"
-MACHINE_SOCARCH_SUFFIX_vf60 = "-vf60"
+MACHINE_SOCARCH_SUFFIX:vf60 = "-vf60"
-MACHINE_SOCARCH_SUFFIX_vf50 = "-vf50"
+MACHINE_SOCARCH_SUFFIX:vf50 = "-vf50"
-MACHINE_SOCARCH_SUFFIX_mx6ul  = "-mx6ul"
+MACHINE_SOCARCH_SUFFIX:mx6ul  = "-mx6ul"
-MACHINE_SOCARCH_SUFFIX_mx6ull = "-mx6ul"
+MACHINE_SOCARCH_SUFFIX:mx6ull = "-mx6ul"
-MACHINE_SOCARCH_SUFFIX_mx6ulz = "-mx6ul"
+MACHINE_SOCARCH_SUFFIX:mx6ulz = "-mx6ul"
-MACHINE_SOCARCH_SUFFIX_mx8qm  = "-mx8"
+MACHINE_SOCARCH_SUFFIX:mx8qm  = "-mx8"
-MACHINE_SOCARCH_SUFFIX_mx8mm  = "-mx8mm"
+MACHINE_SOCARCH_SUFFIX:mx8mm  = "-mx8mm"
-MACHINE_SOCARCH_SUFFIX_mx8mn  = "-mx8mn"
+MACHINE_SOCARCH_SUFFIX:mx8mn  = "-mx8mn"
-MACHINE_SOCARCH_SUFFIX_mx8mp  = "-mx8mp"
+MACHINE_SOCARCH_SUFFIX:mx8mp  = "-mx8mp"
-MACHINE_SOCARCH_SUFFIX_mx8mq  = "-mx8m"
+MACHINE_SOCARCH_SUFFIX:mx8mq  = "-mx8m"
-MACHINE_SOCARCH_SUFFIX_mx8qxp = "-mx8"
+MACHINE_SOCARCH_SUFFIX:mx8qxp = "-mx8"
-MACHINE_SOCARCH_SUFFIX_mx8dxl = "-mx8dxl"
+MACHINE_SOCARCH_SUFFIX:mx8dxl = "-mx8dxl"
-MACHINE_SOCARCH_SUFFIX_use-mainline-bsp = "-imx"
+MACHINE_SOCARCH_SUFFIX:use-mainline-bsp = "-imx"
 
 MACHINE_ARCH_FILTER = "virtual/kernel"
-MACHINE_SOCARCH_FILTER_append_imx = " \
+MACHINE_SOCARCH_FILTER:append_imx = " \
     alsa-lib \
     gstreamer1.0 \
     weston \
 "
-MACHINE_SOCARCH_FILTER_append_imxvpu = " \
+MACHINE_SOCARCH_FILTER:append:imxvpu = " \
     imx-codec \
     imx-vpuwrap \
     libimxvpuapi \
     virtual/imxvpu \
 "
-MACHINE_SOCARCH_FILTER_append_imxgpu = " \
+MACHINE_SOCARCH_FILTER:append:imxgpu = " \
     virtual/egl \
     virtual/mesa \
     virtual/libopenvg \
@@ -225,15 +225,15 @@ MACHINE_SOCARCH_FILTER_append_imxgpu = " \
     opencv \
     pango \
 "
-MACHINE_SOCARCH_FILTER_append_imxgpu2d = " \
+MACHINE_SOCARCH_FILTER:append:imxgpu2d = " \
     virtual/libg2d \
 "
-MACHINE_SOCARCH_FILTER_append_imxgpu3d = " \
+MACHINE_SOCARCH_FILTER:append:imxgpu3d = " \
     virtual/libgl \
     virtual/libgles1 \
     virtual/libgles2 \
 "
-MACHINE_SOCARCH_FILTER_append_use-mainline-bsp = " \
+MACHINE_SOCARCH_FILTER:append:use-mainline-bsp = " \
     virtual/egl \
     virtual/libopenvg \
     virtual/libg2d \
@@ -245,23 +245,23 @@ MACHINE_SOCARCH_FILTER_append_use-mainline-bsp = " \
     pango \
     qtbase \
 "
-MACHINE_SOCARCH_FILTER_append_mx6q = " \
+MACHINE_SOCARCH_FILTER:append:mx6q = " \
     opencl-icd-loader \
     opencl-clhpp \
     opencl-headers \
 "
-MACHINE_SOCARCH_FILTER_append_mx8 = " \
+MACHINE_SOCARCH_FILTER:append:mx8 = " \
     opencl-icd-loader \
     opencl-clhpp \
     opencl-headers \
 "
-MACHINE_SOCARCH_FILTER_append_mx8qm = " \
+MACHINE_SOCARCH_FILTER:append:mx8qm = " \
     virtual/libopenvx \
 "
 
 INHERIT += "fsl-dynamic-packagearch"
 
-SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS_append = " \
+SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS:append = " \
     imx-gpu-viv->kernel-module-imx-gpu-viv \
     libimxvpuapi->virtual/imxvpu \
     imx-vpuwrap->virtual/imxvpu \
@@ -271,44 +271,44 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS_append = " \
 
 # Firmware
 MACHINE_FIRMWARE ?= ""
-MACHINE_FIRMWARE_append_mx25 = " firmware-imx-sdma-imx25"
+MACHINE_FIRMWARE:append:mx25 = " firmware-imx-sdma-imx25"
-MACHINE_FIRMWARE_append_mx27 = " firmware-imx-vpu-imx27"
+MACHINE_FIRMWARE:append_mx27 = " firmware-imx-vpu-imx27"
-MACHINE_FIRMWARE_append_mx7d = " linux-firmware-imx-sdma-imx7d firmware-imx-epdc"
+MACHINE_FIRMWARE:append:mx7d = " linux-firmware-imx-sdma-imx7d firmware-imx-epdc"
-MACHINE_FIRMWARE_append_mx6 = " linux-firmware-imx-sdma-imx6q"
+MACHINE_FIRMWARE:append:mx6 = " linux-firmware-imx-sdma-imx6q"
-MACHINE_FIRMWARE_append_mx6q = " firmware-imx-vpu-imx6q"
+MACHINE_FIRMWARE:append:mx6q = " firmware-imx-vpu-imx6q"
-MACHINE_FIRMWARE_append_mx6dl = " firmware-imx-vpu-imx6d firmware-imx-epdc"
+MACHINE_FIRMWARE:append:mx6dl = " firmware-imx-vpu-imx6d firmware-imx-epdc"
-MACHINE_FIRMWARE_append_mx6sl = " firmware-imx-epdc"
+MACHINE_FIRMWARE:append:mx6sl = " firmware-imx-epdc"
-MACHINE_FIRMWARE_append_mx6sll = " firmware-imx-epdc"
+MACHINE_FIRMWARE:append:mx6sll = " firmware-imx-epdc"
-MACHINE_FIRMWARE_append_mx6ull = " firmware-imx-epdc"
+MACHINE_FIRMWARE:append:mx6ull = " firmware-imx-epdc"
-MACHINE_FIRMWARE_append_mx53 = " firmware-imx-vpu-imx53 firmware-imx-sdma-imx53"
+MACHINE_FIRMWARE:append:mx53 = " firmware-imx-vpu-imx53 firmware-imx-sdma-imx53"
-MACHINE_FIRMWARE_append_mx51 = " firmware-imx-vpu-imx51 firmware-imx-sdma-imx51"
+MACHINE_FIRMWARE:append:mx51 = " firmware-imx-vpu-imx51 firmware-imx-sdma-imx51"
-MACHINE_FIRMWARE_append_mx8mm  = " linux-firmware-imx-sdma-imx7d"
+MACHINE_FIRMWARE:append:mx8mm  = " linux-firmware-imx-sdma-imx7d"
-MACHINE_FIRMWARE_append_mx8mn  = " linux-firmware-imx-sdma-imx7d"
+MACHINE_FIRMWARE:append:mx8mn  = " linux-firmware-imx-sdma-imx7d"
-MACHINE_FIRMWARE_append_mx8mp  = " linux-firmware-imx-sdma-imx7d firmware-imx-easrc-imx8mn firmware-imx-xcvr-imx8mp firmware-sof-imx"
+MACHINE_FIRMWARE:append:mx8mp  = " linux-firmware-imx-sdma-imx7d firmware-imx-easrc-imx8mn firmware-imx-xcvr-imx8mp firmware-sof-imx"
-MACHINE_FIRMWARE_append_mx8mq  = " linux-firmware-imx-sdma-imx7d"
+MACHINE_FIRMWARE:append:mx8mq  = " linux-firmware-imx-sdma-imx7d"
-MACHINE_FIRMWARE_append_mx8qm  = " firmware-imx-vpu-imx8"
+MACHINE_FIRMWARE:append:mx8qm  = " firmware-imx-vpu-imx8"
-MACHINE_FIRMWARE_append_mx8qxp = " firmware-imx-vpu-imx8"
+MACHINE_FIRMWARE:append:mx8qxp = " firmware-imx-vpu-imx8"
-MACHINE_FIRMWARE_append_use-mainline-bsp = " linux-firmware-imx-sdma-imx6q linux-firmware-imx-sdma-imx7d firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d"
+MACHINE_FIRMWARE:append:use-mainline-bsp = " linux-firmware-imx-sdma-imx6q linux-firmware-imx-sdma-imx7d firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d"
 
 MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}"
 
 # Extra audio support
 IMX_ALSA_EXTRA = ""
-IMX_ALSA_EXTRA_use-nxp-bsp = "imx-alsa-plugins"
+IMX_ALSA_EXTRA:use-nxp-bsp = "imx-alsa-plugins"
-MACHINE_EXTRA_RRECOMMENDS_append_mx6 = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', '${IMX_ALSA_EXTRA}', '', d)}"
+MACHINE_EXTRA_RRECOMMENDS:append:mx6 = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', '${IMX_ALSA_EXTRA}', '', d)}"
-MACHINE_EXTRA_RRECOMMENDS_append_mx7 = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', '${IMX_ALSA_EXTRA}', '', d)}"
+MACHINE_EXTRA_RRECOMMENDS:append:mx7 = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', '${IMX_ALSA_EXTRA}', '', d)}"
-MACHINE_EXTRA_RRECOMMENDS_append_mx8 = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', '${IMX_ALSA_EXTRA}', '', d)}"
+MACHINE_EXTRA_RRECOMMENDS:append:mx8 = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', '${IMX_ALSA_EXTRA}', '', d)}"
 
 # Extra Cypress Wi-Fi and BTW firmware (Murata)
-MACHINE_FIRMWARE_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm4339', 'linux-firmware-bcm4339', '', d)}"
+MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm4339', 'linux-firmware-bcm4339', '', d)}"
-MACHINE_FIRMWARE_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm43430', 'linux-firmware-bcm43430', '', d)}"
+MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm43430', 'linux-firmware-bcm43430', '', d)}"
-MACHINE_FIRMWARE_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm43455', 'linux-firmware-bcm43455', '', d)}"
+MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm43455', 'linux-firmware-bcm43455', '', d)}"
-MACHINE_FIRMWARE_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm4356', 'linux-firmware-bcm4356-pcie', '', d)}"
+MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm4356', 'linux-firmware-bcm4356-pcie', '', d)}"
-MACHINE_FIRMWARE_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm4359', 'linux-firmware-bcm4359-pcie', '', d)}"
+MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm4359', 'linux-firmware-bcm4359-pcie', '', d)}"
 
 # Extra QCA Wi-Fi & BTE driver and firmware
-MACHINE_EXTRA_RRECOMMENDS_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'qca6174', 'packagegroup-fsl-qca6174', '', d)}"
+MACHINE_EXTRA_RRECOMMENDS:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'qca6174', 'packagegroup-fsl-qca6174', '', d)}"
-MACHINE_EXTRA_RRECOMMENDS_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'qca9377', 'packagegroup-fsl-qca9377', '', d)}"
+MACHINE_EXTRA_RRECOMMENDS:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'qca9377', 'packagegroup-fsl-qca9377', '', d)}"
 
 # Extra udev rules
 MACHINE_EXTRA_RRECOMMENDS += "udev-rules-imx"
@@ -320,29 +320,29 @@ MACHINE_EXTRA_RRECOMMENDS += " \
 
 # GStreamer 1.0 plugins
 MACHINE_GSTREAMER_1_0_PLUGIN        ?= ""
-MACHINE_GSTREAMER_1_0_PLUGIN_mx6dl  ?= "gstreamer1.0-plugins-imx-meta"
+MACHINE_GSTREAMER_1_0_PLUGIN:mx6dl  ?= "gstreamer1.0-plugins-imx-meta"
-MACHINE_GSTREAMER_1_0_PLUGIN_mx6q   ?= "gstreamer1.0-plugins-imx-meta"
+MACHINE_GSTREAMER_1_0_PLUGIN:mx6q   ?= "gstreamer1.0-plugins-imx-meta"
-MACHINE_GSTREAMER_1_0_PLUGIN_mx6sl  ?= "gstreamer1.0-plugins-imx-meta"
+MACHINE_GSTREAMER_1_0_PLUGIN:mx6sl  ?= "gstreamer1.0-plugins-imx-meta"
-MACHINE_GSTREAMER_1_0_PLUGIN_mx6sx  ?= "gstreamer1.0-plugins-imx-meta"
+MACHINE_GSTREAMER_1_0_PLUGIN:mx6sx  ?= "gstreamer1.0-plugins-imx-meta"
-MACHINE_GSTREAMER_1_0_PLUGIN_mx6ul  ?= "gstreamer1.0-plugins-imx-meta"
+MACHINE_GSTREAMER_1_0_PLUGIN:mx6ul  ?= "gstreamer1.0-plugins-imx-meta"
-MACHINE_GSTREAMER_1_0_PLUGIN_mx6ull ?= "gstreamer1.0-plugins-imx-meta"
+MACHINE_GSTREAMER_1_0_PLUGIN:mx6ull ?= "gstreamer1.0-plugins-imx-meta"
-MACHINE_GSTREAMER_1_0_PLUGIN_mx7d   ?= "gstreamer1.0-plugins-imx-meta"
+MACHINE_GSTREAMER_1_0_PLUGIN:mx7d   ?= "gstreamer1.0-plugins-imx-meta"
-MACHINE_GSTREAMER_1_0_PLUGIN_mx8mm  ?= "imx-gst1.0-plugin"
+MACHINE_GSTREAMER_1_0_PLUGIN:mx8mm  ?= "imx-gst1.0-plugin"
-MACHINE_GSTREAMER_1_0_PLUGIN_mx8mn  ?= "imx-gst1.0-plugin"
+MACHINE_GSTREAMER_1_0_PLUGIN:mx8mn  ?= "imx-gst1.0-plugin"
-MACHINE_GSTREAMER_1_0_PLUGIN_mx8mp  ?= "imx-gst1.0-plugin"
+MACHINE_GSTREAMER_1_0_PLUGIN:mx8mp  ?= "imx-gst1.0-plugin"
-MACHINE_GSTREAMER_1_0_PLUGIN_mx8mq  ?= "imx-gst1.0-plugin"
+MACHINE_GSTREAMER_1_0_PLUGIN:mx8mq  ?= "imx-gst1.0-plugin"
-MACHINE_GSTREAMER_1_0_PLUGIN_mx8qm  ?= "imx-gst1.0-plugin"
+MACHINE_GSTREAMER_1_0_PLUGIN:mx8qm  ?= "imx-gst1.0-plugin"
-MACHINE_GSTREAMER_1_0_PLUGIN_mx8qxp ?= "imx-gst1.0-plugin"
+MACHINE_GSTREAMER_1_0_PLUGIN:mx8qxp ?= "imx-gst1.0-plugin"
 
-PREFERRED_VERSION_gstreamer1.0_mx8 ?= "1.16.2.imx"
+PREFERRED_VERSION_gstreamer1.0:mx8 ?= "1.16.2.imx"
-PREFERRED_VERSION_gstreamer1.0-plugins-base_mx8 ?= "1.16.2.imx"
+PREFERRED_VERSION_gstreamer1.0-plugins-base:mx8 ?= "1.16.2.imx"
-PREFERRED_VERSION_gstreamer1.0-plugins-good_mx8 ?= "1.16.3.imx"
+PREFERRED_VERSION_gstreamer1.0-plugins-good:mx8 ?= "1.16.3.imx"
-PREFERRED_VERSION_gstreamer1.0-plugins-bad_mx8 ?= "1.16.3.imx"
+PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx8 ?= "1.16.3.imx"
-PREFERRED_VERSION_gstreamer1.0-libav_mx8 ?= "1.16.0"
+PREFERRED_VERSION_gstreamer1.0-libav:mx8 ?= "1.16.0"
 
 # Determines if the SoC has support for Vivante kernel driver
 SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT        = "0"
-SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT_imxgpu = "1"
+SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT:imxgpu = "1"
 
 # Handle Vivante kernel driver setting:
 #   0 - machine does not have Vivante GPU driver support
@@ -361,53 +361,53 @@ PREFERRED_PROVIDER_virtual/libgles1_imxgpu3d ?= "imx-gpu-viv"
 PREFERRED_PROVIDER_virtual/libgles2_imxgpu3d ?= "imx-gpu-viv"
 PREFERRED_PROVIDER_virtual/libg2d            ?= "imx-gpu-g2d"
 PREFERRED_PROVIDER_virtual/libg2d_imxdpu     ?= "imx-dpu-g2d"
-PREFERRED_PROVIDER_opencl-clhpp_imxgpu       ?= "imx-gpu-viv"
+PREFERRED_PROVIDER_opencl-clhpp:imxgpu       ?= "imx-gpu-viv"
-PREFERRED_PROVIDER_opencl-headers_imxgpu     ?= "imx-gpu-viv"
+PREFERRED_PROVIDER_opencl-headers:imxgpu     ?= "imx-gpu-viv"
-PREFERRED_PROVIDER_opencl-icd-loader_imxgpu  ?= "imx-gpu-viv"
+PREFERRED_PROVIDER_opencl-icd-loader:imxgpu  ?= "imx-gpu-viv"
 
 PREFERRED_VERSION_weston_imx ?= "9.0.0.imx"
-PREFERRED_VERSION_weston_use-mainline-bsp = ""
+PREFERRED_VERSION_weston:use-mainline-bsp = ""
 
-PREFERRED_VERSION_wayland-protocols_mx6 ?= "1.20.imx"
+PREFERRED_VERSION_wayland-protocols:mx6 ?= "1.20.imx"
-PREFERRED_VERSION_wayland-protocols_mx7 ?= "1.20.imx"
+PREFERRED_VERSION_wayland-protocols:mx7 ?= "1.20.imx"
-PREFERRED_VERSION_wayland-protocols_mx8 ?= "1.20.imx"
+PREFERRED_VERSION_wayland-protocols:mx8 ?= "1.20.imx"
 
 # Use i.MX libdrm Version
-PREFERRED_VERSION_libdrm_mx6 ?= "2.4.102.imx"
+PREFERRED_VERSION_libdrm:mx6 ?= "2.4.102.imx"
-PREFERRED_VERSION_libdrm_mx7 ?= "2.4.102.imx"
+PREFERRED_VERSION_libdrm:mx7 ?= "2.4.102.imx"
-PREFERRED_VERSION_libdrm_mx8 ?= "2.4.102.imx"
+PREFERRED_VERSION_libdrm:mx8 ?= "2.4.102.imx"
 
 # Use i.MX optee Version
-PREFERRED_VERSION_optee-os_mx8     ?= "3.10.0.imx"
+PREFERRED_VERSION_optee-os:mx8     ?= "3.10.0.imx"
-PREFERRED_VERSION_optee-client_mx8 ?= "3.10.0.imx"
+PREFERRED_VERSION_optee-client:mx8 ?= "3.10.0.imx"
-PREFERRED_VERSION_optee-test_mx8   ?= "3.10.0.imx"
+PREFERRED_VERSION_optee-test:mx8   ?= "3.10.0.imx"
 
 #Use i.MX opencv Version for mx8
-PREFERRED_VERSION_opencv_mx8 ?= "4.5.2.imx"
+PREFERRED_VERSION_opencv:mx8 ?= "4.5.2.imx"
 
 # Handle default kernel
 IMX_DEFAULT_KERNEL = "linux-fslc-imx"
-IMX_DEFAULT_KERNEL_mxs = "linux-fslc"
+IMX_DEFAULT_KERNEL:mxs = "linux-fslc"
-IMX_DEFAULT_KERNEL_mx5 = "linux-fslc"
+IMX_DEFAULT_KERNEL:mx5 = "linux-fslc"
-IMX_DEFAULT_KERNEL_mx6 = "linux-fslc-imx"
+IMX_DEFAULT_KERNEL:mx6 = "linux-fslc-imx"
-IMX_DEFAULT_KERNEL_mx7 = "linux-fslc-imx"
+IMX_DEFAULT_KERNEL:mx7 = "linux-fslc-imx"
-IMX_DEFAULT_KERNEL_mx8 = "linux-fslc-imx"
+IMX_DEFAULT_KERNEL:mx8 = "linux-fslc-imx"
-IMX_DEFAULT_KERNEL_mx7ulp = "linux-fslc-imx"
+IMX_DEFAULT_KERNEL:mx7ulp = "linux-fslc-imx"
-IMX_DEFAULT_KERNEL_mx6sll = "linux-fslc-imx"
+IMX_DEFAULT_KERNEL:mx6sll = "linux-fslc-imx"
-IMX_DEFAULT_KERNEL_mx6ul = "linux-fslc-imx"
+IMX_DEFAULT_KERNEL:mx6ul = "linux-fslc-imx"
-IMX_DEFAULT_KERNEL_mx6ull = "linux-fslc-imx"
+IMX_DEFAULT_KERNEL:mx6ull = "linux-fslc-imx"
-IMX_DEFAULT_KERNEL_use-mainline-bsp = "linux-fslc"
+IMX_DEFAULT_KERNEL:use-mainline-bsp = "linux-fslc"
 
 PREFERRED_PROVIDER_virtual/kernel ??= "${IMX_DEFAULT_KERNEL}"
 
 SOC_DEFAULT_IMAGE_FSTYPES = "wic.bmap wic.gz"
-SOC_DEFAULT_IMAGE_FSTYPES_mxs = "uboot-mxsboot-sdcard wic.bmap wic.gz"
+SOC_DEFAULT_IMAGE_FSTYPES:mxs = "uboot-mxsboot-sdcard wic.bmap wic.gz"
 
 # Do not update fstab file when using wic images
 WIC_CREATE_EXTRA_ARGS ?= "--no-fstab-update"
 
 OPTEE_BOOT_IMAGE         = "uTee"
-OPTEE_BOOT_IMAGE_aarch64 = ""
+OPTEE_BOOT_IMAGE:aarch64 = ""
 
 IMAGE_FSTYPES ?= "${SOC_DEFAULT_IMAGE_FSTYPES}"
 
@@ -419,7 +419,7 @@ IMAGE_BOOT_FILES ?= " \
 
 ### wic default support
 OPTEE_WKS_FILE_DEPENDS         = "optee-os"
-OPTEE_WKS_FILE_DEPENDS_aarch64 = ""
+OPTEE_WKS_FILE_DEPENDS:aarch64 = ""
 
 WKS_FILE_DEPENDS ?= " \
     virtual/bootloader \
@@ -429,8 +429,8 @@ WKS_FILE_DEPENDS ?= " \
     ${@bb.utils.contains('MACHINE_FEATURES', 'optee', '${OPTEE_WKS_FILE_DEPENDS}', '', d)} \
 "
 
-WKS_FILE_DEPENDS_append_mx8 = " imx-boot"
+WKS_FILE_DEPENDS:append:mx8 = " imx-boot"
-WKS_FILE_DEPENDS_append_mx8m = " imx-boot"
+WKS_FILE_DEPENDS:append:mx8m = " imx-boot"
 
 # We need to restrict the append so we don't add this for other i.MX SoC's.
 # Derivatives that are not yet adopted the usage of boot container provided
@@ -444,15 +444,15 @@ WKS_FILE_DEPENDS_append_mx8m = " imx-boot"
 # deployment task extesion execution defined in imx-boot-container class.
 # For NXP BSP: rename is done in 'imx-boot' recipe at the execution of compile
 # task.
-WKS_FILE_DEPENDS_append_use-mainline-bsp_aarch64 = " \
+WKS_FILE_DEPENDS:append:use-mainline-bsp:aarch64 = " \
     ${@oe.utils.ifelse(d.getVar('UBOOT_PROVIDES_BOOT_CONTAINER') == '0', 'imx-boot', '')} \
 "
 
 SOC_DEFAULT_WKS_FILE ?= "imx-uboot-bootpart.wks.in"
-SOC_DEFAULT_WKS_FILE_mx8m ?= "imx-imx-boot-bootpart.wks.in"
+SOC_DEFAULT_WKS_FILE:mx8m ?= "imx-imx-boot-bootpart.wks.in"
 
-SOC_DEFAULT_WKS_FILE_mx8 ?= "imx-imx-boot-bootpart.wks.in"
+SOC_DEFAULT_WKS_FILE:mx8 ?= "imx-imx-boot-bootpart.wks.in"
-SOC_DEFAULT_WKS_FILE_mxs ?= "imx-uboot-mxs-bootpart.wks.in"
+SOC_DEFAULT_WKS_FILE:mxs ?= "imx-uboot-mxs-bootpart.wks.in"
 
 # Boot container built as a part of mainline U-Boot uses different WKS
 # file as the entire mx8m series, as U-Boot versions later than 2021.04 are
@@ -462,19 +462,19 @@ SOC_DEFAULT_WKS_FILE_mxs ?= "imx-uboot-mxs-bootpart.wks.in"
 # replacement of imx-boot from NXP.
 # Creation of those binary files is controlled by UBOOT_PROVIDES_BOOT_CONTAINER
 # variable defined above.
-SOC_DEFAULT_WKS_FILE_imx-boot-container ?= "imx-boot-container-bootpart.wks.in"
+SOC_DEFAULT_WKS_FILE:imx-boot-container ?= "imx-boot-container-bootpart.wks.in"
 
 WKS_FILE ?= "${SOC_DEFAULT_WKS_FILE}"
 
 SERIAL_CONSOLES = "115200;ttymxc0"
-SERIAL_CONSOLES_mxs = "115200;ttyAMA0"
+SERIAL_CONSOLES:mxs = "115200;ttyAMA0"
 
 KERNEL_IMAGETYPE = "zImage"
-KERNEL_IMAGETYPE_aarch64 = "Image"
+KERNEL_IMAGETYPE:aarch64 = "Image"
 
 MACHINE_FEATURES = "usbgadget usbhost vfat alsa touchscreen"
 
 # Add the ability to specify _imx machines
 MACHINEOVERRIDES =. "imx:"
 
-HOSTTOOLS_NONFATAL_append_mx8 = " sha384sum"
+HOSTTOOLS_NONFATAL:append:mx8 = " sha384sum"

conf/machine/include/imx8dxl-evk.inc

@@ -6,10 +6,10 @@ require conf/machine/include/tune-cortexa35.inc
 IMX_DEFAULT_BSP = "nxp"
 
 MACHINE_FEATURES += "pci bcm43455 bcm4356"
-MACHINE_FEATURES_append_use-nxp-bsp = " bcm4359"
+MACHINE_FEATURES:append:use-nxp-bsp = " bcm4359"
 
 # Don't include kernels in standard images
-RDEPENDS_${KERNEL_PACKAGE_NAME}-base = ""
+RDEPENDS:${KERNEL_PACKAGE_NAME}-base = ""
 
 LOADADDR = ""
 
@@ -23,7 +23,7 @@ USE_VT = "0"
 KERNEL_DEVICETREE = " \
     freescale/${KERNEL_DEVICETREE_BASENAME}.dtb \
 "
-KERNEL_DEVICETREE_append_use-nxp-bsp = " \
+KERNEL_DEVICETREE:append:use-nxp-bsp = " \
     freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg.dtb \
 "
 

conf/machine/include/imx8mm-evk.inc

@@ -11,19 +11,19 @@ MACHINE_FEATURES += "pci wifi bluetooth bcm43455 bcm4356"
 # and pin it to NXP BSP only
 # OP-TEE is also applicable to NXP BSP, mainline BSP seems not to have
 # a full support for it yet.
-MACHINE_FEATURES_append_use-nxp-bsp = " optee jailhouse bcm4359 qca9377"
+MACHINE_FEATURES:append:use-nxp-bsp = " optee jailhouse bcm4359 qca9377"
 
 KERNEL_DEVICETREE = " \
     freescale/${KERNEL_DEVICETREE_BASENAME}.dtb \
 "
-KERNEL_DEVICETREE_append_use-nxp-bsp = " \
+KERNEL_DEVICETREE:append:use-nxp-bsp = " \
 	freescale/${KERNEL_DEVICETREE_BASENAME}-pcie-ep.dtb \
 	freescale/${KERNEL_DEVICETREE_BASENAME}-rm67191.dtb \
 "
 UBOOT_DTB_NAME = "${KERNEL_DEVICETREE_BASENAME}.dtb"
 
-IMX_DEFAULT_BOOTLOADER_use-nxp-bsp = "u-boot-imx"
+IMX_DEFAULT_BOOTLOADER:use-nxp-bsp = "u-boot-imx"
-IMX_DEFAULT_BOOTLOADER_use-mainline-bsp = "u-boot-fslc"
+IMX_DEFAULT_BOOTLOADER:use-mainline-bsp = "u-boot-fslc"
 
 UBOOT_SUFFIX = "bin"
 
@@ -51,18 +51,18 @@ SERIAL_CONSOLES = "115200;ttymxc1"
 # to be used to define the boot process.
 # We opt-in for Syslinux, since it is designated as a preferred
 # distro boot mode according to the U-Boot documentation.
-UBOOT_EXTLINUX_use-mainline-bsp = "1"
+UBOOT_EXTLINUX:use-mainline-bsp = "1"
-UBOOT_EXTLINUX_LABELS_use-mainline-bsp = "default"
+UBOOT_EXTLINUX_LABELS:use-mainline-bsp = "default"
-UBOOT_EXTLINUX_DEFAULT_LABEL_use-mainline-bsp = "i.MX8M Mini EVK"
+UBOOT_EXTLINUX_DEFAULT_LABEL:use-mainline-bsp = "i.MX8M Mini EVK"
 
-UBOOT_EXTLINUX_MENU_DESCRIPTION_default_use-mainline-bsp = "i.MX8M Mini EVK"
+UBOOT_EXTLINUX_MENU_DESCRIPTION_default:use-mainline-bsp = "i.MX8M Mini EVK"
-UBOOT_EXTLINUX_FDT_default_use-mainline-bsp     = "../${KERNEL_DEVICETREE_BASENAME}.dtb"
+UBOOT_EXTLINUX_FDT_default:use-mainline-bsp     = "../${KERNEL_DEVICETREE_BASENAME}.dtb"
-UBOOT_EXTLINUX_CONSOLE_default_use-mainline-bsp = "console=${console}"
+UBOOT_EXTLINUX_CONSOLE_default:use-mainline-bsp = "console=${console}"
-UBOOT_EXTLINUX_ROOT_default_use-mainline-bsp    = "root=/dev/mmcblk1p2"
+UBOOT_EXTLINUX_ROOT_default:use-mainline-bsp    = "root=/dev/mmcblk1p2"
 
 # Add extlinux.conf to the lis of files, which are deployed onto the
 # boot partition
-IMAGE_BOOT_FILES_append_use-mainline-bsp = " extlinux.conf;extlinux/extlinux.conf"
+IMAGE_BOOT_FILES:append:use-mainline-bsp = " extlinux.conf;extlinux/extlinux.conf"
 
 LOADADDR = ""
 UBOOT_SUFFIX = "bin"
@@ -73,4 +73,4 @@ OPTEE_BIN_EXT = "8mm"
 TEE_LOAD_ADDR = "0xbe000000"
 
 # Add additional firmware
-MACHINE_FIRMWARE_append = " linux-firmware-ath10k"
+MACHINE_FIRMWARE:append = " linux-firmware-ath10k"

conf/machine/include/imx8mn-evk.inc

@@ -8,12 +8,12 @@ MACHINE_FEATURES += "wifi bluetooth bcm43455 bcm4356"
 # NXP BSP can consume proprietary jailhouse and Broadcom drivers
 # OP-TEE is also applicable to NXP BSP, mainline BSP seems not to have
 # a full support for it yet.
-MACHINE_FEATURES_append_use-nxp-bsp = " optee jailhouse bcm4359"
+MACHINE_FEATURES:append:use-nxp-bsp = " optee jailhouse bcm4359"
 
 KERNEL_DEVICETREE = " \
 	freescale/${KERNEL_DEVICETREE_BASENAME}.dtb \
 "
-KERNEL_DEVICETREE_append_use-nxp-bsp = " \
+KERNEL_DEVICETREE:append:use-nxp-bsp = " \
 	freescale/${KERNEL_DEVICETREE_BASENAME}-ak5558.dtb \
 	freescale/${KERNEL_DEVICETREE_BASENAME}-inmate.dtb \
 	freescale/${KERNEL_DEVICETREE_BASENAME}-rm67191.dtb \
@@ -22,8 +22,8 @@ KERNEL_DEVICETREE_append_use-nxp-bsp = " \
 "
 UBOOT_DTB_NAME = "${KERNEL_DEVICETREE_BASENAME}.dtb"
 
-IMX_DEFAULT_BOOTLOADER_use-nxp-bsp = "u-boot-imx"
+IMX_DEFAULT_BOOTLOADER:use-nxp-bsp = "u-boot-imx"
-IMX_DEFAULT_BOOTLOADER_use-mainline-bsp = "u-boot-fslc"
+IMX_DEFAULT_BOOTLOADER:use-mainline-bsp = "u-boot-fslc"
 
 UBOOT_SUFFIX = "bin"
 
@@ -52,18 +52,18 @@ SERIAL_CONSOLES = "115200;ttymxc1"
 # to be used to define the boot process.
 # We opt-in for Syslinux, since it is designated as a preferred
 # distro boot mode according to the U-Boot documentation.
-UBOOT_EXTLINUX_use-mainline-bsp = "1"
+UBOOT_EXTLINUX:use-mainline-bsp = "1"
-UBOOT_EXTLINUX_LABELS_use-mainline-bsp = "default"
+UBOOT_EXTLINUX_LABELS:use-mainline-bsp = "default"
-UBOOT_EXTLINUX_DEFAULT_LABEL_use-mainline-bsp = "i.MX8M Nano EVK"
+UBOOT_EXTLINUX_DEFAULT_LABEL:use-mainline-bsp = "i.MX8M Nano EVK"
 
-UBOOT_EXTLINUX_MENU_DESCRIPTION_default_use-mainline-bsp = "i.MX8M Nano EVK"
+UBOOT_EXTLINUX_MENU_DESCRIPTION_default:use-mainline-bsp = "i.MX8M Nano EVK"
-UBOOT_EXTLINUX_FDT_default_use-mainline-bsp     = "../${KERNEL_DEVICETREE_BASENAME}.dtb"
+UBOOT_EXTLINUX_FDT_default:use-mainline-bsp     = "../${KERNEL_DEVICETREE_BASENAME}.dtb"
-UBOOT_EXTLINUX_CONSOLE_default_use-mainline-bsp = "console=${console}"
+UBOOT_EXTLINUX_CONSOLE_default:use-mainline-bsp = "console=${console}"
-UBOOT_EXTLINUX_ROOT_default_use-mainline-bsp    = "root=/dev/mmcblk1p2"
+UBOOT_EXTLINUX_ROOT_default:use-mainline-bsp    = "root=/dev/mmcblk1p2"
 
 # Add extlinux.conf to the lis of files, which are deployed onto the
 # boot partition
-IMAGE_BOOT_FILES_append_use-mainline-bsp = " extlinux.conf;extlinux/extlinux.conf"
+IMAGE_BOOT_FILES:append:use-mainline-bsp = " extlinux.conf;extlinux/extlinux.conf"
 
 BOOT_SPACE = "65536"
 LOADADDR = ""
@@ -79,4 +79,4 @@ OPTEE_BIN_EXT = "8mn"
 TEE_LOAD_ADDR = "0x56000000"
 
 # Add additional firmware
-MACHINE_FIRMWARE_append = " linux-firmware-ath10k"
+MACHINE_FIRMWARE:append = " linux-firmware-ath10k"

conf/machine/include/imx8mp-evk.inc

@@ -8,7 +8,7 @@ MACHINE_FEATURES += "pci wifi bluetooth"
 # NXP BSP can consume proprietary jailhouse and Marvell drivers
 # OP-TEE is also applicable to NXP BSP, mainline BSP seems not to have
 # a full support for it yet.
-MACHINE_FEATURES_append_use-nxp-bsp = " optee jailhouse mrvl8997"
+MACHINE_FEATURES:append:use-nxp-bsp = " optee jailhouse mrvl8997"
 
 # Mainline kernel contains only one DTB file for
 # imx8mpevk machine
@@ -18,8 +18,8 @@ KERNEL_DEVICETREE = " \
 
 UBOOT_DTB_NAME = "${KERNEL_DEVICETREE_BASENAME}.dtb"
 
-IMX_DEFAULT_BOOTLOADER_use-nxp-bsp = "u-boot-imx"
+IMX_DEFAULT_BOOTLOADER:use-nxp-bsp = "u-boot-imx"
-IMX_DEFAULT_BOOTLOADER_use-mainline-bsp = "u-boot-fslc"
+IMX_DEFAULT_BOOTLOADER:use-mainline-bsp = "u-boot-fslc"
 
 UBOOT_SUFFIX = "bin"
 
@@ -50,18 +50,18 @@ SERIAL_CONSOLES = "115200;ttymxc1"
 # to be used to define the boot process.
 # We opt-in for Syslinux, since it is designated as a preferred
 # distro boot mode according to the U-Boot documentation.
-UBOOT_EXTLINUX_use-mainline-bsp = "1"
+UBOOT_EXTLINUX:use-mainline-bsp = "1"
-UBOOT_EXTLINUX_LABELS_use-mainline-bsp = "default"
+UBOOT_EXTLINUX_LABELS:use-mainline-bsp = "default"
-UBOOT_EXTLINUX_DEFAULT_LABEL_use-mainline-bsp = "i.MX8M Plus EVK"
+UBOOT_EXTLINUX_DEFAULT_LABEL:use-mainline-bsp = "i.MX8M Plus EVK"
 
-UBOOT_EXTLINUX_MENU_DESCRIPTION_default_use-mainline-bsp = "i.MX8M Plus EVK"
+UBOOT_EXTLINUX_MENU_DESCRIPTION_default:use-mainline-bsp = "i.MX8M Plus EVK"
-UBOOT_EXTLINUX_FDT_default_use-mainline-bsp     = "../${KERNEL_DEVICETREE_BASENAME}.dtb"
+UBOOT_EXTLINUX_FDT_default:use-mainline-bsp     = "../${KERNEL_DEVICETREE_BASENAME}.dtb"
-UBOOT_EXTLINUX_CONSOLE_default_use-mainline-bsp = "console=${console}"
+UBOOT_EXTLINUX_CONSOLE_default:use-mainline-bsp = "console=${console}"
-UBOOT_EXTLINUX_ROOT_default_use-mainline-bsp    = "root=/dev/mmcblk1p2"
+UBOOT_EXTLINUX_ROOT_default:use-mainline-bsp    = "root=/dev/mmcblk1p2"
 
 # Add extlinux.conf to the lis of files, which are deployed onto the
 # boot partition
-IMAGE_BOOT_FILES_append_use-mainline-bsp = " extlinux.conf;extlinux/extlinux.conf"
+IMAGE_BOOT_FILES:append:use-mainline-bsp = " extlinux.conf;extlinux/extlinux.conf"
 
 LOADADDR = ""
 UBOOT_SUFFIX = "bin"
@@ -72,4 +72,4 @@ OPTEE_BIN_EXT = "8mp"
 TEE_LOAD_ADDR = "0x56000000"
 
 # Add additional firmware
-MACHINE_FIRMWARE_append = " linux-firmware-ath10k"
+MACHINE_FIRMWARE:append = " linux-firmware-ath10k"

conf/machine/include/imx8x-mek.inc

@@ -6,10 +6,10 @@ require conf/machine/include/tune-cortexa35.inc
 IMX_DEFAULT_BSP = "nxp"
 
 MACHINE_FEATURES += "pci optee bcm43455 bcm4356"
-MACHINE_FEATURES_append_use-nxp-bsp = " bcm4359"
+MACHINE_FEATURES:append:use-nxp-bsp = " bcm4359"
 
 # Don't include kernels in standard images
-RDEPENDS_${KERNEL_PACKAGE_NAME}-base = ""
+RDEPENDS:${KERNEL_PACKAGE_NAME}-base = ""
 
 LOADADDR = ""
 
@@ -23,7 +23,7 @@ USE_VT = "0"
 KERNEL_DEVICETREE = " \
     freescale/${KERNEL_DEVICETREE_BASENAME}.dtb \
 "
-KERNEL_DEVICETREE_append_use-nxp-bsp = " \
+KERNEL_DEVICETREE:append:use-nxp-bsp = " \
     freescale/${KERNEL_DEVICETREE_BASENAME}-dsi-rm67191.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-dsi-rm67191-rpmsg.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-dsp.dtb \
@@ -71,4 +71,4 @@ IMXBOOT_TARGETS = \
 BOARD_TYPE = "mek"
 
 # Add additional firmware
-MACHINE_FIRMWARE_append = " linux-firmware-ath10k"
+MACHINE_FIRMWARE:append = " linux-firmware-ath10k"

conf/machine/include/qoriq-base.inc

@@ -9,8 +9,8 @@ PREFERRED_PROVIDER_nativesdk-u-boot-mkimage ??= "nativesdk-u-boot-tools"
 PREFERRED_VERSION_testfloat = "2a"
 
 SOC_DEFAULT_IMAGE_FSTYPES = "tar.gz"
-SOC_DEFAULT_IMAGE_FSTYPES_append_ls1043a = " wic.bz2"
+SOC_DEFAULT_IMAGE_FSTYPES:append:ls1043a = " wic.bz2"
-SOC_DEFAULT_IMAGE_FSTYPES_append_ls1046a = " wic.bz2"
+SOC_DEFAULT_IMAGE_FSTYPES:append:ls1046a = " wic.bz2"
 IMAGE_FSTYPES ?= "${SOC_DEFAULT_IMAGE_FSTYPES}"
 
 # Composite Image Layout (in KBytes)
@@ -31,8 +31,8 @@ IMAGE_BOOT_FILES ?= " \
 "
 
 SOC_DEFAULT_WKS_FILE ?= ""
-SOC_DEFAULT_WKS_FILE_ls1043a ?= "ls104x-uboot-bootpart.wks.in"
+SOC_DEFAULT_WKS_FILE:ls1043a ?= "ls104x-uboot-bootpart.wks.in"
-SOC_DEFAULT_WKS_FILE_ls1046a ?= "ls104x-uboot-bootpart.wks.in"
+SOC_DEFAULT_WKS_FILE:ls1046a ?= "ls104x-uboot-bootpart.wks.in"
 
 WKS_FILE ?= "${SOC_DEFAULT_WKS_FILE}"
 
@@ -54,7 +54,7 @@ MACHINEOVERRIDES =. "use-${QORIQ_DEFAULT_BSP}-bsp:"
 
 # Sub-architecture support
 MACHINE_SOCARCH_SUFFIX ?= ""
-MACHINE_SOCARCH_SUFFIX_qoriq = "-qoriq"
+MACHINE_SOCARCH_SUFFIX:qoriq = "-qoriq"
 
 MACHINE_ARCH_FILTER = "virtual/kernel"
 

conf/machine/include/utilities.inc

@@ -23,6 +23,6 @@ def make_dtb_boot_files(d):
 
 def get_spl_binary(d):
     imx_default_bootloader = d.get('IMX_DEFAULT_BOOTLOADER')
-    spl_binary = d.getVar("SPL_BINARY_pn-%s" % imx_default_bootloader)
+    spl_binary = d.getVar("SPL_BINARY:pn-%s" % imx_default_bootloader)
 
     return spl_binary or ""

conf/machine/ls1028ardb.conf

@@ -22,7 +22,7 @@ UBOOT_CONFIG[tfa-secure-boot] = "ls1028ardb_tfa_SECURE_BOOT_defconfig"
 UBOOT_CONFIG[tfa] = "ls1028ardb_tfa_defconfig"
 
 KERNEL_DEVICETREE ?= "freescale/fsl-ls1028a-rdb.dtb freescale/fsl-ls1028a-qds.dtb"
-KERNEL_DEVICETREE_append_use-nxp-bsp = "\
+KERNEL_DEVICETREE:append:use-nxp-bsp = "\
     freescale/fsl-ls1028a-rdb-dpdk.dtb \
 "
 KERNEL_DEFCONFIG ?= "defconfig"

conf/machine/ls1043ardb.conf

@@ -27,7 +27,7 @@ KERNEL_DEVICETREE ?= "\
     freescale/fsl-ls1043a-qds.dtb \
 "
 # usdpaa dtb is used for dpdk. TODO: rename in kernel
-KERNEL_DEVICETREE_prepend_use-nxp-bsp = "\
+KERNEL_DEVICETREE:prepend:use-nxp-bsp = "\
     freescale/fsl-ls1043a-rdb-sdk.dtb \
     freescale/fsl-ls1043a-rdb-usdpaa.dtb \
     freescale/fsl-ls1043a-qds-sdk.dtb \

conf/machine/ls1046afrwy.conf

@@ -25,7 +25,7 @@ KERNEL_DEVICETREE ?= "\
     freescale/fsl-ls1046a-frwy.dtb \
 "
 # usdpaa dtb is used for dpdk. TODO: rename in kernel
-KERNEL_DEVICETREE_prepend_use-nxp-bsp = "\
+KERNEL_DEVICETREE:prepend:use-nxp-bsp = "\
     freescale/fsl-ls1046a-frwy-sdk.dtb \
     freescale/fsl-ls1046a-frwy-usdpaa.dtb \
 "

conf/machine/ls1046ardb.conf

@@ -26,7 +26,7 @@ KERNEL_DEVICETREE ?= "\
     freescale/fsl-ls1046a-qds.dtb \
 "
 # usdpaa dtb is used for dpdk. TODO: rename in kernel
-KERNEL_DEVICETREE_prepend_use-nxp-bsp = "\
+KERNEL_DEVICETREE:prepend:use-nxp-bsp = "\
     freescale/fsl-ls1046a-rdb-sdk.dtb \
     freescale/fsl-ls1046a-rdb-usdpaa.dtb \
     freescale/fsl-ls1046a-qds-sdk.dtb \

dynamic-layers/aglprofilegraphical/recipes-graphics/wayland/weston-init.bbappend

@@ -1,3 +1,3 @@
-do_install_append() {
+do_install:append() {
     rm -f ${D}${sysconfdir}/xdg/weston/weston.ini
 }

dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-imx.inc

@@ -1,4 +1,4 @@
-DEPENDS_append_imxvpu = " imx-vpuwrap"
+DEPENDS:append:imxvpu = " imx-vpuwrap"
 
 # Additional imx code and patches are included in the chromium-imx git repository.
 # The code below fetches this repository, copies the extra source over to the main
@@ -26,7 +26,7 @@ do_patch[prefuncs] =+ "add_chromium_imx_patches"
 # * Lost context problems are not known to happen with Vivante GPUs,
 #   so it is safe to use ignore-lost-context
 # * Proprietary codecs need to be enabled for h.264 and MP4 support
-PACKAGECONFIG_append = " ignore-lost-context proprietary-codecs"
+PACKAGECONFIG:append = " ignore-lost-context proprietary-codecs"
 
 copy_chromium_imx_files() {
 	# sources in src/ are already organized in a manner

dynamic-layers/filesystem-layer/recipes-fsl/packagegroups/packagegroup-fsl-mfgtool.bbappend

@@ -4,7 +4,7 @@ PACKAGES += " \
     ${PN}-f2fs \
 "
 
-RDEPENDS_${PN}-f2fs = " \
+RDEPENDS:${PN}-f2fs = " \
     ${PN}-base \
     f2fs-tools \
 "

dynamic-layers/gnome-layer/recipes-graphics/clutter/clutter-1.0_%.bbappend

@@ -1,4 +1,4 @@
-PACKAGECONFIG_imxgpu3d ??= " \
+PACKAGECONFIG:imxgpu3d ??= " \
     ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland egl', \
        bb.utils.contains('DISTRO_FEATURES',     'x11', 'glx x11', \
                                                        '', d), d)} \

dynamic-layers/gnome-layer/recipes-graphics/cogl/cogl-1.0_%.bbappend

@@ -1,4 +1,4 @@
-PACKAGECONFIG_imxgpu3d ??= " \
+PACKAGECONFIG:imxgpu3d ??= " \
     cogl-pango gles2 \
     ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'egl-wayland', \
        bb.utils.contains('DISTRO_FEATURES',     'x11', 'egl-x11', \

dynamic-layers/ivi/recipes-graphics/wayland/weston-init.bbappend

@@ -1 +1 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"

dynamic-layers/openembedded-layer/recipes-benchmark/glmark2/glmark2_%.bbappend

@@ -1,4 +1,4 @@
 # Only _mx8 machine do provide virtual/libgbm required for any drm* flavour
-DRM-REMOVE_imxgpu = "drm-gl drm-gles2"
+DRM-REMOVE:imxgpu = "drm-gl drm-gles2"
-DRM-REMOVE_imxgpu_mx8 = ""
+DRM-REMOVE:imxgpu:mx8 = ""
-PACKAGECONFIG_remove = "${DRM-REMOVE}"
+PACKAGECONFIG:remove = "${DRM-REMOVE}"

dynamic-layers/openembedded-layer/recipes-devtools/luajit/luajit_%.bbappend

@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
 
-SRC_URI_append_qoriq-ppc = " file://ppc-fixplt.patch "
+SRC_URI:append:qoriq-ppc = " file://ppc-fixplt.patch "
 

dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb

@@ -19,15 +19,15 @@ EXTRA_OEMAKE_virtclass-native = 'FMCHOSTMODE=1 FMD_USPACE_HEADER_PATH="${STAGING
     TCLAP_HEADER_PATH="${STAGING_INCDIR}" '
 
 EXTRA_OEMAKE_PLATFORM ?= ""
-EXTRA_OEMAKE_PLATFORM_ls1043a = "ls1043"
+EXTRA_OEMAKE_PLATFORM:ls1043a = "ls1043"
-EXTRA_OEMAKE_PLATFORM_ls1046a = "ls1046"
+EXTRA_OEMAKE_PLATFORM:ls1046a = "ls1046"
-EXTRA_OEMAKE_PLATFORM_ls1088a = "ls1088"
+EXTRA_OEMAKE_PLATFORM:ls1088a = "ls1088"
-EXTRA_OEMAKE_PLATFORM_p1020 = "p4080ds"
+EXTRA_OEMAKE_PLATFORM:p1020 = "p4080ds"
-EXTRA_OEMAKE_PLATFORM_p2020 = "p4080ds"
+EXTRA_OEMAKE_PLATFORM:p2020 = "p4080ds"
-EXTRA_OEMAKE_PLATFORM_p2041 = "p4080ds"
+EXTRA_OEMAKE_PLATFORM:p2041 = "p4080ds"
-EXTRA_OEMAKE_PLATFORM_p3041 = "p4080ds"
+EXTRA_OEMAKE_PLATFORM:p3041 = "p4080ds"
-EXTRA_OEMAKE_PLATFORM_p4080 = "p4080ds"
+EXTRA_OEMAKE_PLATFORM:p4080 = "p4080ds"
-EXTRA_OEMAKE_PLATFORM_p5040 = "p4080ds"
+EXTRA_OEMAKE_PLATFORM:p5040 = "p4080ds"
 
 
 do_compile () {

dynamic-layers/openembedded-layer/recipes-graphics/xserver-common/xserver-common_%.bbappend

@@ -1,8 +1,8 @@
 # i.MX extra configuration 
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-SRC_URI_append_imxgpu3d = " \
+SRC_URI:append:imxgpu3d = " \
     file://0016-xserver-common-enable-iglx-module.patch \
 "
 
-PACKAGE_ARCH_imxgpu3d = "${MACHINE_SOCARCH}"
+PACKAGE_ARCH:imxgpu3d = "${MACHINE_SOCARCH}"

dynamic-layers/qt4-layer/recipes-qt4/qt4/qt4-imx-support.inc

@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/qt4:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/qt4:"
 
 python __anonymous () {
     families = ['mx6']
@@ -8,21 +8,21 @@ python __anonymous () {
         d.appendVarFlag('do_configure', 'depends', ' virtual/kernel:do_shared_workdir')
 }
 
-SRC_URI_append_imxgpu2d += " \
+SRC_URI:append:imxgpu2d += " \
 	file://0001-Add-support-for-i.MX-codecs-to-phonon.patch \
 	file://0002-i.MX-video-renderer-Allow-v4l-device-from-environmen.patch \
 	file://0003-i.MX6-force-egl-visual-ID-33.patch \
 "
 
-DEPENDS_append_imxgpu2d = " virtual/kernel virtual/libgles2"
+DEPENDS:append:imxgpu2d = " virtual/kernel virtual/libgles2"
-QT_GLFLAGS_imxgpu2d = "-opengl es2 -openvg"
+QT_GLFLAGS:imxgpu2d = "-opengl es2 -openvg"
-QT_CONFIG_FLAGS_append_imxgpu2d = " -I${STAGING_KERNEL_DIR}/include/uapi \
+QT_CONFIG_FLAGS:append:imxgpu2d = " -I${STAGING_KERNEL_DIR}/include/uapi \
                                -I${STAGING_KERNEL_DIR}/include/ \
                                -DLINUX=1 -DEGL_API_FB=1 \
                                -DQT_QPA_EXPERIMENTAL_TOUCHEVENT=1"
 
 # The QT_CONFIG_FLAGS can pollute *.la files with -Dxxx
-do_compile_append_mx6 () {
+do_compile:append:mx6 () {
     find lib -name "*.la" | xargs -n1 sed -i 's/-D.*=1//g'
 }
 

dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend

@@ -3,35 +3,35 @@
 # Copyright (C) 2016, 2017 O.S. Systems Software LTDA.
 # Copyright (C) 2017-2018 NXP
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-SRC_URI_append_imxgpu = " \
+SRC_URI:append:imxgpu = " \
     file://0014-Add-IMX-GPU-support.patch \
     file://0001-egl.prf-Fix-build-error-when-egl-headers-need-platfo.patch \
 "
 
 PACKAGECONFIG_GL_IMX_GPU     = ""
-PACKAGECONFIG_GL_IMX_GPU_mx8 = "gbm kms"
+PACKAGECONFIG_GL_IMX_GPU:mx8 = "gbm kms"
 
-PACKAGECONFIG_GL_imxpxp   = "gles2"
+PACKAGECONFIG_GL:imxpxp   = "gles2"
-PACKAGECONFIG_GL_imxgpu2d = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', ' gl', '', d)} \
+PACKAGECONFIG_GL:imxgpu2d = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', ' gl', '', d)} \
                              ${PACKAGECONFIG_GL_IMX_GPU}"
-PACKAGECONFIG_GL_imxgpu3d = "gles2 \
+PACKAGECONFIG_GL:imxgpu3d = "gles2 \
                              ${PACKAGECONFIG_GL_IMX_GPU}"
-PACKAGECONFIG_GL_use-mainline-bsp ?= "gles2 gbm kms"
+PACKAGECONFIG_GL:use-mainline-bsp ?= "gles2 gbm kms"
 
 PACKAGECONFIG_PLATFORM          = ""
-PACKAGECONFIG_PLATFORM_imxgpu2d = "no-opengl linuxfb"
+PACKAGECONFIG_PLATFORM:imxgpu2d = "no-opengl linuxfb"
-PACKAGECONFIG_PLATFORM_imxgpu3d = " \
+PACKAGECONFIG_PLATFORM:imxgpu3d = " \
     ${@bb.utils.contains('DISTRO_FEATURES', 'x11',     '', \
        bb.utils.contains('DISTRO_FEATURES', 'wayland', '', \
                                                        'eglfs', d), d)}"
-PACKAGECONFIG_PLATFORM_use-mainline-bsp = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'eglfs', d)}"
+PACKAGECONFIG_PLATFORM:use-mainline-bsp = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'eglfs', d)}"
 PACKAGECONFIG += "${PACKAGECONFIG_PLATFORM}"
 
 PACKAGECONFIG_VULKAN_IMX_GPU       = ""
-PACKAGECONFIG_VULKAN_IMX_GPU_mx8   = "vulkan"
+PACKAGECONFIG_VULKAN_IMX_GPU:mx8   = "vulkan"
-PACKAGECONFIG_VULKAN_IMX_GPU_mx8mm = ""
+PACKAGECONFIG_VULKAN_IMX_GPU:mx8mm = ""
 PACKAGECONFIG_VULKAN               = ""
-PACKAGECONFIG_VULKAN_imxgpu        = "${PACKAGECONFIG_VULKAN_IMX_GPU}"
+PACKAGECONFIG_VULKAN:imxgpu        = "${PACKAGECONFIG_VULKAN_IMX_GPU}"
 PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'vulkan', '${PACKAGECONFIG_VULKAN}', '', d)}"

dynamic-layers/qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend

@@ -1,8 +1,8 @@
 # etnaviv mesa does not have glx
-PACKAGECONFIG_remove_use-mainline-bsp = "xcomposite-glx"
+PACKAGECONFIG:remove:use-mainline-bsp = "xcomposite-glx"
 
-PACKAGECONFIG_remove_mx6 = "xcomposite-egl xcomposite-glx"
+PACKAGECONFIG:remove:mx6 = "xcomposite-egl xcomposite-glx"
-PACKAGECONFIG_remove_mx7 = "xcomposite-egl xcomposite-glx"
+PACKAGECONFIG:remove:mx7 = "xcomposite-egl xcomposite-glx"
 
 # i.MX8 does never provide native x11, so required dependencies are not met
-PACKAGECONFIG_remove_mx8 = "xcomposite-egl xcomposite-glx"
+PACKAGECONFIG:remove:mx8 = "xcomposite-egl xcomposite-glx"

dynamic-layers/virtualization-layer/recipes-extended/libvirt/libvirt_%.bbappend

@@ -1,9 +1,9 @@
-PACKAGECONFIG_qoriq-ppc = "qemu yajl lxc test remote macvtap libvirtd netcf udev python"
+PACKAGECONFIG:qoriq-ppc = "qemu yajl lxc test remote macvtap libvirtd netcf udev python"
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
-SRC_URI_append_qoriq-ppc = " file://qemu.conf"
+SRC_URI:append:qoriq-ppc = " file://qemu.conf"
 
-do_install_append_qoriq-ppc() {
+do_install:append:qoriq-ppc() {
 	install -m 0644 ${WORKDIR}/qemu.conf ${D}${sysconfdir}/libvirt/qemu.conf
 }
 

recipes-bsp/alsa-state/alsa-state.bbappend

@@ -1,10 +1,10 @@
 # Append path for freescale layer to include alsa-state asound.conf
-FILESEXTRAPATHS_prepend_mx6 := "${THISDIR}/${PN}/imx:"
+FILESEXTRAPATHS:prepend:mx6 := "${THISDIR}/${PN}/imx:"
-FILESEXTRAPATHS_prepend_mx7 := "${THISDIR}/${PN}/imx:"
+FILESEXTRAPATHS:prepend:mx7 := "${THISDIR}/${PN}/imx:"
-FILESEXTRAPATHS_prepend_mx8 := "${THISDIR}/${PN}/imx:"
+FILESEXTRAPATHS:prepend:mx8 := "${THISDIR}/${PN}/imx:"
-FILESEXTRAPATHS_prepend_use-mainline-bsp := "${THISDIR}/${PN}/imx:"
+FILESEXTRAPATHS:prepend:use-mainline-bsp := "${THISDIR}/${PN}/imx:"
 
-PACKAGE_ARCH_mx6 = "${MACHINE_ARCH}"
+PACKAGE_ARCH:mx6 = "${MACHINE_ARCH}"
-PACKAGE_ARCH_mx7 = "${MACHINE_ARCH}"
+PACKAGE_ARCH:mx7 = "${MACHINE_ARCH}"
-PACKAGE_ARCH_mx8 = "${MACHINE_ARCH}"
+PACKAGE_ARCH:mx8 = "${MACHINE_ARCH}"
-PACKAGE_ARCH_use-mainline-bsp = "${MACHINE_ARCH}"
+PACKAGE_ARCH:use-mainline-bsp = "${MACHINE_ARCH}"

recipes-bsp/atf/qoriq-atf_1.5.bb

@@ -8,7 +8,7 @@ PV = "1.5+git${SRCPV}"
 inherit deploy
 
 DEPENDS += "u-boot-mkimage-native u-boot openssl openssl-native mbedtls rcw cst-native"
-DEPENDS_append_lx2160a = " ddr-phy"
+DEPENDS:append:lx2160a = " ddr-phy"
 do_compile[depends] += "u-boot:do_deploy rcw:do_deploy uefi:do_deploy"
 
 S = "${WORKDIR}/git"
@@ -21,12 +21,12 @@ COMPATIBLE_MACHINE = "(qoriq)"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 PLATFORM = "${MACHINE}"
-PLATFORM_ls1088ardb-pb = "ls1088ardb"
+PLATFORM:ls1088ardb-pb = "ls1088ardb"
 PLATFORM_ADDITIONAL_TARGET ??= ""
-PLATFORM_ADDITIONAL_TARGET_ls1012afrwy = "ls1012afrwy_512mb"
+PLATFORM_ADDITIONAL_TARGET:ls1012afrwy = "ls1012afrwy_512mb"
 
 RCW_FOLDER ?= "${MACHINE}"
-RCW_FOLDER_ls1088ardb-pb = "ls1088ardb"
+RCW_FOLDER:ls1088ardb-pb = "ls1088ardb"
 
 # requires CROSS_COMPILE set by hand as there is no configure script
 export CROSS_COMPILE="${TARGET_PREFIX}"
@@ -56,16 +56,16 @@ PACKAGECONFIG[optee] = ",,optee-os-qoriq"
 uboot_boot_sec ?= "${DEPLOY_DIR_IMAGE}/u-boot.bin-tfa-secure-boot"
 uboot_boot ?= "${DEPLOY_DIR_IMAGE}/u-boot.bin-tfa"
 rcw ?= ""
-rcw_ls1012a = "_default"
+rcw:ls1012a = "_default"
 rcwsec ?= "_sben"
 
 chassistype ?= "ls2088_1088"
-chassistype_ls1012a = "ls104x_1012"
+chassistype:ls1012a = "ls104x_1012"
-chassistype_ls1043a = "ls104x_1012"
+chassistype:ls1043a = "ls104x_1012"
-chassistype_ls1046a = "ls104x_1012"
+chassistype:ls1046a = "ls104x_1012"
 
 ddrphyopt ?= ""
-ddrphyopt_lx2160a = "fip_ddr_sec"
+ddrphyopt:lx2160a = "fip_ddr_sec"
 
 do_configure[noexec] = "1"
 
@@ -242,5 +242,5 @@ do_deploy() {
     fi
 }
 addtask deploy after do_install
-FILES_${PN} += "/boot"
+FILES:${PN} += "/boot"
 BBCLASSEXTEND = "native nativesdk"

recipes-bsp/atf/qoriq-atf_2.3.bb

@@ -47,7 +47,7 @@ do_compile() {
     if [ "${NXP_COT}" = "true" -a "${ARM_COT}" = "true" ]; then
         bbfatal " \
         Error!, Both ARM CoT and NXP CoT are enabled. Only one CoT is built in a yocto build, \
-        Don't add nxp-cot and arm-cot into DISTRO_FEATURES_append at the same time."
+        Don't add nxp-cot and arm-cot into DISTRO_FEATURES:append at the same time."
     fi
 
     if [ "${NXP_COT}" = "true" ]; then
@@ -160,7 +160,7 @@ do_install() {
 
 do_deploy() {
     if [ "${ARM_COT}" = "true" ]; then
-        outputdir="atf_arm-cot"
+        outputdir="atf:arm-cot"
     elif [ "${NXP_COT}" = "true" ]; then
         outputdir="atf_nxp-cot"
     else
@@ -171,5 +171,5 @@ do_deploy() {
     cp -fr ${D}/boot/atf/* ${DEPLOYDIR}/${outputdir}/
 }
 addtask deploy after do_install
-FILES_${PN} += "/boot"
+FILES:${PN} += "/boot"
 COMPATIBLE_MACHINE = "(lx2160a|lx2162a)"

recipes-bsp/boot-format/boot-format_git.bb

@@ -15,6 +15,6 @@ do_install(){
 }
 
 PACKAGES =+ "${PN}-config"
-FILES_${PN}-config += "${datadir}/*"
+FILES:${PN}-config += "${datadir}/*"
 
 BBCLASSEXTEND = "native nativesdk"

recipes-bsp/ddr-phy/ddr-phy_git.bb

@@ -38,7 +38,7 @@ do_deploy () {
 addtask deploy before do_populate_sysroot after do_install
 
 PACKAGES += "${PN}-image"
-FILES_${PN}-image += "/boot"
+FILES:${PN}-image += "/boot"
 
 COMPATIBLE_MACHINE = "(lx2160a|lx2162a)"
 PACKAGE_ARCH = "${MACHINE_ARCH}"

recipes-bsp/dp-firmware-cadence/dp-firmware-cadence_20.04.bb

@@ -23,7 +23,7 @@ do_deploy () {
 addtask deploy before do_build after do_install
 
 PACKAGES += "${PN}-image"
-FILES_${PN}-image += "/boot"
+FILES:${PN}-image += "/boot"
 
 COMPATIBLE_MACHINE = "(qoriq-arm64)"
 PACKAGE_ARCH = "${MACHINE_ARCH}"

recipes-bsp/firmware-imx/firmware-imx-8_8.12.bb

@@ -19,5 +19,5 @@ addtask deploy after do_install before do_build
 PACKAGE_ARCH = "${MACHINE_SOCARCH}"
 
 COMPATIBLE_MACHINE      = "(mx8)"
-COMPATIBLE_MACHINE_mx8m = "(^$)"
+COMPATIBLE_MACHINE:mx8m = "(^$)"
-COMPATIBLE_MACHINE_mx8x = "(^$)"
+COMPATIBLE_MACHINE:mx8x = "(^$)"

recipes-bsp/firmware-imx/firmware-imx_8.12.bb

@@ -65,7 +65,7 @@ do_install() {
 # as second one, and for every file match - it creates a separate package,
 # which contains only files that matches the pattern.
 #
-python populate_packages_prepend() {
+python populate_packages:prepend() {
     easrcdir = bb.data.expand('${nonarch_base_libdir}/firmware/imx/easrc', d)
     do_split_packages(d, easrcdir, '^easrc-([^_]*).*\.bin',
                       output_pattern='firmware-imx-easrc-%s',
@@ -123,7 +123,7 @@ PACKAGES_DYNAMIC = "${PN}-vpu-* ${PN}-sdma-* ${PN}-easrc-* ${PN}-xcvr-* ${PN}-xu
 # files it makes no sense.
 PACKAGES = "${PN} ${PN}-epdc ${PN}-hdmi"
 
-FILES_${PN}-epdc = "${nonarch_base_libdir}/firmware/imx/epdc/"
+FILES:${PN}-epdc = "${nonarch_base_libdir}/firmware/imx/epdc/"
-FILES_${PN}-hdmi = "${nonarch_base_libdir}/firmware/imx/hdmi/"
+FILES:${PN}-hdmi = "${nonarch_base_libdir}/firmware/imx/hdmi/"
 
 COMPATIBLE_MACHINE = "(imx|use-mainline-bsp)"

recipes-bsp/firmware-imx/firmware-nxp-wifi_1.0.bb

@@ -18,7 +18,7 @@ S = "${WORKDIR}/git"
 inherit allarch
 
 CLEANBROKEN = "1"
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
 
 do_compile() {
 	:
@@ -38,9 +38,9 @@ PACKAGES =+ " \
     ${PN}-bcm4359-pcie \
 "
 
-FILES_${PN}-bcm4359-pcie = " \
+FILES:${PN}-bcm4359-pcie = " \
     ${nonarch_base_libdir}/firmware/brcm/brcmfmac4359-pcie.* \
     ${sysconfdir}/firmware/BCM4349B1_*.hcd \
 "
 
-RPROVIDES_${PN}-bcm4359-pcie = "linux-firmware-bcm4359-pcie"
+RPROVIDES:${PN}-bcm4359-pcie = "linux-firmware-bcm4359-pcie"

recipes-bsp/firmware-imx/firmware-sof-imx_1.5.0-3.bb

@@ -21,4 +21,4 @@ do_install() {
     cp -r sof* ${D}${nonarch_base_libdir}/firmware/imx/
 }
 
-FILES_${PN} = "${nonarch_base_libdir}/firmware/imx"
+FILES:${PN} = "${nonarch_base_libdir}/firmware/imx"

recipes-bsp/firmware-qca/firmware-qca6174_3.0.2.bb

@@ -19,7 +19,7 @@ do_install () {
     cp -r ${S}/1CQ_QCA6174A_LEA_2.0/lib/firmware ${D}${base_libdir}
 }
 
-FILES_${PN} = " \
+FILES:${PN} = " \
     ${sysconfdir}/bluetooth/firmware.conf \
     ${base_libdir}/firmware/qca6174 \
     ${base_libdir}/firmware/wlan \

recipes-bsp/firmware-qca/firmware-qca9377_3.0.2.bb

@@ -19,7 +19,7 @@ do_install () {
     cp -r ${S}/1PJ_QCA9377-3_LEA_3.0/lib/firmware ${D}${base_libdir}
 }
 
-FILES_${PN} = " \
+FILES:${PN} = " \
     ${sysconfdir}/bluetooth/firmware.conf \
     ${base_libdir}/firmware/qca \
     ${base_libdir}/firmware/qca9377 \

recipes-bsp/firmware-qca/qca-tools_3.0.2.bb

@@ -9,7 +9,7 @@ LICENSE = "Proprietary"
 DEPENDS = "libnl zlib"
 
 FCC_TOOLS_FOLDER ?= "qca9377_qca6174_arm32"
-FCC_TOOLS_FOLDER_aarch64 = "qca9377_qca6174_arm64"
+FCC_TOOLS_FOLDER:aarch64 = "qca9377_qca6174_arm64"
 
 do_install() {
     install -d ${D}${sbindir}/fcc_tools
@@ -17,4 +17,4 @@ do_install() {
 }
 
 COMPATIBLE_HOST = '(aarch64|arm).*-linux'
-COMPATIBLE_HOST_libc-musl = 'null'
+COMPATIBLE_HOST:libc-musl = 'null'

recipes-bsp/formfactor/formfactor_%.bbappend

@@ -1,2 +1,2 @@
 # Append path for i.MX custom matchconfig
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"

recipes-bsp/imx-atf/imx-atf_2.4.bb

@@ -27,7 +27,7 @@ EXTRA_OEMAKE += " \
 
 BUILD_OPTEE = "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'true', 'false', d)}"
 
-CFLAGS_remove_mx8mq = "-O2"
+CFLAGS:remove:mx8mq = "-O2"
 
 do_compile() {
     # Clear LDFLAGS to avoid the option -Wl recognize issue

recipes-bsp/imx-lib/imx-lib_git.bb

@@ -20,15 +20,15 @@ S = "${WORKDIR}/git"
 
 inherit use-imx-headers
 
-PLATFORM_mx6q  = "IMX6Q"
+PLATFORM:mx6q  = "IMX6Q"
-PLATFORM_mx6dl = "IMX6Q"
+PLATFORM:mx6dl = "IMX6Q"
-PLATFORM_mx6sl = "IMX6S"
+PLATFORM:mx6sl = "IMX6S"
-PLATFORM_mx6sll = "IMX6UL"
+PLATFORM:mx6sll = "IMX6UL"
-PLATFORM_mx6sx = "IMX6S"
+PLATFORM:mx6sx = "IMX6S"
-PLATFORM_mx6ul = "IMX6UL"
+PLATFORM:mx6ul = "IMX6UL"
-PLATFORM_mx6ull = "IMX6UL"
+PLATFORM:mx6ull = "IMX6UL"
-PLATFORM_mx7d  = "IMX7"
+PLATFORM:mx7d  = "IMX7"
-PLATFORM_mx7ulp = "IMX7"
+PLATFORM:mx7ulp = "IMX7"
 
 PARALLEL_MAKE="-j 1"
 EXTRA_OEMAKE = ""

recipes-bsp/imx-mkimage/imx-boot_1.0.bb

@@ -10,8 +10,8 @@ SECTION = "BSP"
 inherit use-imx-security-controller-firmware
 
 IMX_EXTRA_FIRMWARE      = "firmware-imx-8 imx-sc-firmware imx-seco"
-IMX_EXTRA_FIRMWARE_mx8m = "firmware-imx-8m"
+IMX_EXTRA_FIRMWARE:mx8m = "firmware-imx-8m"
-IMX_EXTRA_FIRMWARE_mx8x = "imx-sc-firmware imx-seco"
+IMX_EXTRA_FIRMWARE:mx8x = "imx-sc-firmware imx-seco"
 DEPENDS += " \
     u-boot \
     ${IMX_EXTRA_FIRMWARE} \
@@ -20,7 +20,7 @@ DEPENDS += " \
 "
 # xxd is a dependency of fspi_packer.sh
 DEPENDS += "xxd-native"
-DEPENDS_append_mx8m = " u-boot-mkimage-native dtc-native"
+DEPENDS:append:mx8m = " u-boot-mkimage-native dtc-native"
 BOOT_NAME = "imx-boot"
 PROVIDES = "${BOOT_NAME}"
 
@@ -41,7 +41,7 @@ do_compile[depends] += " \
 SC_FIRMWARE_NAME ?= "scfw_tcm.bin"
 
 ATF_MACHINE_NAME ?= "bl31-${ATF_PLATFORM}.bin"
-ATF_MACHINE_NAME_append = "${@bb.utils.contains('MACHINE_FEATURES', 'optee', '-optee', '', d)}"
+ATF_MACHINE_NAME:append = "${@bb.utils.contains('MACHINE_FEATURES', 'optee', '-optee', '', d)}"
 
 UBOOT_NAME = "u-boot-${MACHINE}.bin-${UBOOT_CONFIG}"
 BOOT_CONFIG_MACHINE = "${BOOT_NAME}-${MACHINE}-${UBOOT_CONFIG}.bin"
@@ -58,16 +58,16 @@ IMXBOOT_TARGETS ?= \
                                                   'flash_multi_cores flash_dcd', d), d)}"
 
 BOOT_STAGING       = "${S}/${IMX_BOOT_SOC_TARGET}"
-BOOT_STAGING_mx8m  = "${S}/iMX8M"
+BOOT_STAGING:mx8m  = "${S}/iMX8M"
-BOOT_STAGING_mx8dx = "${S}/iMX8QX"
+BOOT_STAGING:mx8dx = "${S}/iMX8QX"
 
 SOC_FAMILY      = "INVALID"
-SOC_FAMILY_mx8  = "mx8"
+SOC_FAMILY:mx8  = "mx8"
-SOC_FAMILY_mx8m = "mx8m"
+SOC_FAMILY:mx8m = "mx8m"
-SOC_FAMILY_mx8x = "mx8x"
+SOC_FAMILY:mx8x = "mx8x"
 
 REV_OPTION ?= ""
-REV_OPTION_mx8qxp = \
+REV_OPTION:mx8qxp = \
     "${@bb.utils.contains('MACHINE_FEATURES', 'soc-revb0', '', \
                                                            'REV=C0', d)}"
 
@@ -199,6 +199,6 @@ do_deploy() {
 addtask deploy before do_build after do_compile
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-FILES_${PN} = "/boot"
+FILES:${PN} = "/boot"
 
 COMPATIBLE_MACHINE = "(mx8)"

recipes-bsp/imx-sc-firmware/imx-sc-firmware_1.9.0.bb

@@ -15,10 +15,10 @@ SRC_URI[sha256sum] = "df0fe17c93e4c2835542d6b1b2557524f034e378b643100cd838225e82
 
 BOARD_TYPE ?= "mek"
 SC_FIRMWARE_NAME ?= "INVALID"
-SC_FIRMWARE_NAME_mx8qm = "mx8qm-${BOARD_TYPE}-scfw-tcm.bin"
+SC_FIRMWARE_NAME:mx8qm = "mx8qm-${BOARD_TYPE}-scfw-tcm.bin"
-SC_FIRMWARE_NAME_mx8qxp = "mx8qx-${BOARD_TYPE}-scfw-tcm.bin"
+SC_FIRMWARE_NAME:mx8qxp = "mx8qx-${BOARD_TYPE}-scfw-tcm.bin"
-SC_FIRMWARE_NAME_mx8dxl = "mx8dxl-${BOARD_TYPE}-scfw-tcm.bin"
+SC_FIRMWARE_NAME:mx8dxl = "mx8dxl-${BOARD_TYPE}-scfw-tcm.bin"
-SC_FIRMWARE_NAME_mx8dx = "mx8dx-${BOARD_TYPE}-scfw-tcm.bin"
+SC_FIRMWARE_NAME:mx8dx = "mx8dx-${BOARD_TYPE}-scfw-tcm.bin"
 
 symlink_name = "scfw_tcm.bin"
 

recipes-bsp/imx-test/imx-test_00.00.00.bb

@@ -4,7 +4,7 @@ SECTION = "base"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 
-ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY:${PN} = "1"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf50|vf60)"

recipes-bsp/imx-test/imx-test_git.bb

@@ -9,9 +9,9 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-or-later;md5=fed54355545ffd980b814dab4a3b312c"
 
 DEPENDS = "alsa-lib libdrm"
-DEPENDS_append_mx6 = " imx-lib"
+DEPENDS:append:mx6 = " imx-lib"
-DEPENDS_append_mx7 = " imx-lib"
+DEPENDS:append:mx7 = " imx-lib"
-DEPENDS_append_imxvpu = " virtual/imxvpu"
+DEPENDS:append:imxvpu = " virtual/imxvpu"
 
 PE = "1"
 PV = "7.0+${SRCPV}"
@@ -29,22 +29,22 @@ inherit module-base use-imx-headers
 INHIBIT_PACKAGE_STRIP = "1"
 INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
 
-PLATFORM_mx6q  = "IMX6Q"
+PLATFORM:mx6q  = "IMX6Q"
-PLATFORM_mx6dl = "IMX6Q"
+PLATFORM:mx6dl = "IMX6Q"
-PLATFORM_mx6sl = "IMX6SL"
+PLATFORM:mx6sl = "IMX6SL"
-PLATFORM_mx6sll = "IMX6SL"
+PLATFORM:mx6sll = "IMX6SL"
-PLATFORM_mx6sx = "IMX6SX"
+PLATFORM:mx6sx = "IMX6SX"
-PLATFORM_mx6ul = "IMX6UL"
+PLATFORM:mx6ul = "IMX6UL"
-PLATFORM_mx7d  = "IMX7D"
+PLATFORM:mx7d  = "IMX7D"
-PLATFORM_mx7ulp = "IMX7D"
+PLATFORM:mx7ulp = "IMX7D"
-PLATFORM_mx8 = "IMX8"
+PLATFORM:mx8 = "IMX8"
 
 PARALLEL_MAKE = "-j 1"
 EXTRA_OEMAKE += "${PACKAGECONFIG_CONFARGS}"
 
 PACKAGECONFIG = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
-PACKAGECONFIG_append_imxvpu = " vpu"
+PACKAGECONFIG:append:imxvpu = " vpu"
-PACKAGECONFIG_append_mx8m   = " swpdm"
+PACKAGECONFIG:append:mx8m   = " swpdm"
 
 PACKAGECONFIG[x11] = ",,libx11 libxdamage libxrender libxrandr"
 PACKAGECONFIG[vpu] = "HAS_VPU=true,HAS_VPU=false,virtual/imxvpu"
@@ -76,7 +76,7 @@ do_install() {
     install -m 0644 ${WORKDIR}/memtool_profile ${D}/home/root/.profile
 }
 
-FILES_${PN} += "/unit_tests /home/root/.profile"
+FILES:${PN} += "/unit_tests /home/root/.profile"
-RDEPENDS_${PN} = "bash"
+RDEPENDS:${PN} = "bash"
 
-FILES_${PN}-dbg += "/unit_tests/.debug"
+FILES:${PN}-dbg += "/unit_tests/.debug"

recipes-bsp/imx-uuc/imx-uuc_git.bb

@@ -16,6 +16,6 @@ SRCREV = "d6afb27e55d73d7ad08cd2dd51c784d8ec9694dc"
 
 S = "${WORKDIR}/git"
 
-FILES_${PN} += "/linuxrc /fat"
+FILES:${PN} += "/linuxrc /fat"
 
 COMPATIBLE_MACHINE = "(imx|use-mainline-bsp)"

recipes-bsp/imx-vpu-hantro-vc/imx-vpu-hantro-vc_1.4.0.bb

@@ -30,6 +30,6 @@ do_install () {
     rm ${D}${D_SUBDIR}/${SCR}
 }
 
-FILES_${PN} = "/"
+FILES:${PN} = "/"
 
 COMPATIBLE_MACHINE = "(mx8mp)"

recipes-bsp/imx-vpu-hantro/imx-vpu-hantro-daemon_1.0.0.bb

@@ -4,7 +4,7 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=cd8bc2a79509c22fc9c1782a151210b1"
 
 DEPENDS = "imx-vpu-hantro"
-DEPENDS_append_mx8mp = " imx-vpu-hantro-vc"
+DEPENDS:append:mx8mp = " imx-vpu-hantro-vc"
 
 SRC_URI = " \
     ${FSL_MIRROR}/${BP}.tar.gz \
@@ -13,9 +13,9 @@ SRC_URI = " \
 SRC_URI[md5sum] = "65417710ef22214523c37f50f34b6ab2"
 SRC_URI[sha256sum] = "897d174c4c0818f31012d8a60ed51fc83fdfc55fca2d2b0fc24a0db3e9f3b6e8"
 
-PLATFORM_mx8mm = "IMX8MM"
+PLATFORM:mx8mm = "IMX8MM"
-PLATFORM_mx8mq = "IMX8MQ"
+PLATFORM:mx8mq = "IMX8MQ"
-PLATFORM_mx8mp = "IMX8MP"
+PLATFORM:mx8mp = "IMX8MP"
 
 EXTRA_OEMAKE = " \
     CROSS_COMPILE="${HOST_PREFIX}" \

recipes-bsp/imx-vpu-hantro/imx-vpu-hantro_1.22.0.bb

@@ -14,9 +14,9 @@ inherit fsl-eula-unpack use-imx-headers
 
 PARALLEL_MAKE="-j 1"
 
-PLATFORM_mx8mm = "IMX8MM"
+PLATFORM:mx8mm = "IMX8MM"
-PLATFORM_mx8mq = "IMX8MQ"
+PLATFORM:mx8mq = "IMX8MQ"
-PLATFORM_mx8mp = "IMX8MP"
+PLATFORM:mx8mp = "IMX8MP"
 
 EXTRA_OEMAKE = " \
     CROSS_COMPILE="${HOST_PREFIX}" \
@@ -28,8 +28,8 @@ do_install () {
     oe_runmake install DEST_DIR="${D}"
 }
 
-FILES_${PN} += "/unit_tests"
+FILES:${PN} += "/unit_tests"
 
-RDEPENDS_${PN} += "imx-vpu-hantro-daemon"
+RDEPENDS:${PN} += "imx-vpu-hantro-daemon"
 
 COMPATIBLE_MACHINE = "(mx8mq|mx8mm|mx8mp)"

recipes-bsp/imx-vpu/imx-vpu_5.4.39.3.bb

@@ -7,7 +7,7 @@ LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://COPYING;md5=228c72f2a91452b8a03c4cab30f30ef9"
 
 PROVIDES = "virtual/imxvpu"
-RPROVIDES_${PN} = "virtual/imxvpu"
+RPROVIDES:${PN} = "virtual/imxvpu"
 
 PE = "1"
 

recipes-bsp/inphi/inphi_git.bb

@@ -21,7 +21,7 @@ do_deploy () {
 addtask deploy before do_build after do_install
 
 PACKAGES += "${PN}-image"
-FILES_${PN}-image += "/boot"
+FILES:${PN}-image += "/boot"
 
 COMPATIBLE_MACHINE = "(qoriq-arm64)"
 PACKAGE_ARCH = "${MACHINE_ARCH}"

recipes-bsp/isp-imx/basler-camera_4.2.2.13.0.bb

@@ -21,7 +21,7 @@ do_install() {
 
 SYSTEMD_AUTO_ENABLE = "enable"
 
-FILES_${PN} = "${libdir} /opt"
+FILES:${PN} = "${libdir} /opt"
-INSANE_SKIP_${PN} = "file-rdeps already-stripped"
+INSANE_SKIP:${PN} = "file-rdeps already-stripped"
 
 COMPATIBLE_MACHINE = "(mx8mp)"

recipes-bsp/isp-imx/isp-imx_4.2.2.13.0.bb

@@ -22,7 +22,7 @@ OECMAKE_SOURCEPATH = "${S}/appshell"
 # Use make instead of ninja
 OECMAKE_GENERATOR = "Unix Makefiles"
 
-SYSTEMD_SERVICE_${PN} = "imx8-isp.service"
+SYSTEMD_SERVICE:${PN} = "imx8-isp.service"
 
 EXTRA_OECMAKE += " \
     -DCMAKE_BUILD_TYPE=release \
@@ -42,7 +42,7 @@ EXTRA_OECMAKE += " \
     -Wno-dev \
 "
 
-do_configure_prepend() {
+do_configure:prepend() {
     export SDKTARGETSYSROOT=${STAGING_DIR_HOST}
 }
 
@@ -74,15 +74,15 @@ do_install() {
 # The build contains a mix of versioned and unversioned libraries, so
 # the default packaging configuration needs some modifications
 FILES_SOLIBSDEV = ""
-FILES_${PN} += "/opt ${libdir}/lib*${SOLIBSDEV}"
+FILES:${PN} += "/opt ${libdir}/lib*${SOLIBSDEV}"
-FILES_${PN}-dev += " \
+FILES:${PN}-dev += " \
     ${libdir}/libjsoncpp.so \
     ${libdir}/libos08a20.so \
     ${libdir}/libov2775.so \
 "
 
-INSANE_SKIP_${PN} = "rpaths"
+INSANE_SKIP:${PN} = "rpaths"
 
-RDEPENDS_${PN} = "libdrm libpython3"
+RDEPENDS:${PN} = "libdrm libpython3"
 
 COMPATIBLE_MACHINE = "(mx8mp)"

recipes-bsp/libimxdmabuffer/libimxdmabuffer_1.0.1.bb

@@ -29,12 +29,12 @@ LIBG2D_PACKAGECONFIG = "g2d"
 LIBG2D_PACKAGECONFIG_imxdpu = ""
 
 PACKAGECONFIG ?= " "
-PACKAGECONFIG_append_imxgpu2d = " ${LIBG2D_PACKAGECONFIG}"
+PACKAGECONFIG:append:imxgpu2d = " ${LIBG2D_PACKAGECONFIG}"
-PACKAGECONFIG_append_imxipu   = " ipu"
+PACKAGECONFIG:append:imxipu   = " ipu"
-PACKAGECONFIG_append_imxpxp   = " pxp"
+PACKAGECONFIG:append:imxpxp   = " pxp"
-PACKAGECONFIG_append_mx8m     = " ion dwl"
+PACKAGECONFIG:append:mx8m     = " ion dwl"
-PACKAGECONFIG_append_mx8qm    = " ion"
+PACKAGECONFIG:append:mx8qm    = " ion"
-PACKAGECONFIG_append_mx8qxp   = " ion"
+PACKAGECONFIG:append:mx8qxp   = " ion"
 
 HANTRO_CONF = "--hantro-headers-path=${STAGING_INCDIR}/hantro_dec --hantro-decoder-version=G2"
 

recipes-bsp/ls2-phy/ls2-phy_git.bb

@@ -21,7 +21,7 @@ do_deploy () {
 addtask deploy before do_build after do_install
 
 PACKAGES += "${PN}-image"
-FILES_${PN}-image += "/boot"
+FILES:${PN}-image += "/boot"
 
 COMPATIBLE_MACHINE = "(qoriq)"
 PACKAGE_ARCH = "${MACHINE_ARCH}"

recipes-bsp/mc-utils/mc-utils_git.bb

@@ -15,13 +15,13 @@ SRCREV = "8e0b863693fc2ccbc62a62c79b4e3db6da88c16e"
 S = "${WORKDIR}/git"
 
 MC_CFG ?= ""
-MC_CFG_ls1088a = "ls1088a"
+MC_CFG:ls1088a = "ls1088a"
 MC_CFG_ls2088a = "ls2088a"
-MC_CFG_lx2160a = "lx2160a"
+MC_CFG:lx2160a = "lx2160a"
-MC_CFG_lx2162aqds = "lx2162aqds"
+MC_CFG:lx2162aqds = "lx2162aqds"
 
 MC_FLAVOUR ?= "RDB"
-MC_FLAVOUR_lx2162a = ""
+MC_FLAVOUR:lx2162a = ""
 
 do_compile () {
 	oe_runmake -C config 
@@ -47,5 +47,5 @@ do_deploy () {
 addtask deploy after do_install
 
 PACKAGES += "${PN}-image"
-FILES_${PN}-image += "/boot"
+FILES:${PN}-image += "/boot"
 COMPATIBLE_MACHINE = "(qoriq-arm64)"

recipes-bsp/ppfe-firmware/ppfe-firmware_git.bb

@@ -27,8 +27,8 @@ do_deploy () {
 
 addtask deploy after do_install
 
-FILES_${PN} += "/lib/firmware /boot/"
+FILES:${PN} += "/lib/firmware /boot/"
-INSANE_SKIP_${PN} += "arch already-stripped"
+INSANE_SKIP:${PN} += "arch already-stripped"
 INHIBIT_PACKAGE_STRIP = "1"
 INHIBIT_SYSROOT_STRIP = "1"
 

recipes-bsp/qe-ucode/qe-ucode_git.bb

@@ -22,7 +22,7 @@ do_deploy () {
 addtask deploy before do_build after do_install
 
 PACKAGES += "${PN}-image"
-FILES_${PN}-image += "/boot/*"
+FILES:${PN}-image += "/boot/*"
 
 COMPATIBLE_MACHINE = "(qoriq)"
 PACKAGE_ARCH = "${MACHINE_SOCARCH}"

recipes-bsp/rcw/rcw_git.bb

@@ -17,9 +17,9 @@ export PYTHON = "${USRBINPATH}/python3"
 M="${@d.getVar('MACHINE').replace('-64b','').replace('-32b','').replace('-${SITEINFO_ENDIANNESS}','')}"
 
 BOARD_TARGETS="${M}"
-BOARD_TARGETS_ls2088ardb="${M} ${M}_rev1.1"
+BOARD_TARGETS:ls2088ardb="${M} ${M}_rev1.1"
-BOARD_TARGETS_ls1088ardb-pb="ls1088ardb"
+BOARD_TARGETS:ls1088ardb-pb="ls1088ardb"
-BOARD_TARGETS_lx2160ardb = "${M} ${M}_rev2"
+BOARD_TARGETS:lx2160ardb = "${M} ${M}_rev2"
 
 do_compile () {
     oe_runmake BOARDS="${BOARD_TARGETS}" DESTDIR=${D}/boot/rcw/
@@ -36,7 +36,7 @@ do_deploy () {
 addtask deploy after do_install
 
 PACKAGES += "${PN}-image"
-FILES_${PN}-image += "/boot"
+FILES:${PN}-image += "/boot"
 
 COMPATIBLE_MACHINE = "(qoriq)"
 PACKAGE_ARCH = "${MACHINE_ARCH}"

recipes-bsp/u-boot/libubootenv_%.bbappend

@@ -29,8 +29,8 @@ def fixup_uboot_config_dependency(d):
        # |     Signed-off-by: Ming Liu <liu.ming50@gmail.com>
        # |     Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
        # `----
-       ubootmachine = d.getVar("UBOOT_MACHINE_pn-%s" % imx_default_bootloader)
+       ubootmachine = d.getVar("UBOOT_MACHINE:pn-%s" % imx_default_bootloader)
-       ubootconfig = (d.getVar("UBOOT_CONFIG_pn-%s" % imx_default_bootloader) or "").split()
+       ubootconfig = (d.getVar("UBOOT_CONFIG:pn-%s" % imx_default_bootloader) or "").split()
 
        d.setVar("UBOOT_CONFIG", ubootconfig)
        d.setVar("UBOOT_MACHINE", ubootmachine)

recipes-bsp/u-boot/u-boot-fslc-mfgtool_2021.07.bb

@@ -2,7 +2,7 @@
 # Copyright (C) 2014-2016 Freescale Semiconductor
 # Copyright 2017-2019 NXP
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/u-boot-fslc:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot-fslc:"
 
 require u-boot-fslc_${PV}.bb
 require u-boot-mfgtool.inc

recipes-bsp/u-boot/u-boot-fslc-mxsboot_2021.07.bb

@@ -7,9 +7,9 @@ DEPENDS = "bison-native dtc openssl"
 
 PROVIDES = "u-boot-mxsboot"
 
-EXTRA_OEMAKE_class-target = 'CROSS_COMPILE="${TARGET_PREFIX}" CC="${CC} ${CFLAGS} ${LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" STRIP=true V=1 CONFIG_MX28=y'
+EXTRA_OEMAKE:class-target = 'CROSS_COMPILE="${TARGET_PREFIX}" CC="${CC} ${CFLAGS} ${LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" STRIP=true V=1 CONFIG_MX28=y'
-EXTRA_OEMAKE_class-native = 'CC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" STRIP=true V=1 CONFIG_MX28=y'
+EXTRA_OEMAKE:class-native = 'CC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" STRIP=true V=1 CONFIG_MX28=y'
-EXTRA_OEMAKE_class-nativesdk = 'CROSS_COMPILE="${HOST_PREFIX}" CC="${CC} ${CFLAGS} ${LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" STRIP=true V=1 CONFIG_MX28=y'
+EXTRA_OEMAKE:class-nativesdk = 'CROSS_COMPILE="${HOST_PREFIX}" CC="${CC} ${CFLAGS} ${LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" STRIP=true V=1 CONFIG_MX28=y'
 
 do_compile () {
     oe_runmake -C ${S} O=${B} sandbox_defconfig
@@ -27,6 +27,6 @@ do_install () {
     ln -sf uboot-mxsboot ${D}${bindir}/mxsboot
 }
 
-COMPATIBLE_MACHINE_class-target = "(mxs|mx5|mx6|mx7|vf|use-mainline-bsp)"
+COMPATIBLE_MACHINE:class-target = "(mxs|mx5|mx6|mx7|vf|use-mainline-bsp)"
 
 BBCLASSEXTEND = "native nativesdk"

recipes-bsp/u-boot/u-boot-fslc_2021.07.bb

@@ -12,7 +12,7 @@ DEPENDS += "bc-native dtc-native python3-setuptools-native"
 
 # Location known to imx-boot component, where U-Boot artifacts
 # should be additionally deployed.
-# See below note above do_deploy_append_mx8m for the purpose of
+# See below note above do_deploy:append:mx8m for the purpose of
 # this delopyment location
 BOOT_TOOLS = "imx-boot-tools"
 
@@ -48,7 +48,7 @@ EXTRA_OEMAKE += 'HOSTCC="${BUILD_CC} ${BUILD_CPPFLAGS}" \
 # starts to use it - below append would not be necessary.
 # Once all mx8m derivatives are migrated to use the 'flash.bin' boot
 # container - this append can be dropped completely.
-do_deploy_append_mx8m() {
+do_deploy:append:mx8m() {
     # Deploy the mkimage, u-boot-nodtb.bin and fsl-imx8m*-XX.dtb for mkimage to generate boot binary
     if [ -n "${UBOOT_CONFIG}" ]; then
         for config in ${UBOOT_MACHINE}; do

recipes-bsp/u-boot/u-boot-imx-mfgtool_2021.04.bb

@@ -2,7 +2,7 @@
 # Copyright (C) 2014-2016 Freescale Semiconductor
 # Copyright 2017-2019 NXP
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/u-boot-imx:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot-imx:"
 
 require u-boot-imx_${PV}.bb
 require u-boot-mfgtool.inc