diff --git a/meta-digi-arm/conf/machine/ccimx95-dvk.conf b/meta-digi-arm/conf/machine/ccimx95-dvk.conf
index 328a39aa5..13224fa6f 100644
--- a/meta-digi-arm/conf/machine/ccimx95-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccimx95-dvk.conf
@@ -8,8 +8,11 @@ MACHINEOVERRIDES =. "mx95:${DIGI_FAMILY}:${DIGI_SOM}:"
 # Include the machine configuration for Digi's ConnectCore 9 module
 include conf/machine/include/ccimx9.inc
 
+# SMARC module
+SMARC ?= "1"
+
 # Machine features
-MACHINE_FEATURES += "mca"
+MACHINE_FEATURES += "${@oe.utils.conditional('SMARC', '1', 'mca', '', d)}"
 
 # Console
 SERIAL_CONSOLES = "115200;ttyLP0"