14 files changed, 29 insertions, 29 deletions
diff --git a/conf/machine/96b-avenger96.conf b/conf/machine/96b-avenger96.conf
index 7bcfb4a..ae6f972 100644
--- a/conf/machine/96b-avenger96.conf
+++ b/conf/machine/96b-avenger96.conf
@@ -5,4 +5,4 @@
 
 require conf/machine/include/stm32mp1-cortex-m4.inc
 
-ARCH_96b-avenger96 = "arm"
+ARCH:96b-avenger96 = "arm"
diff --git a/conf/machine/96b-nitrogen.conf b/conf/machine/96b-nitrogen.conf
index 48f2041..affe9eb 100644
--- a/conf/machine/96b-nitrogen.conf
+++ b/conf/machine/96b-nitrogen.conf
@@ -5,4 +5,4 @@
 
 require conf/machine/include/nrf52.inc
 ZEPHYR_INHERIT_CLASSES += "zephyr-flash-pyocd"
-ARCH_96b-nitrogen = "arm"
+ARCH:96b-nitrogen = "arm"
diff --git a/conf/machine/arduino-nano-33-ble.conf b/conf/machine/arduino-nano-33-ble.conf
index 18ba056..ebf4155 100644
--- a/conf/machine/arduino-nano-33-ble.conf
+++ b/conf/machine/arduino-nano-33-ble.conf
@@ -5,5 +5,5 @@
 
 require conf/machine/include/nrf52.inc
 ZEPHYR_INHERIT_CLASSES += "zephyr-flash-bossac"
-ARCH_arduino-nano-33-ble = "arm"
+ARCH:arduino-nano-33-ble = "arm"
 
diff --git a/conf/machine/include/tune-arc.inc b/conf/machine/include/tune-arc.inc
index ff841e7..7db88ef 100644
--- a/conf/machine/include/tune-arc.inc
+++ b/conf/machine/include/tune-arc.inc
@@ -2,7 +2,7 @@ DEFAULTTUNE ?= "arc"
 
 TUNE_ARCH = "arc"
 TUNE_PKGARCH = "arc"
-TUNE_FEATURES_tune-arc = "littleendian"
+TUNE_FEATURES:tune-arc = "littleendian"
 TUNE_CCARGS = ""
 
 TUNEVALID[littleendian] = "Little endian mode"
diff --git a/conf/machine/include/tune-cortexm0.inc b/conf/machine/include/tune-cortexm0.inc
index d4f95e4..5067eb2 100644
--- a/conf/machine/include/tune-cortexm0.inc
+++ b/conf/machine/include/tune-cortexm0.inc
@@ -22,10 +22,10 @@ TUNEVALID[armv6m] = "Enable Cortex-M0 specific processor optimizations"
 TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'armv6m', ' -march=armv6-m', '', d)}"
 MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'armv6m', 'armv6m:', '' ,d)}"
 
-ARMPKGARCH_tune-cortexm0 = "cortexm0"
-TUNE_FEATURES_tune-cortexm0 = "${TUNE_FEATURES_tune-armv6} cortexm0"
+ARMPKGARCH:tune-cortexm0 = "cortexm0"
+TUNE_FEATURES:tune-cortexm0 = "${TUNE_FEATURES:tune-armv6} cortexm0"
 
-PACKAGE_EXTRA_ARCHS_tune-cortexm0 = "${PACKAGE_EXTRA_ARCHS_tune-armv6m} cortexm0-vfp"
+PACKAGE_EXTRA_ARCHS:tune-cortexm0 = "${PACKAGE_EXTRA_ARCHS:tune-armv6m} cortexm0-vfp"
 
-TUNE_FEATURES_tune-cortexm0 = "armv6m vfp cortexm0 thumb no-thumb-interwork soft"
+TUNE_FEATURES:tune-cortexm0 = "armv6m vfp cortexm0 thumb no-thumb-interwork soft"
 
