aboutsummaryrefslogtreecommitdiffstats
path: root/meta-zephyr-bsp/conf/machine
diff options
context:
space:
mode:
Diffstat (limited to 'meta-zephyr-bsp/conf/machine')
-rwxr-xr-xmeta-zephyr-bsp/conf/machine/frdm-kw41z.conf11
-rw-r--r--meta-zephyr-bsp/conf/machine/include/nrf52.inc4
-rw-r--r--meta-zephyr-bsp/conf/machine/include/stm32mp1-cortex-m4.inc4
-rw-r--r--meta-zephyr-bsp/conf/machine/include/tune-corei7-common.inc4
-rw-r--r--meta-zephyr-bsp/conf/machine/include/tune-cortexm0.inc31
-rw-r--r--meta-zephyr-bsp/conf/machine/include/tune-cortexm3.inc21
-rw-r--r--meta-zephyr-bsp/conf/machine/include/tune-cortexm4.inc19
-rw-r--r--meta-zephyr-bsp/conf/machine/intel-x86-64.conf6
-rw-r--r--meta-zephyr-bsp/conf/machine/mps2-an385.conf19
-rw-r--r--meta-zephyr-bsp/conf/machine/mps2-an521.conf21
-rw-r--r--meta-zephyr-bsp/conf/machine/mps3-an547.conf20
-rw-r--r--meta-zephyr-bsp/conf/machine/nrf52840-mdk-usb-dongle.conf7
-rw-r--r--meta-zephyr-bsp/conf/machine/qemu-cortex-a53.conf20
-rw-r--r--meta-zephyr-bsp/conf/machine/qemu-cortex-a9.conf20
-rw-r--r--meta-zephyr-bsp/conf/machine/qemu-cortex-m0.conf24
-rw-r--r--meta-zephyr-bsp/conf/machine/qemu-cortex-m3.conf5
-rw-r--r--meta-zephyr-bsp/conf/machine/qemu-cortex-r5.conf22
-rw-r--r--meta-zephyr-bsp/conf/machine/qemu-nios2.conf2
-rw-r--r--meta-zephyr-bsp/conf/machine/qemu-x86.conf4
-rw-r--r--meta-zephyr-bsp/conf/machine/v2m-beetle.conf12
-rw-r--r--meta-zephyr-bsp/conf/machine/v2m-musca-b1.conf25
-rw-r--r--meta-zephyr-bsp/conf/machine/v2m-musca-s1.conf23
22 files changed, 240 insertions, 84 deletions
diff --git a/meta-zephyr-bsp/conf/machine/frdm-kw41z.conf b/meta-zephyr-bsp/conf/machine/frdm-kw41z.conf
new file mode 100755
index 0000000..464e83a
--- /dev/null
+++ b/meta-zephyr-bsp/conf/machine/frdm-kw41z.conf
@@ -0,0 +1,11 @@
+#@TYPE: Machine
+#@NAME: frdm-kw41z
+#@DESCRIPTION: Machine configuration for frdm-kw41z
+#
+# This file was generated using generate-zephyr-machines
+
+require conf/machine/include/arm/armv6m/tune-cortexm0plus.inc
+
+ARCH:frdm-kw41z = "arm"
+
+DEFAULTUNE ?= "cortexm0plus"
diff --git a/meta-zephyr-bsp/conf/machine/include/nrf52.inc b/meta-zephyr-bsp/conf/machine/include/nrf52.inc
index 4162d3e..bd72195 100644
--- a/meta-zephyr-bsp/conf/machine/include/nrf52.inc
+++ b/meta-zephyr-bsp/conf/machine/include/nrf52.inc
@@ -3,9 +3,9 @@
#@DESCRIPTION: Machine configuration for Nordic Semiconductor nRF52xxx (Cortex-M4) SoC.
-require conf/machine/include/tune-cortexm4.inc
+require conf/machine/include/arm/armv7m/tune-cortexm4.inc
-TUNE_FEATURES = "armv7m cortexm4"
+TUNE_FEATURES = "armv7em cortexm4"
# Target type for this machine used by Pyocd
PYOCD_TARGET = "nrf52"
diff --git a/meta-zephyr-bsp/conf/machine/include/stm32mp1-cortex-m4.inc b/meta-zephyr-bsp/conf/machine/include/stm32mp1-cortex-m4.inc
index 0d46620..94b2e05 100644
--- a/meta-zephyr-bsp/conf/machine/include/stm32mp1-cortex-m4.inc
+++ b/meta-zephyr-bsp/conf/machine/include/stm32mp1-cortex-m4.inc
@@ -3,6 +3,6 @@
#@DESCRIPTION: Machine configuration for Cortex-M4 core of STMicroelectronics STM32MP1 SoC.
-require conf/machine/include/tune-cortexm4.inc
+require conf/machine/include/arm/armv7m/tune-cortexm4.inc
-TUNE_FEATURES = "armv7m cortexm4"
+TUNE_FEATURES = "armv7em cortexm4"
diff --git a/meta-zephyr-bsp/conf/machine/include/tune-corei7-common.inc b/meta-zephyr-bsp/conf/machine/include/tune-corei7-common.inc
index b68fc05..6975c50 100644
--- a/meta-zephyr-bsp/conf/machine/include/tune-corei7-common.inc
+++ b/meta-zephyr-bsp/conf/machine/include/tune-corei7-common.inc
@@ -1,6 +1,6 @@
DEFAULTTUNE ?= "corei7-64"
-require conf/machine/${X86_TUNE_DIR}/tune-corei7.inc
-require conf/machine/${X86_TUNE_DIR}/x86-base.inc
+require conf/machine/include/x86/tune-corei7.inc
+require conf/machine/include/x86/x86-base.inc
# Add x86 to MACHINEOVERRIDE
MACHINEOVERRIDES =. "x86:"
diff --git a/meta-zephyr-bsp/conf/machine/include/tune-cortexm0.inc b/meta-zephyr-bsp/conf/machine/include/tune-cortexm0.inc
deleted file mode 100644
index 5067eb2..0000000
--- a/meta-zephyr-bsp/conf/machine/include/tune-cortexm0.inc
+++ /dev/null
@@ -1,31 +0,0 @@
-DEFAULTTUNE ?= "cortexm0"
-
-require conf/machine/include/arm/arch-armv6.inc
-
-TUNEVALID[cortexm0] = "Enable Cortex-M0 specific processor optimizations"
-TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'cortexm0', ' -mcpu=cortex-m0', '', d)}"
-AVAILTUNES += "cortexm0"
-
-TUNEVALID[no-thumb-interwork] = "Enable thumb mode"
-TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'no-thumb-interwork', ' -mno-thumb-interwork', '', d)}"
-AVAILTUNES += "no-thumb-interwork"
-
-TUNEVALID[no-ffast-math] = "Enable thumb mode"
-TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'no-ffast-math', ' -fno-fast-math', '', d)}"
-AVAILTUNES += "no-ffast-math"
-
-TUNEVALID[soft] = "Enable thumb mode"
-TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'soft', ' -mfloat-abi=soft', '', d)}"
-AVAILTUNES += "soft"
-
-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"
-
-PACKAGE_EXTRA_ARCHS:tune-cortexm0 = "${PACKAGE_EXTRA_ARCHS:tune-armv6m} cortexm0-vfp"
-
-TUNE_FEATURES:tune-cortexm0 = "armv6m vfp cortexm0 thumb no-thumb-interwork soft"
-
diff --git a/meta-zephyr-bsp/conf/machine/include/tune-cortexm3.inc b/meta-zephyr-bsp/conf/machine/include/tune-cortexm3.inc
deleted file mode 100644
index 404e2b7..0000000
--- a/meta-zephyr-bsp/conf/machine/include/tune-cortexm3.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-DEFAULTTUNE ?= "cortexm3"
-
-require conf/machine/include/arm/arch-armv7a.inc
-
-TUNEVALID[cortexm3] = "Enable Cortex-M3 specific processor optimizations"
-TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'cortexm3', ' -mcpu=cortex-m3', '', d)}"
-AVAILTUNES += "cortexm3"
-
-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"
-
-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_CCARGS_MFLOAT = "soft"
diff --git a/meta-zephyr-bsp/conf/machine/include/tune-cortexm4.inc b/meta-zephyr-bsp/conf/machine/include/tune-cortexm4.inc
deleted file mode 100644
index b3092d8..0000000
--- a/meta-zephyr-bsp/conf/machine/include/tune-cortexm4.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-DEFAULTTUNE ?= "cortexm4"
-
-require conf/machine/include/arm/arch-armv7a.inc
-
-TUNEVALID[cortexm4] = "Enable Cortex-M4 specific processor optimizations"
-TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'cortexm4', ' -mcpu=cortex-m4', '', d)}"
-AVAILTUNES += "cortexm4"
-
-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"
-
-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"
diff --git a/meta-zephyr-bsp/conf/machine/intel-x86-64.conf b/meta-zephyr-bsp/conf/machine/intel-x86-64.conf
index 74e8f6e..5112f28 100644
--- a/meta-zephyr-bsp/conf/machine/intel-x86-64.conf
+++ b/meta-zephyr-bsp/conf/machine/intel-x86-64.conf
@@ -1,6 +1,6 @@
#@TYPE: Machine
#@NAME: intel-x86-64
-#@DESCRIPTION: common MACHINE for 64-bit x86 boards. User must set ${ZEPHYR_BOARD}. By default is set to 'ech_crb' board.
+#@DESCRIPTION: common MACHINE for 64-bit x86 boards. User must set ${ZEPHYR_BOARD}. By default is set to 'intel_ehl_crb' board.
require conf/machine/include/tune-corei7-common.inc
@@ -10,5 +10,5 @@ ARCH:intel-x86-64 = "x86"
# ZEPHYR_BOARD ?= "acrn"
# ZEPHYR_BOARD ?= "acrn_ehl_crb"
# ZEPHYR_BOARD ?= "up_squared"
-# ZEPHYR_BOARD ?= "ehl_crb_sbl"
-ZEPHYR_BOARD ?= "ehl_crb"
+# ZEPHYR_BOARD ?= "intel_ehl_crb_sbl"
+ZEPHYR_BOARD ?= "intel_ehl_crb"
diff --git a/meta-zephyr-bsp/conf/machine/mps2-an385.conf b/meta-zephyr-bsp/conf/machine/mps2-an385.conf
new file mode 100644
index 0000000..159e1bd
--- /dev/null
+++ b/meta-zephyr-bsp/conf/machine/mps2-an385.conf
@@ -0,0 +1,19 @@
+#@TYPE: Machine
+#@NAME: mps2-an385
+#@DESCRIPTION: Machine for Zephyr BOARD mps2-an385
+
+require conf/machine/include/qemu.inc
+require conf/machine/include/arm/armv7m/tune-cortexm3.inc
+
+TCLIBC = "newlib"
+
+# For runqemu
+QB_SYSTEM_NAME = "qemu-system-arm"
+QB_MACHINE = "-machine mps2-an385"
+QB_CPU = "-cpu cortex-m3"
+QB_GRAPHICS = "-nographic -vga none"
+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
new file mode 100644
index 0000000..acd02be
--- /dev/null
+++ b/meta-zephyr-bsp/conf/machine/mps2-an521.conf
@@ -0,0 +1,21 @@
+#@TYPE: Machine
+#@NAME: mps2-an521
+#@DESCRIPTION: Machine for Zephyr BOARD mps2-an521
+
+DEFAULTTUNE ?= "armv8m-main"
+require conf/machine/include/qemu.inc
+require conf/machine/include/arm/armv8-m/tune-cortexm33.inc
+
+TCLIBC = "newlib"
+
+# For runqemu
+QB_SYSTEM_NAME = "qemu-system-arm"
+QB_MACHINE = "-machine mps2-an521"
+QB_CPU = "-cpu cortex-m33"
+QB_MEM = "-m 16"
+QB_GRAPHICS = "-nographic -vga none"
+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
new file mode 100644
index 0000000..185c425
--- /dev/null
+++ b/meta-zephyr-bsp/conf/machine/mps3-an547.conf
@@ -0,0 +1,20 @@
+#@TYPE: Machine
+#@NAME: mps3-an547
+#@DESCRIPTION: Machine for Zephyr BOARD mps3-an547
+
+DEFAULTTUNE ?= "armv8-1m-main"
+require conf/machine/include/qemu.inc
+require conf/machine/include/arm/armv8-1m/tune-cortexm55.inc
+
+TCLIBC = "newlib"
+
+# For runqemu
+QB_SYSTEM_NAME = "qemu-system-arm"
+QB_MACHINE = "-machine mps3-an547"
+QB_CPU = "-cpu cortex-m55"
+QB_GRAPHICS = "-nographic -vga none"
+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
new file mode 100644
index 0000000..67e407a
--- /dev/null
+++ b/meta-zephyr-bsp/conf/machine/nrf52840-mdk-usb-dongle.conf
@@ -0,0 +1,7 @@
+#@TYPE: Machine
+#@NAME: nrf52840-mdk-usb-dongle
+
+#@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/qemu-cortex-a53.conf b/meta-zephyr-bsp/conf/machine/qemu-cortex-a53.conf
new file mode 100644
index 0000000..e21f3da
--- /dev/null
+++ b/meta-zephyr-bsp/conf/machine/qemu-cortex-a53.conf
@@ -0,0 +1,20 @@
+#@TYPE: Machine
+#@NAME: qemu-cortex-a53
+#@DESCRIPTION: Machine for Zephyr BOARD qemu_cortex_a53
+
+require conf/machine/include/qemu.inc
+require conf/machine/include/arm/armv8a/tune-cortexa53.inc
+
+TCLIBC = "newlib"
+
+# For runqemu
+QB_SYSTEM_NAME = "qemu-system-aarch64"
+QB_MACHINE = "-machine virt,secure=on,gic-version=3"
+QB_CPU = "-cpu cortex-a53"
+QB_GRAPHICS = "-nographic -vga none"
+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
new file mode 100644
index 0000000..9dfee42
--- /dev/null
+++ b/meta-zephyr-bsp/conf/machine/qemu-cortex-a9.conf
@@ -0,0 +1,20 @@
+#@TYPE: Machine
+#@NAME: qemu-cortex-a9
+#@DESCRIPTION: Machine for Zephyr BOARD qemu_cortex_a9
+
+DEFAULTTUNE ?= "cortexa9"
+require conf/machine/include/qemu.inc
+require conf/machine/include/arm/armv7a/tune-cortexa9.inc
+
+TCLIBC = "newlib"
+
+# For runqemu
+QB_SYSTEM_NAME = "qemu-system-arm"
+QB_MACHINE = "-machine xilinx-zynq-a9"
+QB_CPU = "-cpu cortex-a9"
+QB_GRAPHICS = "-nographic -vga none"
+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
new file mode 100644
index 0000000..736579e
--- /dev/null
+++ b/meta-zephyr-bsp/conf/machine/qemu-cortex-m0.conf
@@ -0,0 +1,24 @@
+#@TYPE: Machine
+#@NAME: qemu-cortex-m0
+#@DESCRIPTION: Machine for BBC Microbit v1, Zephyr BOARD qemu_cortex_m0
+
+require conf/machine/include/qemu.inc
+require conf/machine/include/arm/armv6m/tune-cortexm0.inc
+
+MACHINEOVERRIDES =. "nordic:"
+
+# GLIBC will not work with Cortex-M.
+TCLIBC = "newlib"
+
+# For runqemu
+QB_SYSTEM_NAME = "qemu-system-arm"
+QB_MACHINE = "-machine microbit"
+QB_CPU = "-cpu cortex-m0"
+QB_GRAPHICS = "-nographic -vga none"
+QB_RNG = ""
+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 835a775..904a79b 100644
--- a/meta-zephyr-bsp/conf/machine/qemu-cortex-m3.conf
+++ b/meta-zephyr-bsp/conf/machine/qemu-cortex-m3.conf
@@ -3,15 +3,16 @@
#@DESCRIPTION: Machine for Zephyr BOARD qemu_cortex_m3
require conf/machine/include/qemu.inc
-require conf/machine/include/tune-cortexm3.inc
+require conf/machine/include/arm/armv7m/tune-cortexm3.inc
ZEPHYR_INHERIT_CLASSES += "zephyr-qemuboot"
# For runqemu
QB_SYSTEM_NAME = "qemu-system-arm"
QB_MACHINE = "-machine lm3s6965evb"
-QB_OPT_APPEND = "-nographic -vga none"
+QB_GRAPHICS = "-nographic -vga none"
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
new file mode 100644
index 0000000..5a0ea69
--- /dev/null
+++ b/meta-zephyr-bsp/conf/machine/qemu-cortex-r5.conf
@@ -0,0 +1,22 @@
+#@TYPE: Machine
+#@NAME: qemu_cortex_r5
+#@DESCRIPTION: Machine for Zephyr BOARD qemu_cortex_r5
+
+require conf/machine/include/qemu.inc
+require conf/machine/include/arm/armv7r/tune-cortexr5.inc
+
+# GLIBC will not work with Cortex-R.
+TCLIBC = "newlib"
+
+# For runqemu
+QB_SYSTEM_NAME = "qemu-system-aarch64"
+QB_MACHINE = "-machine xlnx-zcu102"
+QB_CPU = "-cpu cortex-r5"
+QB_MEM = "-m 64k"
+QB_GRAPHICS = "-nographic -vga none"
+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 de20320..c41f505 100644
--- a/meta-zephyr-bsp/conf/machine/qemu-nios2.conf
+++ b/meta-zephyr-bsp/conf/machine/qemu-nios2.conf
@@ -14,3 +14,5 @@ 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 ae7716c..d21de35 100644
--- a/meta-zephyr-bsp/conf/machine/qemu-x86.conf
+++ b/meta-zephyr-bsp/conf/machine/qemu-x86.conf
@@ -3,14 +3,14 @@
#@DESCRIPTION: Machine for Zephyr BOARD qemu_x86
require conf/machine/include/qemu.inc
-require conf/machine/${X86_TUNE_DIR}/tune-i586.inc
+require conf/machine/include/x86/tune-i586.inc
ZEPHYR_INHERIT_CLASSES += "zephyr-qemuboot"
# For runqemu
QB_SYSTEM_NAME = "qemu-system-i386"
QB_MACHINE = "-machine type=pc-q35-2.10"
-QB_OPT_APPEND = "-nographic -no-acpi"
+QB_GRAPHICS = "-nographic -no-acpi"
QB_CPU:x86 = "-cpu qemu32,+nx,+pae"
QB_CPU_KVM:x86 = "-cpu kvm32"
diff --git a/meta-zephyr-bsp/conf/machine/v2m-beetle.conf b/meta-zephyr-bsp/conf/machine/v2m-beetle.conf
new file mode 100644
index 0000000..37895c6
--- /dev/null
+++ b/meta-zephyr-bsp/conf/machine/v2m-beetle.conf
@@ -0,0 +1,12 @@
+# Configuration for Beetle development board
+
+#@TYPE: Machine
+#@NAME: Beetle machine
+#@DESCRIPTION: Machine configuration for Beetle
+
+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
new file mode 100644
index 0000000..171e899
--- /dev/null
+++ b/meta-zephyr-bsp/conf/machine/v2m-musca-b1.conf
@@ -0,0 +1,25 @@
+# Configuration for Musca-B1 development board
+
+#@TYPE: Machine
+#@NAME: Musca-B1 machine
+#@DESCRIPTION: Machine configuration for Musca-B1
+
+DEFAULTTUNE ?= "armv8m-main"
+require conf/machine/include/arm/armv8-m/tune-cortexm33.inc
+
+# GLIBC will not work with Cortex-M.
+TCLIBC = "newlib"
+
+# For runqemu
+IMAGE_FSTYPES += "ext4"
+IMAGE_CLASSES += "qemuboot"
+QB_SYSTEM_NAME = "qemu-system-arm"
+QB_MACHINE = "-machine musca-b1"
+QB_CPU = "-cpu cortex-m33"
+QB_GRAPHICS = "-nographic -vga none"
+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
new file mode 100644
index 0000000..c43d560
--- /dev/null
+++ b/meta-zephyr-bsp/conf/machine/v2m-musca-s1.conf
@@ -0,0 +1,23 @@
+# Configuration for Musca-S1 development board
+
+#@TYPE: Machine
+#@NAME: Musca-S1 machine
+#@DESCRIPTION: Machine configuration for Musca-S1
+
+require conf/machine/include/arm/armv8-m/tune-cortexm33.inc
+
+# GLIBC will not work with Cortex-M.
+TCLIBC = "newlib"
+
+# For runqemu
+IMAGE_FSTYPES += "ext4"
+IMAGE_CLASSES += "qemuboot"
+QB_SYSTEM_NAME = "qemu-system-arm"
+QB_MACHINE = "-machine musca-s1"
+QB_CPU = "-cpu cortex-m33"
+QB_GRAPHICS = "-nographic -vga none"
+QB_MEM = "512k"
+
+# Zephyr RTOS settings
+ZEPHYR_INHERIT_CLASSES += "zephyr-qemuboot"
+ARCH:musca-s1 = "arm"