| Message ID | 20240925093640.17353-1-Ben.Cownley@arm.com |
|---|---|
| State | New |
| Headers | show |
| Series | [meta-zephyr,1/2] topics/baicow01/zephyr-ARCH-remove: Remove ARCH from meta-zephyr | expand |
diff --git a/meta-zephyr-bsp/conf/machine/96b-avenger96.conf b/meta-zephyr-bsp/conf/machine/96b-avenger96.conf index ae6f972..5c493b1 100644 --- a/meta-zephyr-bsp/conf/machine/96b-avenger96.conf +++ b/meta-zephyr-bsp/conf/machine/96b-avenger96.conf @@ -5,4 +5,3 @@ require conf/machine/include/stm32mp1-cortex-m4.inc -ARCH:96b-avenger96 = "arm" diff --git a/meta-zephyr-bsp/conf/machine/96b-nitrogen.conf b/meta-zephyr-bsp/conf/machine/96b-nitrogen.conf index affe9eb..65bdfbf 100644 --- a/meta-zephyr-bsp/conf/machine/96b-nitrogen.conf +++ b/meta-zephyr-bsp/conf/machine/96b-nitrogen.conf @@ -5,4 +5,3 @@ require conf/machine/include/nrf52.inc ZEPHYR_INHERIT_CLASSES += "zephyr-flash-pyocd" -ARCH:96b-nitrogen = "arm" diff --git a/meta-zephyr-bsp/conf/machine/arduino-nano-33-ble.conf b/meta-zephyr-bsp/conf/machine/arduino-nano-33-ble.conf index ebf4155..c6ffa67 100644 --- a/meta-zephyr-bsp/conf/machine/arduino-nano-33-ble.conf +++ b/meta-zephyr-bsp/conf/machine/arduino-nano-33-ble.conf @@ -5,5 +5,4 @@ require conf/machine/include/nrf52.inc ZEPHYR_INHERIT_CLASSES += "zephyr-flash-bossac" -ARCH:arduino-nano-33-ble = "arm" diff --git a/meta-zephyr-bsp/conf/machine/frdm-kw41z.conf b/meta-zephyr-bsp/conf/machine/frdm-kw41z.conf index 464e83a..46b1e0e 100755 --- a/meta-zephyr-bsp/conf/machine/frdm-kw41z.conf +++ b/meta-zephyr-bsp/conf/machine/frdm-kw41z.conf @@ -6,6 +6,5 @@ require conf/machine/include/arm/armv6m/tune-cortexm0plus.inc -ARCH:frdm-kw41z = "arm" DEFAULTUNE ?= "cortexm0plus" diff --git a/meta-zephyr-bsp/conf/machine/intel-x86-64.conf b/meta-zephyr-bsp/conf/machine/intel-x86-64.conf index 5112f28..4bda0cd 100644 --- a/meta-zephyr-bsp/conf/machine/intel-x86-64.conf +++ b/meta-zephyr-bsp/conf/machine/intel-x86-64.conf @@ -4,7 +4,6 @@ require conf/machine/include/tune-corei7-common.inc -ARCH:intel-x86-64 = "x86" # Supported Boards: # ZEPHYR_BOARD ?= "acrn" diff --git a/meta-zephyr-bsp/conf/machine/mps2-an385.conf b/meta-zephyr-bsp/conf/machine/mps2-an385.conf index 159e1bd..bb67972 100644 --- a/meta-zephyr-bsp/conf/machine/mps2-an385.conf +++ b/meta-zephyr-bsp/conf/machine/mps2-an385.conf @@ -16,4 +16,3 @@ QB_OPT_APPEND = "-icount shift=7,align=off,sleep=off -rtc clock=vm" # Zephyr RTOS settings ZEPHYR_INHERIT_CLASSES += "zephyr-qemuboot" -ARCH:mps2-an385 = "arm" diff --git a/meta-zephyr-bsp/conf/machine/mps2-an521.conf b/meta-zephyr-bsp/conf/machine/mps2-an521.conf index acd02be..fb763ea 100644 --- a/meta-zephyr-bsp/conf/machine/mps2-an521.conf +++ b/meta-zephyr-bsp/conf/machine/mps2-an521.conf @@ -18,4 +18,3 @@ QB_OPT_APPEND = "-icount shift=7,align=off,sleep=off -rtc clock=vm" # Zephyr RTOS settings ZEPHYR_INHERIT_CLASSES += "zephyr-qemuboot" -ARCH:mps2-an521 = "arm" diff --git a/meta-zephyr-bsp/conf/machine/mps3-an547.conf b/meta-zephyr-bsp/conf/machine/mps3-an547.conf index 185c425..c3ebd2c 100644 --- a/meta-zephyr-bsp/conf/machine/mps3-an547.conf +++ b/meta-zephyr-bsp/conf/machine/mps3-an547.conf @@ -17,4 +17,3 @@ QB_OPT_APPEND = "-icount shift=7,align=off,sleep=off -rtc clock=vm" # Zephyr RTOS settings ZEPHYR_INHERIT_CLASSES += "zephyr-qemuboot" -ARCH:mps3-an547 = "arm" diff --git a/meta-zephyr-bsp/conf/machine/nrf52840-mdk-usb-dongle.conf b/meta-zephyr-bsp/conf/machine/nrf52840-mdk-usb-dongle.conf index 67e407a..448f1ed 100644 --- a/meta-zephyr-bsp/conf/machine/nrf52840-mdk-usb-dongle.conf +++ b/meta-zephyr-bsp/conf/machine/nrf52840-mdk-usb-dongle.conf @@ -4,4 +4,3 @@ #@DESCRIPTION: Machine configuration for makerdiary's nrf52840-mdk-usb-dongle require conf/machine/include/nrf52.inc -ARCH:nrf52840-mdk-usb-dongle = "arm" diff --git a/meta-zephyr-bsp/conf/machine/nrf52840dk-nrf52840.conf b/meta-zephyr-bsp/conf/machine/nrf52840dk-nrf52840.conf index 258aa7a..bd99878 100644 --- a/meta-zephyr-bsp/conf/machine/nrf52840dk-nrf52840.conf +++ b/meta-zephyr-bsp/conf/machine/nrf52840dk-nrf52840.conf @@ -5,4 +5,3 @@ require conf/machine/include/nrf52.inc ZEPHYR_INHERIT_CLASSES += "zephyr-flash-pyocd" -ARCH:nrf52840dk-nrf52840 = "arm" diff --git a/meta-zephyr-bsp/conf/machine/qemu-cortex-a53.conf b/meta-zephyr-bsp/conf/machine/qemu-cortex-a53.conf index e21f3da..4a511f9 100644 --- a/meta-zephyr-bsp/conf/machine/qemu-cortex-a53.conf +++ b/meta-zephyr-bsp/conf/machine/qemu-cortex-a53.conf @@ -17,4 +17,3 @@ QB_OPT_APPEND = "-icount shift=4,align=off,sleep=on -rtc clock=vm" # Zephyr RTOS settings ZEPHYR_BOARD = "qemu_cortex_a53" ZEPHYR_INHERIT_CLASSES += "zephyr-qemuboot" -ARCH:qemu-cortex-a53 = "aarch64" diff --git a/meta-zephyr-bsp/conf/machine/qemu-cortex-a9.conf b/meta-zephyr-bsp/conf/machine/qemu-cortex-a9.conf index 9dfee42..4ce6e56 100644 --- a/meta-zephyr-bsp/conf/machine/qemu-cortex-a9.conf +++ b/meta-zephyr-bsp/conf/machine/qemu-cortex-a9.conf @@ -17,4 +17,3 @@ QB_OPT_APPEND = "-icount shift=3,align=off,sleep=off -rtc clock=vm" # Zephyr RTOS settings ZEPHYR_INHERIT_CLASSES += "zephyr-qemuboot" -ARCH:qemu-cortex-a9 = "arm" diff --git a/meta-zephyr-bsp/conf/machine/qemu-cortex-m0.conf b/meta-zephyr-bsp/conf/machine/qemu-cortex-m0.conf index 736579e..9a01efd 100644 --- a/meta-zephyr-bsp/conf/machine/qemu-cortex-m0.conf +++ b/meta-zephyr-bsp/conf/machine/qemu-cortex-m0.conf @@ -21,4 +21,3 @@ QB_OPT_APPEND = "-icount shift=6,align=off,sleep=off -rtc clock=vm" # Zephyr RTOS settings ZEPHYR_BOARD = "qemu_cortex_m0" ZEPHYR_INHERIT_CLASSES += "zephyr-qemuboot" -ARCH:qemu-cortex-m0 = "arm" diff --git a/meta-zephyr-bsp/conf/machine/qemu-cortex-m3.conf b/meta-zephyr-bsp/conf/machine/qemu-cortex-m3.conf index 904a79b..2314dc5 100644 --- a/meta-zephyr-bsp/conf/machine/qemu-cortex-m3.conf +++ b/meta-zephyr-bsp/conf/machine/qemu-cortex-m3.conf @@ -15,4 +15,3 @@ QB_CPU = "-cpu cortex-m3" QB_RNG = "" QB_OPT_APPEND = "-icount shift=6,align=off,sleep=off -rtc clock=vm" -ARCH:qemu-cortex-m3 = "arm" diff --git a/meta-zephyr-bsp/conf/machine/qemu-cortex-r5.conf b/meta-zephyr-bsp/conf/machine/qemu-cortex-r5.conf index 5a0ea69..e85a42c 100644 --- a/meta-zephyr-bsp/conf/machine/qemu-cortex-r5.conf +++ b/meta-zephyr-bsp/conf/machine/qemu-cortex-r5.conf @@ -19,4 +19,3 @@ QB_RNG = "" # Zephyr RTOS settings ZEPHYR_BOARD = "qemu_cortex_r5" ZEPHYR_INHERIT_CLASSES += "zephyr-qemuboot" -ARCH:qemu-cortex-r5 = "arm" diff --git a/meta-zephyr-bsp/conf/machine/qemu-nios2.conf b/meta-zephyr-bsp/conf/machine/qemu-nios2.conf index c41f505..e9420b5 100644 --- a/meta-zephyr-bsp/conf/machine/qemu-nios2.conf +++ b/meta-zephyr-bsp/conf/machine/qemu-nios2.conf @@ -13,6 +13,5 @@ QB_MACHINE = "-machine altera_10m50_zephyr" QB_OPT_APPEND = "-nographic" QB_CPU = "-cpu nios2" -ARCH:qemu-nios2 = "nios2" TCLIBC = "glibc" diff --git a/meta-zephyr-bsp/conf/machine/qemu-x86.conf b/meta-zephyr-bsp/conf/machine/qemu-x86.conf index d21de35..3535a4c 100644 --- a/meta-zephyr-bsp/conf/machine/qemu-x86.conf +++ b/meta-zephyr-bsp/conf/machine/qemu-x86.conf @@ -14,4 +14,3 @@ QB_GRAPHICS = "-nographic -no-acpi" QB_CPU:x86 = "-cpu qemu32,+nx,+pae" QB_CPU_KVM:x86 = "-cpu kvm32" -ARCH:qemu-x86 = "x86" diff --git a/meta-zephyr-bsp/conf/machine/stm32mp157c-dk2.conf b/meta-zephyr-bsp/conf/machine/stm32mp157c-dk2.conf index 52c1819..c81b30e 100644 --- a/meta-zephyr-bsp/conf/machine/stm32mp157c-dk2.conf +++ b/meta-zephyr-bsp/conf/machine/stm32mp157c-dk2.conf @@ -5,4 +5,3 @@ require conf/machine/include/stm32mp1-cortex-m4.inc -ARCH:stm32mp157c-dk2 = "arm" diff --git a/meta-zephyr-bsp/conf/machine/v2m-beetle.conf b/meta-zephyr-bsp/conf/machine/v2m-beetle.conf index 37895c6..4065496 100644 --- a/meta-zephyr-bsp/conf/machine/v2m-beetle.conf +++ b/meta-zephyr-bsp/conf/machine/v2m-beetle.conf @@ -9,4 +9,3 @@ require conf/machine/include/arm/armv7m/tune-cortexm3.inc # GLIBC will not work with Cortex-M. TCLIBC = "newlib" -ARCH:beetle = "arm" diff --git a/meta-zephyr-bsp/conf/machine/v2m-musca-b1.conf b/meta-zephyr-bsp/conf/machine/v2m-musca-b1.conf index 171e899..af5ae5e 100644 --- a/meta-zephyr-bsp/conf/machine/v2m-musca-b1.conf +++ b/meta-zephyr-bsp/conf/machine/v2m-musca-b1.conf @@ -22,4 +22,3 @@ QB_MEM = "512k" # Zephyr RTOS settings ZEPHYR_BOARD = "v2m_musca_b1" ZEPHYR_INHERIT_CLASSES += "zephyr-qemuboot" -ARCH:musca-b1 = "arm" diff --git a/meta-zephyr-bsp/conf/machine/v2m-musca-s1.conf b/meta-zephyr-bsp/conf/machine/v2m-musca-s1.conf index c43d560..be7a42b 100644 --- a/meta-zephyr-bsp/conf/machine/v2m-musca-s1.conf +++ b/meta-zephyr-bsp/conf/machine/v2m-musca-s1.conf @@ -20,4 +20,3 @@ QB_MEM = "512k" # Zephyr RTOS settings ZEPHYR_INHERIT_CLASSES += "zephyr-qemuboot" -ARCH:musca-s1 = "arm" diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-common.inc b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-common.inc index 8a1638d..6544475 100644 --- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-common.inc +++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-kernel-common.inc @@ -19,7 +19,6 @@ ZEPHYR_MAKE_OUTPUT ?= "\ EXTRA_OECMAKE = "\ -DZEPHYR_BASE=${ZEPHYR_BASE} \ -DBOARD=${BOARD} \ - -DARCH=${ARCH} \ -DZEPHYR_TOOLCHAIN_VARIANT=${ZEPHYR_TOOLCHAIN_VARIANT} \ -DZEPHYR_MODULES=${ZEPHYR_MODULES} \ "
meta-zephyr current passes an ARCH variable to the CMake build It's widely believed this is no longer necessary as it is inferred from the BOARD variable Signed-off-by: Ben Cownley <ben.cownley@arm.com> --- meta-zephyr-bsp/conf/machine/96b-avenger96.conf | 1 - meta-zephyr-bsp/conf/machine/96b-nitrogen.conf | 1 - meta-zephyr-bsp/conf/machine/arduino-nano-33-ble.conf | 1 - meta-zephyr-bsp/conf/machine/frdm-kw41z.conf | 1 - meta-zephyr-bsp/conf/machine/intel-x86-64.conf | 1 - meta-zephyr-bsp/conf/machine/mps2-an385.conf | 1 - meta-zephyr-bsp/conf/machine/mps2-an521.conf | 1 - meta-zephyr-bsp/conf/machine/mps3-an547.conf | 1 - meta-zephyr-bsp/conf/machine/nrf52840-mdk-usb-dongle.conf | 1 - meta-zephyr-bsp/conf/machine/nrf52840dk-nrf52840.conf | 1 - meta-zephyr-bsp/conf/machine/qemu-cortex-a53.conf | 1 - meta-zephyr-bsp/conf/machine/qemu-cortex-a9.conf | 1 - meta-zephyr-bsp/conf/machine/qemu-cortex-m0.conf | 1 - meta-zephyr-bsp/conf/machine/qemu-cortex-m3.conf | 1 - meta-zephyr-bsp/conf/machine/qemu-cortex-r5.conf | 1 - meta-zephyr-bsp/conf/machine/qemu-nios2.conf | 1 - meta-zephyr-bsp/conf/machine/qemu-x86.conf | 1 - meta-zephyr-bsp/conf/machine/stm32mp157c-dk2.conf | 1 - meta-zephyr-bsp/conf/machine/v2m-beetle.conf | 1 - meta-zephyr-bsp/conf/machine/v2m-musca-b1.conf | 1 - meta-zephyr-bsp/conf/machine/v2m-musca-s1.conf | 1 - .../recipes-kernel/zephyr-kernel/zephyr-kernel-common.inc | 1 - 22 files changed, 22 deletions(-)