layer: convert to new override syntax

This is the result of automated script (0.9.3) conversion:

+# meta-toradex-distro
+vars = vars + ["preempt-rt","tdx","upstream"]
+# meta-toradex-* machines
+vars = vars + ["apalis-","colibri-","verdin-","tegra124"]
+# meta-freescale
+vars = vars + ["imx","mx6","mx7","mx8","use-mainline-bsp","use-nxp-bsp"]

../openembedded-core/scripts/contrib/convert-overrides.py .

converting the metadata to use ":" as the override character instead of "_".

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>

34 files changed, 166 insertions, 166 deletions

diff --git a/conf/machine/apalis-imx8.conf b/conf/machine/apalis-imx8.conf
index aa85c96..bcd4c9f 100644
--- a/conf/machine/apalis-imx8.conf
+++ b/conf/machine/apalis-imx8.conf
@@ -13,11 +13,11 @@ IMX_DEFAULT_BSP = "nxp"
 
 require conf/machine/include/imx-base.inc
 # override imx-base.inc which sets this to cortexa72-cortexa53-crypto
-DEFAULTTUNE_mx8qm = "aarch64"
+DEFAULTTUNE:mx8qm = "aarch64"
 require conf/machine/include/tune-cortexa72-cortexa53.inc
 
 # Don't include kernels in standard images
-RDEPENDS_${KERNEL_PACKAGE_NAME}-base = ""
+RDEPENDS:${KERNEL_PACKAGE_NAME}-base = ""
 
 LOADADDR = ""
 
@@ -34,7 +34,7 @@ KERNEL_DEVICETREE = " \
     freescale/imx8qp-apalis-v1.1-ixora-v1.1.dtb	\
 "
 
-KERNEL_IMAGETYPE_aarch64 = "Image.gz"
+KERNEL_IMAGETYPE:aarch64 = "Image.gz"
 
 UBOOT_SUFFIX = "bin"
 UBOOT_CONFIG ??= "sd"
@@ -50,8 +50,8 @@ ATF_PLATFORM = "imx8qm"
 BOOT_SPACE = "65536"
 IMX_BOOT_SEEK = "32"
 
-IMAGE_BOOT_FILES_append = " boot.scr-${MACHINE};boot.scr hdmitxfw.bin dpfw.bin"
-WKS_FILE_DEPENDS_append = " u-boot-default-script"
+IMAGE_BOOT_FILES:append = " boot.scr-${MACHINE};boot.scr hdmitxfw.bin dpfw.bin"
+WKS_FILE_DEPENDS:append = " u-boot-default-script"
 PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-toradex"
@@ -62,17 +62,17 @@ PREFERRED_PROVIDER_u-boot = "u-boot-toradex"
 # not yet available in 2020.07.
 PREFERRED_VERSION_u-boot-toradex = "2020.04%"
 
-MACHINE_FIRMWARE_append = " linux-firmware-pcie8997"
-MACHINE_FIRMWARE_append = " firmware-imx-vpu-imx8"
-MACHINE_FIRMWARE_append = " firmware-imx-8"
+MACHINE_FIRMWARE:append = " linux-firmware-pcie8997"
+MACHINE_FIRMWARE:append = " firmware-imx-vpu-imx8"
+MACHINE_FIRMWARE:append = " firmware-imx-8"
 
 IMXBOOT_TARGETS = "flash_b0"
 IMX_BOOT_SOC_TARGET = "iMX8QM"
 
-PREFERRED_PROVIDER_imx-sc-firmware = "imx-sc-firmware-toradex"
+PREFERRED_PROVIDER:imx-sc-firmware = "imx-sc-firmware-toradex"
 BOARD_TYPE = "apalis"
 
-IMAGE_CLASSES_append = " image_type_tezi"
+IMAGE_CLASSES:append = " image_type_tezi"
 IMAGE_FSTYPES += "teziimg"
 
 # The imx-boot container takes care for the i.MX 8 offset, so the container
diff --git a/conf/machine/apalis-imx8x-v11a.conf b/conf/machine/apalis-imx8x-v11a.conf
index faa8fff..ab7ea41 100644
--- a/conf/machine/apalis-imx8x-v11a.conf
+++ b/conf/machine/apalis-imx8x-v11a.conf
@@ -4,7 +4,7 @@
 #@MAINTAINER: Philippe Schenker <philippe.schenker@toradex.com>
 
 # Set SoC revision to B0
-MACHINE_FEATURES_append = " soc-revb0"
+MACHINE_FEATURES:append = " soc-revb0"
 
 # keep the original machine as an override with high prio
 MACHINEOVERRIDES =. "apalis-imx8x:"
@@ -13,5 +13,5 @@ require conf/machine/apalis-imx8x.conf
 
 # reuse DISTRO_FLAVOUR to display special version exception in the
 # Toradex Easy Installer application
-DISTRO_FLAVOUR_append = " for V1.1A HW"
+DISTRO_FLAVOUR:append = " for V1.1A HW"
 MACHINE_NAME = "Apalis-iMX8X-V11A"
diff --git a/conf/machine/apalis-imx8x.conf b/conf/machine/apalis-imx8x.conf
index efe1e16..f82a222 100644
--- a/conf/machine/apalis-imx8x.conf
+++ b/conf/machine/apalis-imx8x.conf
@@ -11,11 +11,11 @@ IMX_DEFAULT_BSP = "nxp"
 
 require conf/machine/include/imx-base.inc
 # if one wants cortexa35-crypto, set DEFAULTTUNE accordingly
-DEFAULTTUNE_mx8qxp = "aarch64"
+DEFAULTTUNE:mx8qxp = "aarch64"
 require conf/machine/include/tune-cortexa35.inc
 
 # Don't include kernels in standard images
-RDEPENDS_${KERNEL_PACKAGE_NAME}-base = ""
+RDEPENDS:${KERNEL_PACKAGE_NAME}-base = ""
 
 LOADADDR = ""
 
@@ -27,7 +27,7 @@ KERNEL_DEVICETREE = " \
     freescale/imx8qxp-apalis-eval.dtb \
 "
 
-KERNEL_IMAGETYPE_aarch64 = "Image.gz"
+KERNEL_IMAGETYPE:aarch64 = "Image.gz"
 
 UBOOT_SUFFIX = "bin"
 UBOOT_CONFIG ??= "sd"
@@ -43,8 +43,8 @@ ATF_PLATFORM = "imx8qx"
 BOOT_SPACE = "65536"
 IMX_BOOT_SEEK = "32"
 
-IMAGE_BOOT_FILES_append = " boot.scr-${MACHINE};boot.scr"
-WKS_FILE_DEPENDS_append = " u-boot-default-script"
+IMAGE_BOOT_FILES:append = " boot.scr-${MACHINE};boot.scr"
+WKS_FILE_DEPENDS:append = " u-boot-default-script"
 PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-toradex"
@@ -55,16 +55,16 @@ PREFERRED_PROVIDER_u-boot = "u-boot-toradex"
 # not yet available in 2020.07.
 PREFERRED_VERSION_u-boot-toradex = "2020.04%"
 
-MACHINE_FIRMWARE_append = " linux-firmware-usb8997"
-MACHINE_FIRMWARE_append = " firmware-imx-vpu-imx8"
+MACHINE_FIRMWARE:append = " linux-firmware-usb8997"
+MACHINE_FIRMWARE:append = " firmware-imx-vpu-imx8"
 
 IMXBOOT_TARGETS = "flash"
 IMX_BOOT_SOC_TARGET = "iMX8QX"
 
