diff --git a/meta-arm-bsp/conf/machine/armv8m.inc b/meta-arm-bsp/conf/machine/armv8m.inc
deleted file mode 100644
index 07631938..00000000
--- a/meta-arm-bsp/conf/machine/armv8m.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFAULTTUNE ?= "armv8m"
-
-TUNEVALID[armv8m] = "Enable instructions for ARMv8-m"
-AVAILTUNES += "armv8m"
-
-PREFERRED_PROVIDER_virtual/kernel = "linux-dummy"
-
-ARMPKGARCH_tune-armv8m ?= "armv8m"
-TUNE_FEATURES_tune-armv8m = "armv8m"
-PACKAGE_EXTRA_ARCHS_tune-armv8m = "armv8m"
-
-require conf/machine/include/arm/arch-arm.inc
diff --git a/meta-arm-bsp/conf/machine/musca-b1.conf b/meta-arm-bsp/conf/machine/musca-b1.conf
index 0f9734b8..3ff3acf3 100644
--- a/meta-arm-bsp/conf/machine/musca-b1.conf
+++ b/meta-arm-bsp/conf/machine/musca-b1.conf
@@ -5,7 +5,9 @@
 #@DESCRIPTION: Machine configuration for Musca-B1
 
 EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-m"
-
 PREFERRED_VERSION_trusted-firmware-m = "1.0"
 
-require armv8m.inc
+require conf/machine/include/tune-cortexm33.inc
+
+# GLIBC will not work with Cortex-M.
+TCLIBC = "baremetal"
diff --git a/meta-arm-bsp/conf/machine/musca-s1.conf b/meta-arm-bsp/conf/machine/musca-s1.conf
index 4b6b575d..d2e5ab7d 100644
--- a/meta-arm-bsp/conf/machine/musca-s1.conf
+++ b/meta-arm-bsp/conf/machine/musca-s1.conf
@@ -5,7 +5,9 @@
 #@DESCRIPTION: Machine configuration for Musca-S1
 
 EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-m"
-
 PREFERRED_VERSION_trusted-firmware-m = "1.0"
 
-require armv8m.inc
+require conf/machine/include/tune-cortexm33.inc
+
+# GLIBC will not work with Cortex-M.
+TCLIBC = "baremetal"