diff --git a/meta-arm-bsp/conf/machine/musca_s1.conf b/meta-arm-bsp/conf/machine/musca_s1.conf
new file mode 100644
index 00000000..4b6b575d
--- /dev/null
+++ b/meta-arm-bsp/conf/machine/musca_s1.conf
@@ -0,0 +1,11 @@
+# Configuration for Musca-S1 development board
+
+#@TYPE: Machine
+#@NAME: Musca-S1 machine
+#@DESCRIPTION: Machine configuration for Musca-S1
+
+EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-m"
+
+PREFERRED_VERSION_trusted-firmware-m = "1.0"
+
+require armv8m.inc
diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m_%.bbappend b/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m_%.bbappend
index f86e2b1d..32b50b7f 100644
--- a/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m_%.bbappend
+++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m_%.bbappend
@@ -1,2 +1,4 @@
-COMPATIBLE_MACHINE = "musca_b1"
+COMPATIBLE_MACHINE = "musca_b1|musca_s1"
+
 TFM_PLATFORM_musca_b1 = "MUSCA_B1"
+TFM_PLATFORM_musca_s1 = "MUSCA_S1"