-PREFERRED_PROVIDER_imx-sc-firmware = "imx-sc-firmware-toradex"
+PREFERRED_PROVIDER:imx-sc-firmware = "imx-sc-firmware-toradex"
 BOARD_TYPE = "apalis"
 
-IMAGE_CLASSES_append = " image_type_tezi"
+IMAGE_CLASSES:append = " image_type_tezi"
 IMAGE_FSTYPES += "teziimg"
 
 # The imx-boot container takes care for the i.MX 8 offset, so the container
diff --git a/conf/machine/colibri-imx8x-v10b.conf b/conf/machine/colibri-imx8x-v10b.conf
index 18d4d15..8fccc8c 100644
--- a/conf/machine/colibri-imx8x-v10b.conf
+++ b/conf/machine/colibri-imx8x-v10b.conf
@@ -4,7 +4,7 @@
 #@MAINTAINER: Max Krummenacher <max.krummenacherr@toradex.com>
 
 # Set SoC revision to B0
-MACHINE_FEATURES_append = " soc-revb0"
+MACHINE_FEATURES:append = " soc-revb0"
 
 # keep the original machine as an override with high prio
 MACHINEOVERRIDES =. "colibri-imx8x:"
@@ -13,5 +13,5 @@ require conf/machine/colibri-imx8x.conf
 
 # reuse DISTRO_FLAVOUR to display special version exception in the
 # Toradex Easy Installer application
-DISTRO_FLAVOUR_append = " for V1.0B HW"
+DISTRO_FLAVOUR:append = " for V1.0B HW"
 MACHINE_NAME = "Colibri-iMX8X-V10B"
diff --git a/conf/machine/colibri-imx8x.conf b/conf/machine/colibri-imx8x.conf
index 51b6bec..5cd09b3 100644
--- a/conf/machine/colibri-imx8x.conf
+++ b/conf/machine/colibri-imx8x.conf
@@ -11,11 +11,11 @@ IMX_DEFAULT_BSP = "nxp"
 
 require conf/machine/include/imx-base.inc
 # if one wants cortexa35-crypto, set DEFAULTTUNE accordingly
-DEFAULTTUNE_mx8qxp = "aarch64"
+DEFAULTTUNE:mx8qxp = "aarch64"
 require conf/machine/include/tune-cortexa35.inc
 
 # Don't include kernels in standard images
-RDEPENDS_${KERNEL_PACKAGE_NAME}-base = ""
+RDEPENDS:${KERNEL_PACKAGE_NAME}-base = ""
 
 LOADADDR = ""
 
@@ -28,9 +28,9 @@ KERNEL_DEVICETREE = " \
     freescale/imx8qxp-colibri-dsihdmi-eval-v3.dtb \
     freescale/imx8qxp-colibri-eval-v3.dtb \
 "
-KERNEL_DEVICETREE_use-mainline-bsp = "freescale/imx8qxp-colibri-eval-v3.dtb"
+KERNEL_DEVICETREE:use-mainline-bsp = "freescale/imx8qxp-colibri-eval-v3.dtb"
 
-KERNEL_IMAGETYPE_aarch64 = "Image.gz"
+KERNEL_IMAGETYPE:aarch64 = "Image.gz"
 
 UBOOT_SUFFIX = "bin"
 UBOOT_CONFIG ??= "sd"
@@ -46,14 +46,14 @@ ATF_PLATFORM = "imx8qx"
 BOOT_SPACE = "65536"
 IMX_BOOT_SEEK = "32"
 
-IMAGE_BOOT_FILES_append = " boot.scr-${MACHINE};boot.scr"
-WKS_FILE_DEPENDS_append = " u-boot-default-script"
+IMAGE_BOOT_FILES:append = " boot.scr-${MACHINE};boot.scr"
+WKS_FILE_DEPENDS:append = " u-boot-default-script"
 PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-toradex"
 PREFERRED_PROVIDER_virtual/kernel_preempt-rt = "linux-toradex"
 PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp = "linux-toradex-mainline"
-PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp_preempt-rt = "linux-toradex-mainline"
+PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp:preempt-rt = "linux-toradex-mainline"
 PREFERRED_PROVIDER_virtual/dtb_use-mainline-bsp = "device-tree-overlays-mainline"
 
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex"
@@ -62,16 +62,16 @@ PREFERRED_PROVIDER_u-boot = "u-boot-toradex"
 # not yet available in 2020.07.
 PREFERRED_VERSION_u-boot-toradex = "2020.04%"
 
-MACHINE_FIRMWARE_append = " linux-firmware-pcie8997"
-MACHINE_FIRMWARE_append = " firmware-imx-vpu-imx8"
+MACHINE_FIRMWARE:append = " linux-firmware-pcie8997"
+MACHINE_FIRMWARE:append = " firmware-imx-vpu-imx8"
 
 IMXBOOT_TARGETS = "flash"
 IMX_BOOT_SOC_TARGET = "iMX8QX"
 
-PREFERRED_PROVIDER_imx-sc-firmware = "imx-sc-firmware-toradex"
+PREFERRED_PROVIDER:imx-sc-firmware = "imx-sc-firmware-toradex"
 BOARD_TYPE = "colibri"
 
-IMAGE_CLASSES_append = " image_type_tezi"
+IMAGE_CLASSES:append = " image_type_tezi"
 IMAGE_FSTYPES += "teziimg"
 
 # The imx-boot container takes care for the i.MX 8 offset, so the container
diff --git a/conf/machine/include/apalis-imx6.inc b/conf/machine/include/apalis-imx6.inc
index c2ae376..3b632eb 100644
--- a/conf/machine/include/apalis-imx6.inc
+++ b/conf/machine/include/apalis-imx6.inc
@@ -1,5 +1,5 @@
-IMAGE_CLASSES_append = " image_type_tezi"
-IMAGE_FSTYPES_append = " teziimg"
+IMAGE_CLASSES:append = " image_type_tezi"
+IMAGE_FSTYPES:append = " teziimg"
 TORADEX_PRODUCT_IDS = "0027 0028 0029 0035"
 # The payload offsets are given in number of 512 byte blocks.
 OFFSET_BOOTROM_PAYLOAD = "2"
@@ -8,7 +8,7 @@ OFFSET_SPL_PAYLOAD = "138"
 MACHINE_NAME = "Apalis-iMX6"
 
 KERNEL_DEVICETREE += "imx6q-apalis-ixora-v1.2.dtb"
-KERNEL_DEVICETREE_use-mainline-bsp += " \
+KERNEL_DEVICETREE:use-mainline-bsp += " \
     imx6q-apalis-eval.dtb \
     imx6q-apalis-ixora-v1.1.dtb \
 "
@@ -16,17 +16,17 @@ KERNEL_DEVICETREE_use-mainline-bsp += " \
 PREFERRED_PROVIDER_virtual/kernel = "linux-toradex"
 PREFERRED_PROVIDER_virtual/kernel_preempt-rt = "linux-toradex"
 PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp = "linux-toradex-mainline"
-PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp_preempt-rt = "linux-toradex-mainline"
+PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp:preempt-rt = "linux-toradex-mainline"
 PREFERRED_PROVIDER_virtual/dtb_use-mainline-bsp = "device-tree-overlays-mainline"
 
 PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot"
 UBOOT_SUFFIX = "img"
 
