diff --git a/meta-digi-arm/conf/machine/ccmp13-dvk.conf b/meta-digi-arm/conf/machine/ccmp13-dvk.conf
index ec899c9e9..ffe3de0fa 100644
--- a/meta-digi-arm/conf/machine/ccmp13-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccmp13-dvk.conf
@@ -93,12 +93,6 @@ ST_TOOLS_FOR_SDK:remove = "nativesdk-gcc-arm-none-eabi"
 # activate/deactivate the debug and trace on boot stage
 ST_DEBUG_TRACE = "0"
 
-# =========================================================================
-# trusted-firmware-a
-# =========================================================================
-# Configure trusted-firmware-a build
-TF_A_CONFIG = "optee nand"
-
 # =========================================================================
 # optee
 # =========================================================================
diff --git a/meta-digi-arm/conf/machine/ccmp15-dvk.conf b/meta-digi-arm/conf/machine/ccmp15-dvk.conf
index fa6c11550..bf45951ff 100644
--- a/meta-digi-arm/conf/machine/ccmp15-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccmp15-dvk.conf
@@ -101,12 +101,6 @@ ST_TOOLS_FOR_SDK:remove = "nativesdk-gcc-arm-none-eabi"
 # activate/deactivate the debug and trace on boot stage
 ST_DEBUG_TRACE = "0"
 
-# =========================================================================
-# trusted-firmware-a
-# =========================================================================
-# Configure trusted-firmware-a build
-TF_A_CONFIG = "optee nand"
-
 # =========================================================================
 # optee
 # =========================================================================