diff --git a/conf/machine/include/tune-cortexm3.inc b/conf/machine/include/tune-cortexm3.inc
index 3fba827..404e2b7 100644
--- a/conf/machine/include/tune-cortexm3.inc
+++ b/conf/machine/include/tune-cortexm3.inc
@@ -10,12 +10,12 @@ TUNEVALID[armv7m] = "Enable Cortex-M3 specific processor optimizations"
 TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'armv7m', ' -march=armv7-m', '', d)}"
 MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'armv7m', 'armv7m:', '' ,d)}"
 
-TUNE_PKGARCH_tune-cortexm3 = "cortexm3"
+TUNE_PKGARCH:tune-cortexm3 = "cortexm3"
 
-ARMPKGARCH_tune-cortexm3 = "armv7m"
-PACKAGE_EXTRA_ARCHS_tune-cortexm3 ="cortexm3"
+ARMPKGARCH:tune-cortexm3 = "armv7m"
+PACKAGE_EXTRA_ARCHS:tune-cortexm3 ="cortexm3"
 
-TUNE_FEATURES_tune-cortexm3 = "armv7m vfp cortexm3"
-PACKAGE_EXTRA_ARCHS_tune-cortexm3 = "${PACKAGE_EXTRA_ARCHS_tune-armv7at} armv7m-vfp"
+TUNE_FEATURES:tune-cortexm3 = "armv7m vfp cortexm3"
+PACKAGE_EXTRA_ARCHS:tune-cortexm3 = "${PACKAGE_EXTRA_ARCHS:tune-armv7at} armv7m-vfp"
 
 TUNE_CCARGS_MFLOAT = "soft"
diff --git a/conf/machine/include/tune-cortexm4.inc b/conf/machine/include/tune-cortexm4.inc
index a823b6b..b3092d8 100644
--- a/conf/machine/include/tune-cortexm4.inc
+++ b/conf/machine/include/tune-cortexm4.inc
@@ -10,10 +10,10 @@ TUNEVALID[armv7m] = "Enable Cortex-M4 specific processor optimizations"
 TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'armv7m', ' -march=armv7e-m', '', d)}"
 MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'armv7m', 'armv7m:', '' ,d)}"
 
-TUNE_PKGARCH_tune-cortexm4 = "cortexm4"
+TUNE_PKGARCH:tune-cortexm4 = "cortexm4"
 
-ARMPKGARCH_tune-cortexm4 = "armv7m"
-PACKAGE_EXTRA_ARCHS_tune-cortexm4 ="cortexm4"
+ARMPKGARCH:tune-cortexm4 = "armv7m"
+PACKAGE_EXTRA_ARCHS:tune-cortexm4 ="cortexm4"
 
-TUNE_FEATURES_tune-cortexm4 = "armv7m vfp cortexm4"
-PACKAGE_EXTRA_ARCHS_tune-cortexm4 = "${PACKAGE_EXTRA_ARCHS_tune-armv7at} armv7m-vfp armv7m"
+TUNE_FEATURES:tune-cortexm4 = "armv7m vfp cortexm4"
+PACKAGE_EXTRA_ARCHS:tune-cortexm4 = "${PACKAGE_EXTRA_ARCHS:tune-armv7at} armv7m-vfp armv7m"
diff --git a/conf/machine/include/tune-iamcu.inc b/conf/machine/include/tune-iamcu.inc
index 20a93a6..827d39b 100644
--- a/conf/machine/include/tune-iamcu.inc
+++ b/conf/machine/include/tune-iamcu.inc
@@ -3,9 +3,9 @@ DEFAULTTUNE ?= "iamcu"
 TARGET_OS_iamcu = "elfiamcu"
 TARGET_ARCH = "i586"
 
-TUNE_FEATURES_tune-iamcu = "iamcu"
+TUNE_FEATURES:tune-iamcu = "iamcu"
 TUNE_CCARGS = "-miamcu -m32"
 TUNE_ARCH = "i586"
 TUNEVALID[iamcu] = "Intel MCU"
 