-UBOOT_ENTRYPOINT_apalis-imx6 = "0x11000000"
-UBOOT_DTB_LOADADDRESS_apalis-imx6 = "0x12100000"
-UBOOT_DTBO_LOADADDRESS_apalis-imx6 = "0x17000000"
+UBOOT_ENTRYPOINT:apalis-imx6 = "0x11000000"
+UBOOT_DTB_LOADADDRESS:apalis-imx6 = "0x12100000"
+UBOOT_DTBO_LOADADDRESS:apalis-imx6 = "0x17000000"
 
-MACHINE_FIRMWARE_remove = "firmware-imx-epdc"
+MACHINE_FIRMWARE:remove = "firmware-imx-epdc"
 
 TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT = "apalis-imx6_hdmi_overlay.dtbo"
-TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT_use-mainline-bsp = "apalis-imx6_parallel-rgb_overlay.dtbo display-edt7_overlay.dtbo apalis-imx6_stmpe-ts_overlay.dtbo apalis-imx6_hdmi_overlay.dtbo"
+TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT:use-mainline-bsp = "apalis-imx6_parallel-rgb_overlay.dtbo display-edt7_overlay.dtbo apalis-imx6_stmpe-ts_overlay.dtbo apalis-imx6_hdmi_overlay.dtbo"
diff --git a/conf/machine/include/colibri-imx6.inc b/conf/machine/include/colibri-imx6.inc
index 1c11dc0..d6a1a0c 100644
--- a/conf/machine/include/colibri-imx6.inc
+++ b/conf/machine/include/colibri-imx6.inc
@@ -1,5 +1,5 @@
-IMAGE_CLASSES_append = " image_type_tezi"
-IMAGE_FSTYPES_append = " teziimg"
+IMAGE_CLASSES:append = " image_type_tezi"
+IMAGE_FSTYPES:append = " teziimg"
 TORADEX_PRODUCT_IDS = "0014 0015 0016 0017"
 # The payload offsets are given in number of 512 byte blocks.
 OFFSET_BOOTROM_PAYLOAD = "2"
@@ -8,7 +8,7 @@ OFFSET_SPL_PAYLOAD = "138"
 MACHINE_NAME = "Colibri-iMX6"
 
 TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT = "colibri-imx6_lcd-vga_overlay.dtbo colibri-imx6_stmpe-ts_overlay.dtbo"
-TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT_use-mainline-bsp = "colibri-imx6_parallel-rgb_overlay.dtbo colibri-imx6_stmpe-ts_overlay.dtbo display-vga_overlay.dtbo"
+TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT:use-mainline-bsp = "colibri-imx6_parallel-rgb_overlay.dtbo colibri-imx6_stmpe-ts_overlay.dtbo display-vga_overlay.dtbo"
 
 KERNEL_DEVICETREE += " \
     imx6dl-colibri-iris.dtb \
@@ -18,14 +18,14 @@ KERNEL_DEVICETREE += " \
 PREFERRED_PROVIDER_virtual/kernel = "linux-toradex"
 PREFERRED_PROVIDER_virtual/kernel_preempt-rt = "linux-toradex"
 PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp = "linux-toradex-mainline"
-PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp_preempt-rt = "linux-toradex-mainline"
+PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp:preempt-rt = "linux-toradex-mainline"
 PREFERRED_PROVIDER_virtual/dtb_use-mainline-bsp = "device-tree-overlays-mainline"
 
 PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot"
 UBOOT_SUFFIX = "img"
 
-MACHINE_FIRMWARE_remove = "firmware-imx-epdc"
+MACHINE_FIRMWARE:remove = "firmware-imx-epdc"
 
-UBOOT_ENTRYPOINT_colibri-imx6 = "0x11000000"
-UBOOT_DTB_LOADADDRESS_colibri-imx6 = "0x12100000"
-UBOOT_DTBO_LOADADDRESS_colibri-imx6 = "0x17000000"
+UBOOT_ENTRYPOINT:colibri-imx6 = "0x11000000"
+UBOOT_DTB_LOADADDRESS:colibri-imx6 = "0x12100000"
+UBOOT_DTBO_LOADADDRESS:colibri-imx6 = "0x17000000"
diff --git a/conf/machine/include/colibri-imx6ull.inc b/conf/machine/include/colibri-imx6ull.inc
index 84af376..7f62303 100644
--- a/conf/machine/include/colibri-imx6ull.inc
+++ b/conf/machine/include/colibri-imx6ull.inc
@@ -1,5 +1,5 @@
-IMAGE_CLASSES_append = " image_type_tezi"
-IMAGE_FSTYPES_append = " teziimg"
+IMAGE_CLASSES:append = " image_type_tezi"
+IMAGE_FSTYPES:append = " teziimg"
 TORADEX_PRODUCT_IDS = "0036 0040 0044 0045"
 TORADEX_PRODUCT_IDS[0036] = "imx6ull-colibri-eval-v3.dtb"
 TORADEX_PRODUCT_IDS[0040] = "imx6ull-colibri-wifi-eval-v3.dtb"
@@ -7,22 +7,22 @@ TORADEX_PRODUCT_IDS[0044] = "imx6ull-colibri-eval-v3.dtb"
 TORADEX_PRODUCT_IDS[0045] = "imx6ull-colibri-wifi-eval-v3.dtb"
 TORADEX_FLASH_TYPE = "rawnand"
 
-WIC_CREATE_EXTRA_ARGS_append = " --no-fstab-update"
+WIC_CREATE_EXTRA_ARGS:append = " --no-fstab-update"
 
 MACHINE_NAME = "Colibri-iMX6ULL"
 
 PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot"
-UBOOT_ENTRYPOINT_colibri-imx6ull = "0x81000000"
+UBOOT_ENTRYPOINT:colibri-imx6ull = "0x81000000"
 
-MACHINEOVERRIDES_append_upstream = ":use-mainline-bsp"
-MACHINE_FIRMWARE_remove_use-mainline-bsp = "firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d"
+MACHINEOVERRIDES:append:upstream = ":use-mainline-bsp"
+MACHINE_FIRMWARE:remove:use-mainline-bsp = "firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d"
 
-UBOOT_MAKE_TARGET_colibri-imx6ull = "u-boot.imx"
-UBOOT_ENTRYPOINT_colibri-imx6ull = "0x81000000"
-UBOOT_DTB_LOADADDRESS_colibri-imx6ull = "0x82100000"
-UBOOT_DTBO_LOADADDRESS_colibri-imx6ull = "0x87000000"
+UBOOT_MAKE_TARGET:colibri-imx6ull = "u-boot.imx"
+UBOOT_ENTRYPOINT:colibri-imx6ull = "0x81000000"
+UBOOT_DTB_LOADADDRESS:colibri-imx6ull = "0x82100000"
+UBOOT_DTBO_LOADADDRESS:colibri-imx6ull = "0x87000000"
 
-KERNEL_DEVICETREE_append_use_nxp_bsp = " \
+KERNEL_DEVICETREE:append_use_nxp_bsp = " \
     imx6ull-colibri-aster.dtb \
     imx6ull-colibri-iris.dtb \
     imx6ull-colibri-iris-v2.dtb \
@@ -34,5 +34,5 @@ KERNEL_DEVICETREE_append_use_nxp_bsp = " \
 PREFERRED_PROVIDER_virtual/kernel = "linux-toradex"
 PREFERRED_PROVIDER_virtual/kernel_preempt-rt = "linux-toradex"
 PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp = "linux-toradex-mainline"
-PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp_preempt-rt = "linux-toradex-mainline"
+PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp:preempt-rt = "linux-toradex-mainline"
 PREFERRED_PROVIDER_virtual/dtb_use-mainline-bsp = "device-tree-overlays-mainline"
diff --git a/conf/machine/include/colibri-imx7-emmc.inc b/conf/machine/include/colibri-imx7-emmc.inc
index 03aa283..db64648 100644
--- a/conf/machine/include/colibri-imx7-emmc.inc
+++ b/conf/machine/include/colibri-imx7-emmc.inc
@@ -1,5 +1,5 @@
-IMAGE_CLASSES_append = " image_type_tezi"
-IMAGE_FSTYPES_append = " teziimg"
+IMAGE_CLASSES:append = " image_type_tezi"
+IMAGE_FSTYPES:append = " teziimg"
 # The payload offsets are given in number of 512 byte blocks.
 OFFSET_BOOTROM_PAYLOAD = "2"
 TORADEX_PRODUCT_IDS = "0039"
@@ -7,33 +7,33 @@ TORADEX_FLASH_TYPE = "emmc"
 
 MACHINE_NAME = "Colibri-iMX7-eMMC"
 
-MACHINEOVERRIDES_append_upstream = ":use-mainline-bsp"
+MACHINEOVERRIDES:append:upstream = ":use-mainline-bsp"
 
-MACHINE_FIRMWARE_remove = "firmware-imx-epdc"
-MACHINE_FIRMWARE_remove_use-mainline-bsp = "firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d"
+MACHINE_FIRMWARE:remove = "firmware-imx-epdc"
+MACHINE_FIRMWARE:remove:use-mainline-bsp = "firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-toradex"
 PREFERRED_PROVIDER_virtual/kernel_preempt-rt = "linux-toradex"
 PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp = "linux-toradex-mainline"
-PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp_preempt-rt = "linux-toradex-mainline"
+PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp:preempt-rt = "linux-toradex-mainline"
 PREFERRED_PROVIDER_virtual/dtb_use-mainline-bsp = "device-tree-overlays-mainline"
 
-KERNEL_DEVICETREE_append_use-nxp-bsp = " \
+KERNEL_DEVICETREE:append:use-nxp-bsp = " \
     imx7d-colibri-emmc-iris.dtb \
     imx7d-colibri-emmc-iris-v2.dtb \
 "
-KERNEL_DEVICETREE_append_use-mainline-bsp = " \
+KERNEL_DEVICETREE:append:use-mainline-bsp = " \
     imx7d-colibri-emmc-aster.dtb \
 "
 
 PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot"
 
 TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT = "colibri-imx7_lcd-vga_overlay.dtbo colibri-imx7_ad7879_overlay.dtbo"
-TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT_use-mainline-bsp = "colibri-imx7_parallel-rgb_overlay.dtbo colibri-imx7_ad7879_overlay.dtbo display-vga_overlay.dtbo"
+TEZI_EXTERNAL_KERNEL_DEVICETREE_BOOT:use-mainline-bsp = "colibri-imx7_parallel-rgb_overlay.dtbo colibri-imx7_ad7879_overlay.dtbo display-vga_overlay.dtbo"
 
-UBOOT_BINARY_colibri-imx7-emmc = "u-boot.imx"
-UBOOT_DTB_LOADADDRESS_colibri-imx7-emmc = "0x82000000"
-UBOOT_DTBO_LOADADDRESS_colibri-imx7-emmc = "0x87000000"
-UBOOT_ENTRYPOINT_colibri-imx7-emmc = "0x81000000"
+UBOOT_BINARY:colibri-imx7-emmc = "u-boot.imx"
+UBOOT_DTB_LOADADDRESS:colibri-imx7-emmc = "0x82000000"
+UBOOT_DTBO_LOADADDRESS:colibri-imx7-emmc = "0x87000000"
+UBOOT_ENTRYPOINT:colibri-imx7-emmc = "0x81000000"
 UBOOT_MAKE_TARGET = "u-boot.imx"
 UBOOT_SUFFIX_${MACHINE} = "imx"
diff --git a/conf/machine/include/colibri-imx7.inc b/conf/machine/include/colibri-imx7.inc
index 4cc2d59..c6cdbaf 100644
--- a/conf/machine/include/colibri-imx7.inc
+++ b/conf/machine/include/colibri-imx7.inc
@@ -1,5 +1,5 @@
-IMAGE_CLASSES_append = " image_type_tezi"
-IMAGE_FSTYPES_append = " teziimg"
+IMAGE_CLASSES:append = " image_type_tezi"
+IMAGE_FSTYPES:append = " teziimg"
 TORADEX_PRODUCT_IDS = "0032 0033 0041"
 TORADEX_PRODUCT_IDS[0032] = "imx7s-colibri-eval-v3.dtb"
 TORADEX_PRODUCT_IDS[0033] = "imx7d-colibri-eval-v3.dtb"
@@ -8,18 +8,18 @@ TORADEX_FLASH_TYPE = "rawnand"
 
 MACHINE_NAME = "Colibri-iMX7"
 
-MACHINEOVERRIDES_append_upstream = ":use-mainline-bsp"
+MACHINEOVERRIDES:append:upstream = ":use-mainline-bsp"
 
-MACHINE_FIRMWARE_remove = "firmware-imx-epdc"
-MACHINE_FIRMWARE_remove_use-mainline-bsp = "firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d"
+MACHINE_FIRMWARE:remove = "firmware-imx-epdc"
+MACHINE_FIRMWARE:remove:use-mainline-bsp = "firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d"
 
-KERNEL_DEVICETREE_append_use-nxp-bsp += " \
+KERNEL_DEVICETREE:append:use-nxp-bsp += " \
     imx7d-colibri-iris.dtb \
     imx7d-colibri-iris-v2.dtb \
     imx7s-colibri-iris.dtb \
     imx7s-colibri-iris-v2.dtb \
 "
-KERNEL_DEVICETREE_append_use-mainline-bsp = " \
+KERNEL_DEVICETREE:append:use-mainline-bsp = " \
     imx7d-colibri-aster.dtb \
     imx7s-colibri-aster.dtb \
 "
@@ -27,12 +27,12 @@ KERNEL_DEVICETREE_append_use-mainline-bsp = " \
 PREFERRED_PROVIDER_virtual/kernel = "linux-toradex"
 PREFERRED_PROVIDER_virtual/kernel_preempt-rt = "linux-toradex"
 PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp = "linux-toradex-mainline"
-PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp_preempt-rt = "linux-toradex-mainline"
+PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp:preempt-rt = "linux-toradex-mainline"
 PREFERRED_PROVIDER_virtual/dtb_use-mainline-bsp = "device-tree-overlays-mainline"
 
 PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot"
 
-UBOOT_MAKE_TARGET_colibri-imx7 = "u-boot.imx"
-UBOOT_ENTRYPOINT_colibri-imx7 = "0x81000000"
-UBOOT_DTB_LOADADDRESS_colibri-imx7 = "0x82000000"
-UBOOT_DTBO_LOADADDRESS_colibri-imx7 = "0x87000000"
+UBOOT_MAKE_TARGET:colibri-imx7 = "u-boot.imx"
+UBOOT_ENTRYPOINT:colibri-imx7 = "0x81000000"
+UBOOT_DTB_LOADADDRESS:colibri-imx7 = "0x82000000"
+UBOOT_DTBO_LOADADDRESS:colibri-imx7 = "0x87000000"
diff --git a/conf/machine/verdin-imx8mm.conf b/conf/machine/verdin-imx8mm.conf
index fdc0abc..214e06c 100644
--- a/conf/machine/verdin-imx8mm.conf
+++ b/conf/machine/verdin-imx8mm.conf
@@ -12,11 +12,11 @@ IMX_DEFAULT_BSP = "nxp"
 
 require conf/machine/include/imx-base.inc
 # override imx-base.inc which sets this to cortexa53-crypto
-DEFAULTTUNE_mx8mm = "aarch64"
+DEFAULTTUNE:mx8mm = "aarch64"
 require conf/machine/include/tune-cortexa53.inc
 
 # Don't include kernels in standard images
-RDEPENDS_${KERNEL_PACKAGE_NAME}-base = ""
+RDEPENDS:${KERNEL_PACKAGE_NAME}-base = ""
 
 KERNEL_DEVICETREE = " \
     freescale/imx8mm-verdin-nonwifi-dahlia.dtb \
@@ -24,7 +24,7 @@ KERNEL_DEVICETREE = " \
     freescale/imx8mm-verdin-wifi-dahlia.dtb \
     freescale/imx8mm-verdin-wifi-dev.dtb \
 "
-KERNEL_IMAGETYPE_aarch64 = "Image.gz"
+KERNEL_IMAGETYPE:aarch64 = "Image.gz"
 
 UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG[sd] = "verdin-imx8mm_defconfig,sdcard"
@@ -49,8 +49,8 @@ BOOT_SPACE = "65536"
 IMXBOOT_TARGETS = "flash_evk_emmc_fastboot"
 IMX_BOOT_SOC_TARGET = "iMX8MM"
 
-IMAGE_BOOT_FILES_append = " boot.scr-${MACHINE};boot.scr"
-WKS_FILE_DEPENDS_append = " u-boot-default-script"
+IMAGE_BOOT_FILES:append = " boot.scr-${MACHINE};boot.scr"
+WKS_FILE_DEPENDS:append = " u-boot-default-script"
 PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot"
 
 LOADADDR = ""
@@ -64,7 +64,7 @@ MACHINE_FEATURES += "3g bluetooth alsa ext2 pci screen touchscreen usbgadget usb
 
 
 # Add additional firmware
-MACHINE_FIRMWARE_append = " linux-firmware-ath10k linux-firmware-imx-sdma-imx7d"
+MACHINE_FIRMWARE:append = " linux-firmware-ath10k linux-firmware-imx-sdma-imx7d"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-toradex"
 PREFERRED_PROVIDER_virtual/kernel_preempt-rt = "linux-toradex"
@@ -74,12 +74,12 @@ PREFERRED_PROVIDER_u-boot = "u-boot-toradex"
 # not yet available in 2020.07.
 PREFERRED_VERSION_u-boot-toradex = "2020.04%"
 
-MACHINE_FIRMWARE_append = " linux-firmware-sd8997"
-MACHINE_FIRMWARE_append = " firmware-imx-vpu-imx8"
+MACHINE_FIRMWARE:append = " linux-firmware-sd8997"
+MACHINE_FIRMWARE:append = " firmware-imx-vpu-imx8"
 
 BOARD_TYPE = "verdin"
 
-IMAGE_CLASSES_append = " image_type_tezi"
+IMAGE_CLASSES:append = " image_type_tezi"
 IMAGE_FSTYPES += "teziimg"
 
 UBOOT_BINARY_TEZI_EMMC = "imx-boot"
diff --git a/conf/machine/verdin-imx8mp.conf b/conf/machine/verdin-imx8mp.conf
index 8e4f630..d85c28c 100644
--- a/conf/machine/verdin-imx8mp.conf
+++ b/conf/machine/verdin-imx8mp.conf
@@ -12,11 +12,11 @@ IMX_DEFAULT_BSP = "nxp"
 
 require conf/machine/include/imx-base.inc
 # override imx-base.inc which sets this to cortexa53-crypto
-DEFAULTTUNE_mx8mp = "aarch64"
+DEFAULTTUNE:mx8mp = "aarch64"
 require conf/machine/include/tune-cortexa53.inc
 
 # Don't include kernels in standard images
-RDEPENDS_${KERNEL_PACKAGE_NAME}-base = ""
+RDEPENDS:${KERNEL_PACKAGE_NAME}-base = ""
 
 KERNEL_DEVICETREE = " \
     freescale/imx8mp-verdin-nonwifi-dahlia.dtb \
@@ -24,7 +24,7 @@ KERNEL_DEVICETREE = " \
     freescale/imx8mp-verdin-wifi-dahlia.dtb \
     freescale/imx8mp-verdin-wifi-dev.dtb \
 "
-KERNEL_IMAGETYPE_aarch64 = "Image.gz"
+KERNEL_IMAGETYPE:aarch64 = "Image.gz"
 
 UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG[sd] = "verdin-imx8mp_defconfig,sdcard"
@@ -56,8 +56,8 @@ IMAGE_BOOTLOADER = "imx-boot"
 IMXBOOT_TARGETS = "flash_evk_emmc_fastboot"
 IMX_BOOT_SOC_TARGET = "iMX8MP"
 
-IMAGE_BOOT_FILES_append = " boot.scr-${MACHINE};boot.scr"
-WKS_FILE_DEPENDS_append = " u-boot-default-script"
+IMAGE_BOOT_FILES:append = " boot.scr-${MACHINE};boot.scr"
+WKS_FILE_DEPENDS:append = " u-boot-default-script"
 PREFERRED_PROVIDER_u-boot-default-script = "u-boot-distro-boot"
 
 LOADADDR = ""
@@ -78,10 +78,10 @@ PREFERRED_PROVIDER_u-boot = "u-boot-toradex"
 PREFERRED_VERSION_u-boot-toradex = "2020.04%"
 
 # handle machine firmware
-MACHINE_FIRMWARE_append = " linux-firmware-sd8997"
-MACHINE_FIRMWARE_remove = "firmware-sof-imx"
+MACHINE_FIRMWARE:append = " linux-firmware-sd8997"
+MACHINE_FIRMWARE:remove = "firmware-sof-imx"
 
-IMAGE_CLASSES_append = " image_type_tezi"
+IMAGE_CLASSES:append = " image_type_tezi"
 IMAGE_FSTYPES += "teziimg"
 
 UBOOT_BINARY_TEZI_EMMC = "imx-boot"
diff --git a/qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend b/qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend
index 61956c0..46d018a 100644
--- a/qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend
+++ b/qt5-layer/recipes-qt/qt5/qtwayland_%.bbappend
@@ -1 +1 @@
-PACKAGECONFIG_remove = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland x11', 'xcomposite-egl xcomposite-glx', '', d)}"
\ No newline at end of file
+PACKAGECONFIG:remove = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland x11', 'xcomposite-egl xcomposite-glx', '', d)}"
\ No newline at end of file
diff --git a/recipes-bsp/alsa-state/alsa-state.bbappend b/recipes-bsp/alsa-state/alsa-state.bbappend
index 05bfa70..324b51b 100644
--- a/recipes-bsp/alsa-state/alsa-state.bbappend
+++ b/recipes-bsp/alsa-state/alsa-state.bbappend
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/alsa-state/:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/alsa-state/:"
 
 #make this machine specific, as we have different codecs with different settings
 PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/recipes-bsp/firmware-imx/firmware-imx-8_8.%.bbappend b/recipes-bsp/firmware-imx/firmware-imx-8_8.%.bbappend