-PACKAGE_EXTRA_ARCHS_tune-iamcu = "iamcu"
+PACKAGE_EXTRA_ARCHS:tune-iamcu = "iamcu"
diff --git a/conf/machine/include/tune-nios2.inc b/conf/machine/include/tune-nios2.inc
index e8662eb..391727e 100644
--- a/conf/machine/include/tune-nios2.inc
+++ b/conf/machine/include/tune-nios2.inc
@@ -4,9 +4,9 @@ DEFAULTTUNE ?= "nios2"
 
 TUNE_ARCH = "nios2"
 TUNE_PKGARCH = "nios2"
-TUNE_FEATURES_tune-nios2 = "nios2"
+TUNE_FEATURES:tune-nios2 = "nios2"
 TUNE_CCARGS = ""
 
 TUNEVALID[nios2] = "Altera Nios2"
 
-PACKAGE_EXTRA_ARCHS_tune-nios2 = "nios2"
+PACKAGE_EXTRA_ARCHS:tune-nios2 = "nios2"
diff --git a/conf/machine/intel-x86-64.conf b/conf/machine/intel-x86-64.conf
index 2935cff..74e8f6e 100644
--- a/conf/machine/intel-x86-64.conf
+++ b/conf/machine/intel-x86-64.conf
@@ -4,7 +4,7 @@
 
 require conf/machine/include/tune-corei7-common.inc
 
-ARCH_intel-x86-64 = "x86"
+ARCH:intel-x86-64 = "x86"
 
 # Supported Boards:
 # ZEPHYR_BOARD ?= "acrn"
diff --git a/conf/machine/nrf52840dk-nrf52840.conf b/conf/machine/nrf52840dk-nrf52840.conf
index c5be5db..258aa7a 100644
--- a/conf/machine/nrf52840dk-nrf52840.conf
+++ b/conf/machine/nrf52840dk-nrf52840.conf
@@ -5,4 +5,4 @@
 
 require conf/machine/include/nrf52.inc
 ZEPHYR_INHERIT_CLASSES += "zephyr-flash-pyocd"
-ARCH_nrf52840dk-nrf52840 = "arm"
+ARCH:nrf52840dk-nrf52840 = "arm"
diff --git a/conf/machine/qemu-cortex-m3.conf b/conf/machine/qemu-cortex-m3.conf
index 3a50796..835a775 100644
--- a/conf/machine/qemu-cortex-m3.conf
+++ b/conf/machine/qemu-cortex-m3.conf
@@ -14,4 +14,4 @@ QB_OPT_APPEND = "-nographic -vga none"
 QB_CPU = "-cpu cortex-m3"
 QB_RNG = ""
 
-ARCH_qemu-cortex-m3 = "arm"
+ARCH:qemu-cortex-m3 = "arm"
diff --git a/conf/machine/qemu-nios2.conf b/conf/machine/qemu-nios2.conf
index ab8b366..de20320 100644
--- a/conf/machine/qemu-nios2.conf
+++ b/conf/machine/qemu-nios2.conf
@@ -13,4 +13,4 @@ QB_MACHINE = "-machine altera_10m50_zephyr"
 QB_OPT_APPEND = "-nographic"
 QB_CPU = "-cpu nios2"
 
-ARCH_qemu-nios2 = "nios2"
+ARCH:qemu-nios2 = "nios2"
diff --git a/conf/machine/qemu-x86.conf b/conf/machine/qemu-x86.conf
index 85b3f0d..31ce80d 100644
--- a/conf/machine/qemu-x86.conf
+++ b/conf/machine/qemu-x86.conf
@@ -11,7 +11,7 @@ ZEPHYR_INHERIT_CLASSES += "zephyr-qemuboot"
 QB_SYSTEM_NAME = "qemu-system-i386"
 QB_MACHINE = "-machine type=pc-q35-2.10"
 QB_OPT_APPEND = "-nographic -no-acpi"
-QB_CPU_x86 = "-cpu qemu32,+nx,+pae"
-QB_CPU_KVM_x86 = "-cpu kvm32"
+QB_CPU:x86 = "-cpu qemu32,+nx,+pae"
+QB_CPU_KVM:x86 = "-cpu kvm32"
 
-ARCH_qemu-x86 = "x86"
+ARCH:qemu-x86 = "x86"