index 1766a7a..99a3532 100644
--- a/recipes-bsp/firmware-imx/firmware-imx-8_8.%.bbappend
+++ b/recipes-bsp/firmware-imx/firmware-imx-8_8.%.bbappend
@@ -1,4 +1,4 @@
-FILES_${PN} += " \
+FILES:${PN} += " \
 	${nonarch_base_libdir}/firmware/imx/hdmi/hdmitxfw.bin \
 	${nonarch_base_libdir}/firmware/imx/hdmi/hdmirxfw.bin \
 	${nonarch_base_libdir}/firmware/imx/hdmi/dpfw.bin \
@@ -6,7 +6,7 @@ FILES_${PN} += " \
 
 unset do_install[noexec]
 
-do_install_append () {
+do_install:append () {
 	install -d ${D}${nonarch_base_libdir}/firmware/imx/hdmi
 	install -m 0644 ${S}/firmware/hdmi/cadence/hdmitxfw.bin ${D}${nonarch_base_libdir}/firmware/imx/hdmi/
 	install -m 0644 ${S}/firmware/hdmi/cadence/hdmirxfw.bin ${D}${nonarch_base_libdir}/firmware/imx/hdmi/
diff --git a/recipes-bsp/formfactor/formfactor_%.bbappend b/recipes-bsp/formfactor/formfactor_%.bbappend
index 72d991c..4fc41d0 100644
--- a/recipes-bsp/formfactor/formfactor_%.bbappend
+++ b/recipes-bsp/formfactor/formfactor_%.bbappend
@@ -1 +1 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
diff --git a/recipes-bsp/imx-atf/imx-atf_%.bbappend b/recipes-bsp/imx-atf/imx-atf_%.bbappend
index b8e6649..61e7b22 100644
--- a/recipes-bsp/imx-atf/imx-atf_%.bbappend
+++ b/recipes-bsp/imx-atf/imx-atf_%.bbappend
@@ -1,15 +1,15 @@
 PV = "2.2+git${SRCPV}"
-SRCBRANCH = "toradex_imx_5.4.70_2.3.0"
+SRCBRANCH = "toradex:imx_5.4.70_2.3.0"
 SRCREV = "835a8f67b2ca7aa3f2d05d6e6a1a51f7e1147266"
 SRCREV_use-head-next = "${AUTOREV}"
 SRC_URI = "git://git.toradex.com/imx-atf.git;protocol=https;branch=${SRCBRANCH}"
 
-EXTRA_OEMAKE_append = " \
+EXTRA_OEMAKE:append = " \
     BUILD_STRING="${SRCBRANCH}-g${@'${SRCPV}'.replace('AUTOINC+', '')}" \
 "
-EXTRA_OEMAKE_append_verdin-imx8mm = " \
+EXTRA_OEMAKE:append:verdin-imx8mm = " \
     IMX_BOOT_UART_BASE=0x30860000 \
 "
-EXTRA_OEMAKE_append_verdin-imx8mp = " \
+EXTRA_OEMAKE:append:verdin-imx8mp = " \
     IMX_BOOT_UART_BASE=0x30880000 \
 "
diff --git a/recipes-bsp/imx-mkimage/imx-boot_%.bbappend b/recipes-bsp/imx-mkimage/imx-boot_%.bbappend
index bd97840..a7b398c 100644
--- a/recipes-bsp/imx-mkimage/imx-boot_%.bbappend
+++ b/recipes-bsp/imx-mkimage/imx-boot_%.bbappend
@@ -1,8 +1,8 @@
 # Create symbolic link rather than copying mkimage_uboot
-compile_mx8m_prepend() {
+compile:mx8m:prepend() {
     rm -rf ${BOOT_STAGING}/mkimage_uboot
 }
-compile_mx8m_append() {
+compile:mx8m:append() {
     rm -rf ${BOOT_STAGING}/mkimage_uboot
     lnr ${STAGING_DIR_NATIVE}/${bindir}/mkimage ${BOOT_STAGING}/mkimage_uboot
 }
diff --git a/recipes-bsp/imx-sc-firmware/imx-sc-firmware-toradex_1.7.0.bb b/recipes-bsp/imx-sc-firmware/imx-sc-firmware-toradex_1.7.0.bb
index 92bb2a9..28221c9 100644
--- a/recipes-bsp/imx-sc-firmware/imx-sc-firmware-toradex_1.7.0.bb
+++ b/recipes-bsp/imx-sc-firmware/imx-sc-firmware-toradex_1.7.0.bb
@@ -17,13 +17,13 @@ SRCREV_use-head-next = "${AUTOREV}"
 S = "${WORKDIR}/git"
 
 PROVIDES = "imx-sc-firmware"
-RREPLACES_${PN} = "imx-sc-firmware"
-RPROVIDES_${PN} = "imx-sc-firmware"
-RCONFLICTS_${PN} = "imx-sc-firmware"
+RREPLACES:${PN} = "imx-sc-firmware"
+RPROVIDES:${PN} = "imx-sc-firmware"
+RCONFLICTS:${PN} = "imx-sc-firmware"
 
 BOARD_TYPE ?= "unknown"
-SC_FIRMWARE_NAME_mx8qm = "mx8qm-${BOARD_TYPE}-scfw-tcm.bin"
-SC_FIRMWARE_NAME_mx8qxp = "mx8qx-${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"
 symlink_name = "scfw_tcm.bin"
 
 BOOT_TOOLS = "imx-boot-tools"
diff --git a/recipes-bsp/u-boot/u-boot-toradex-common.inc b/recipes-bsp/u-boot/u-boot-toradex-common.inc
index 2b457f3..812f779 100644
--- a/recipes-bsp/u-boot/u-boot-toradex-common.inc
+++ b/recipes-bsp/u-boot/u-boot-toradex-common.inc
@@ -25,7 +25,7 @@ S = "${WORKDIR}/git"
 
 UBOOT_INITIAL_ENV = "u-boot-initial-env"
 
-do_deploy_append_mx8m() {
+do_deploy:append:mx8m() {
     # Deploy the u-boot-nodtb.bin and fsl-imx8m*-XX.dtb for mkimage to generate boot binary
     if [ -n "${UBOOT_CONFIG}" ]
     then
diff --git a/recipes-bsp/u-boot/u-boot-toradex-common_2020.04.inc b/recipes-bsp/u-boot/u-boot-toradex-common_2020.04.inc
index 920aae0..f3c289f 100644
--- a/recipes-bsp/u-boot/u-boot-toradex-common_2020.04.inc
+++ b/recipes-bsp/u-boot/u-boot-toradex-common_2020.04.inc
@@ -12,7 +12,7 @@ SRC_URI = " \
 
 SRCREV = "f499632b31f88dbd313fe9f742e2019c56032558"
 SRCREV_use-head-next = "${AUTOREV}"
-SRCBRANCH = "toradex_imx_v2020.04_5.4.70_2.3.0"
+SRCBRANCH = "toradex:imx_v2020.04_5.4.70_2.3.0"
 
 S = "${WORKDIR}/git"
 
@@ -23,7 +23,7 @@ UBOOT_INITIAL_ENV = "u-boot-initial-env"
 COMPATIBLE_MACHINE = "(mx8)"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-do_deploy_append_mx8m() {
+do_deploy:append:mx8m() {
     # Deploy the u-boot-nodtb.bin and fsl-imx8m*-XX.dtb for mkimage to generate boot binary
     if [ -n "${UBOOT_CONFIG}" ]
     then
diff --git a/recipes-bsp/u-boot/u-boot-toradex_2020.04.bb b/recipes-bsp/u-boot/u-boot-toradex_2020.04.bb
index 47630b1..c301226 100644
--- a/recipes-bsp/u-boot/u-boot-toradex_2020.04.bb
+++ b/recipes-bsp/u-boot/u-boot-toradex_2020.04.bb
@@ -6,6 +6,6 @@ SUMMARY = "U-Boot bootloader with support for Toradex i.MX 8 series SoMs"
 B = "${WORKDIR}/build"
 
 PROVIDES += "u-boot"
-DEPENDS_append = " dtc-native"
+DEPENDS:append = " dtc-native"
 
 BOOT_TOOLS = "imx-boot-tools"
diff --git a/recipes-bsp/u-boot/u-boot-toradex_2020.07.bb b/recipes-bsp/u-boot/u-boot-toradex_2020.07.bb
index f965e28..e623486 100644
--- a/recipes-bsp/u-boot/u-boot-toradex_2020.07.bb
+++ b/recipes-bsp/u-boot/u-boot-toradex_2020.07.bb
@@ -10,8 +10,8 @@ DEPENDS += "bc-native dtc-native"
 # While NXP i.MX 7 downstream requires the Linux kernel to boot in secure
 # mode mainline/upstream requires non-secure mode instead, as it properly
 # uses PSCI to control further cores.
-SRC_URI_append_use-mainline-bsp_colibri-imx7 = " file://0001-colibri_imx7-boot-linux-kernel-in-non-secure-mode.patch"
-SRC_URI_append_use-mainline-bsp_colibri-imx7-emmc = " file://0001-colibri_imx7-boot-linux-kernel-in-non-secure-mode.patch"
+SRC_URI:append:use-mainline-bsp:colibri-imx7 = " file://0001-colibri:imx7-boot-linux-kernel-in-non-secure-mode.patch"
+SRC_URI:append:use-mainline-bsp:colibri-imx7-emmc = " file://0001-colibri:imx7-boot-linux-kernel-in-non-secure-mode.patch"
 
 BOOT_TOOLS = "imx-boot-tools"
 
@@ -31,14 +31,14 @@ nand_padding () {
     dd bs=1024 count=1 if=/dev/zero | cat - ${PADDING_DIR}/u-boot.imx.zero-padded > ${PADDING_DIR}/u-boot-nand.imx
 }
 
-do_compile_append_colibri-imx6ull () {
+do_compile:append:colibri-imx6ull () {
     nand_padding
 }
 
-do_compile_append_colibri-imx7 () {
+do_compile:append:colibri-imx7 () {
     nand_padding
 }
 
-do_compile_append_colibri-vf () {
+do_compile:append:colibri-vf () {
     nand_padding
 }
diff --git a/recipes-devtools/imx-loader/imx-loader_git.bb b/recipes-devtools/imx-loader/imx-loader_git.bb
index 37e95ba..39e798b 100644
--- a/recipes-devtools/imx-loader/imx-loader_git.bb
+++ b/recipes-devtools/imx-loader/imx-loader_git.bb
@@ -22,7 +22,7 @@ SRC_URI += " \
 
 S = "${WORKDIR}/git"
 
-EXTRA_OEMAKE_class-native = "CC='${CC}' CXX='${CXX}'"
+EXTRA_OEMAKE:class-native = "CC='${CC}' CXX='${CXX}'"
 
 do_install () {
     oe_runmake DESTDIR=${D} install
diff --git a/recipes-fsl/packagegroups/packagegroup-fsl-gpu-libs.bb b/recipes-fsl/packagegroups/packagegroup-fsl-gpu-libs.bb
index 5b23784..0d3aa5a 100644
--- a/recipes-fsl/packagegroups/packagegroup-fsl-gpu-libs.bb
+++ b/recipes-fsl/packagegroups/packagegroup-fsl-gpu-libs.bb
@@ -7,7 +7,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 inherit packagegroup
 
-RDEPENDS_${PN} = " \
+RDEPENDS:${PN} = " \
     libgal-imx \
     libegl-imx \
     libgl-imx \
diff --git a/recipes-graphics/drm/libdrm_2.4.102.imx.bbappend b/recipes-graphics/drm/libdrm_2.4.102.imx.bbappend
index 0589710..b41bed1 100644
--- a/recipes-graphics/drm/libdrm_2.4.102.imx.bbappend
+++ b/recipes-graphics/drm/libdrm_2.4.102.imx.bbappend
@@ -1 +1 @@
-RDEPENDS_${PN}_append_imxgpu = " ${PN}-etnaviv ${PN}-vivante"
+RDEPENDS:${PN}:append:imxgpu = " ${PN}-etnaviv ${PN}-vivante"
diff --git a/recipes-graphics/wayland/weston-init.bbappend b/recipes-graphics/wayland/weston-init.bbappend
index c92a3c6..1833c74 100644
--- a/recipes-graphics/wayland/weston-init.bbappend
+++ b/recipes-graphics/wayland/weston-init.bbappend
@@ -1,4 +1,4 @@
-INI_UNCOMMENT_ASSIGNMENTS_append_mx8 = " \
+INI_UNCOMMENT_ASSIGNMENTS:append:mx8 = " \
     use-g2d=1 \
 "
 
diff --git a/recipes-graphics/wayland/weston_9.0.0.imx.bbappend b/recipes-graphics/wayland/weston_9.0.0.imx.bbappend
index d4c3eea..a353ffc 100644
--- a/recipes-graphics/wayland/weston_9.0.0.imx.bbappend
+++ b/recipes-graphics/wayland/weston_9.0.0.imx.bbappend
@@ -1,12 +1,12 @@
 # Don't build and install the backends which display weston on top of an
 # existing wayland or x11 server. (Otherwise weston will prefer the wayland
 # backend over the fbdev one for the non drm enabled machines)
-PACKAGECONFIG_remove = "wayland x11"
+PACKAGECONFIG:remove = "wayland x11"
 
 PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false,libxcursor"
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/weston/:"
-SRC_URI_append = " \
+FILESEXTRAPATHS:prepend := "${THISDIR}/weston/:"
+SRC_URI:append = " \
     file://0001-libweston-backend-fbdev-fbdev.c-don-t-destroy-output.patch \
     file://0002-libweston-pixman-renderer.c-zero-freed-pointer.patch \
 "
diff --git a/recipes-kernel/linux/linux-toradex_5.4-2.3.x.bb b/recipes-kernel/linux/linux-toradex_5.4-2.3.x.bb
index 800a5e6..58ae3f9 100644
--- a/recipes-kernel/linux/linux-toradex_5.4-2.3.x.bb
+++ b/recipes-kernel/linux/linux-toradex_5.4-2.3.x.bb
@@ -1,8 +1,8 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-${PV}:"
 require recipes-kernel/linux/linux-imx.inc
 
 SUMMARY = "Linux kernel for Toradex Freescale i.MX based modules"
-SUMMARY_preempt-rt = "Real-Time Linux kernel for Toradex Freescale i.MX based modules"
+SUMMARY:preempt-rt = "Real-Time Linux kernel for Toradex Freescale i.MX based modules"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
 
@@ -28,12 +28,12 @@ SRCREV_machine_use-head-next = "${AUTOREV}"
 DEPENDS += "lzop-native bc-native"
 COMPATIBLE_MACHINE = "(mx6|mx7|mx8)"
 
-KBUILD_DEFCONFIG_apalis-imx6 ?= "apalis_imx6_defconfig"
-KBUILD_DEFCONFIG_colibri-imx6 ?= "colibri_imx6_defconfig"
-KBUILD_DEFCONFIG_colibri-imx6ull ?= "colibri-imx6ull_defconfig"
-KBUILD_DEFCONFIG_colibri-imx6ull-emmc ?= "colibri-imx6ull_defconfig"
-KBUILD_DEFCONFIG_mx7 ?= "colibri_imx7_defconfig"
-KBUILD_DEFCONFIG_mx8 ?= "toradex_defconfig"
+KBUILD_DEFCONFIG:apalis-imx6 ?= "apalis:imx6_defconfig"
+KBUILD_DEFCONFIG:colibri-imx6 ?= "colibri:imx6_defconfig"
+KBUILD_DEFCONFIG:colibri-imx6ull ?= "colibri-imx6ull_defconfig"
+KBUILD_DEFCONFIG:colibri-imx6ull-emmc ?= "colibri-imx6ull_defconfig"
+KBUILD_DEFCONFIG:mx7 ?= "colibri:imx7_defconfig"
+KBUILD_DEFCONFIG:mx8 ?= "toradex_defconfig"
 
 export DTC_FLAGS = "-@"
 
@@ -44,8 +44,8 @@ export DTC_FLAGS = "-@"
 
 # patches get moved into the 'older' directory when superseeded, so provide
 # both possible storage locations.
-MIRRORS_append_preempt-rt = "${KERNELORG_MIRROR}/linux/kernel/projects/rt/5.4/older/ ${KERNELORG_MIRROR}/linux/kernel/projects/rt/5.4/"
-SRC_URI_append_preempt-rt = " \
+MIRRORS:append:preempt-rt = "${KERNELORG_MIRROR}/linux/kernel/projects/rt/5.4/older/ ${KERNELORG_MIRROR}/linux/kernel/projects/rt/5.4/"
+SRC_URI:append:preempt-rt = " \
     ${KERNELORG_MIRROR}/linux/kernel/projects/rt/5.4/older/patch-5.4.129-rt61.patch.xz;name=rt-patch \
     file://preempt-rt.scc \
     file://preempt-rt-less-latency.scc \
diff --git a/recipes-kernel/perf/perf.bbappend b/recipes-kernel/perf/perf.bbappend
index 87a8b28..ff0174d 100644
--- a/recipes-kernel/perf/perf.bbappend
+++ b/recipes-kernel/perf/perf.bbappend
@@ -1,2 +1,2 @@
 # perf with a 4.4 kernel no longer compiles
-COMPATIBLE_MACHINE_use-nxp-bsp_colibri-vf = "(^$)"
+COMPATIBLE_MACHINE:use-nxp-bsp:colibri-vf = "(^$)"
diff --git a/recipes-multimedia/gstreamer/gst-plugins-package.inc b/recipes-multimedia/gstreamer/gst-plugins-package.inc
index 6781e98..7dea6e0 100644
--- a/recipes-multimedia/gstreamer/gst-plugins-package.inc
+++ b/recipes-multimedia/gstreamer/gst-plugins-package.inc
@@ -1,5 +1,5 @@
-PACKAGESPLITFUNCS_prepend = " split_gstreamer10_packages "
-PACKAGESPLITFUNCS_append = " set_metapkg_rdepends "
+PACKAGESPLITFUNCS:prepend = " split_gstreamer10_packages "
+PACKAGESPLITFUNCS:append = " set_metapkg_rdepends "
 
 python split_gstreamer10_packages () {
     gst_libdir = d.expand('${libdir}/gstreamer-${LIBV}')
@@ -19,8 +19,8 @@ python set_metapkg_rdepends () {
 
     pn = d.getVar('PN')
     metapkg =  pn + '-meta'
-    d.setVar('ALLOW_EMPTY_' + metapkg, "1")
-    d.setVar('FILES_' + metapkg, "")
+    d.setVar('ALLOW_EMPTY:' + metapkg, "1")
+    d.setVar('FILES:' + metapkg, "")
     blacklist = [ pn, pn + '-meta' ]
     metapkg_rdepends = []
     pkgdest = d.getVar('PKGDEST')
@@ -37,20 +37,20 @@ python set_metapkg_rdepends () {
             is_empty = len(dir_contents) == 0
             if not is_empty:
                 metapkg_rdepends.append(pkg)
-    d.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends))
-    d.setVar('DESCRIPTION_' + metapkg, pn + ' meta package')
+    d.setVar('RDEPENDS:' + metapkg, ' '.join(metapkg_rdepends))
+    d.setVar('DESCRIPTION:' + metapkg, pn + ' meta package')
 }
 
 # each plugin-dev depends on PN-dev, plugin-staticdev on PN-staticdev
 # so we need them even when empty (like in gst-plugins-good case)
-ALLOW_EMPTY_${PN} = "1"
-ALLOW_EMPTY_${PN}-dev = "1"
-ALLOW_EMPTY_${PN}-staticdev = "1"
+ALLOW_EMPTY:${PN} = "1"
+ALLOW_EMPTY:${PN}-dev = "1"
+ALLOW_EMPTY:${PN}-staticdev = "1"
 
 PACKAGES += "${PN}-apps ${PN}-meta ${PN}-glib"
 
-FILES_${PN} = ""
-FILES_${PN}-apps = "${bindir}"
-FILES_${PN}-glib = "${datadir}/glib-2.0"
+FILES:${PN} = ""
+FILES:${PN}-apps = "${bindir}"
+FILES:${PN}-glib = "${datadir}/glib-2.0"
 
-RRECOMMENDS_${PN} += "${PN}-meta"
+RRECOMMENDS:${PN} += "${PN}-meta"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.2.imx.bbappend b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.2.imx.bbappend
index d2e8c5f..910fc0e 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.2.imx.bbappend
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.2.imx.bbappend
@@ -1,2 +1,2 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 SRC_URI += " file://0001-glupload-don-t-reject-non-RGBA-output-format-in-_dir.patch"
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc b/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc
index bc24b05..b63f79f 100644
--- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc
+++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc
@@ -5,7 +5,7 @@ SECTION = "multimedia"
 
 DEPENDS = "gstreamer1.0 glib-2.0-native"
 
-SRC_URI_append = " file://gtk-doc-tweaks.patch"
+SRC_URI:append = " file://gtk-doc-tweaks.patch"
 
 inherit autotools pkgconfig upstream-version-is-even gtk-doc
 
diff --git a/recipes-support/bmode-usb/bmode-usb_1.0.bb b/recipes-support/bmode-usb/bmode-usb_1.0.bb
index 62d48b4..7458c51 100644
--- a/recipes-support/bmode-usb/bmode-usb_1.0.bb
+++ b/recipes-support/bmode-usb/bmode-usb_1.0.bb
@@ -5,9 +5,9 @@ LIC_FILES_CHKSUM = "file://bmode_usb.c;endline=5;md5=4c9010cb42fb7648a460c35e6b5
 SRC_URI = "file://bmode_usb.c"
 S = "${WORKDIR}"
 DEFINE = "NO_MACHINE"
-DEFINE_apalis-imx6 = "MX6"
-DEFINE_colibri-imx6 = "MX6"
-DEFINE_colibri-imx6ull = "MX6ULL"
+DEFINE:apalis-imx6 = "MX6"
+DEFINE:colibri-imx6 = "MX6"
+DEFINE:colibri-imx6ull = "MX6ULL"
 DEFINE_colibri-imx6ull-emmc = "MX6ULL"
 
 do_compile() {