diff --git a/meta-digi-arm/classes/boot-artifacts.bbclass b/meta-digi-arm/classes/boot-artifacts.bbclass
index 02236d76e..37cf486ed 100644
--- a/meta-digi-arm/classes/boot-artifacts.bbclass
+++ b/meta-digi-arm/classes/boot-artifacts.bbclass
@@ -36,7 +36,7 @@ def get_bootable_artifacts(d):
     uboot_suffix = d.getVar('UBOOT_SUFFIX', True) or ""
     atf_types = d.getVar('TF_A_CONFIG', True) or ""
     fip_type = d.getVar('FIP_UBOOT_CONFIG', True) or ""
-    atf_boot_modes = ['nand', 'usb']
+    atf_boot_modes = ['nand']
     artifacts = []
 
     # For platforms with a FIP artifact, ignore u-boot artifacts
diff --git a/meta-digi-arm/conf/machine/ccmp13-dvk.conf b/meta-digi-arm/conf/machine/ccmp13-dvk.conf
index b28ce0375..7be34109d 100644
--- a/meta-digi-arm/conf/machine/ccmp13-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccmp13-dvk.conf
@@ -97,7 +97,7 @@ ST_DEBUG_TRACE = "0"
 # trusted-firmware-a
 # =========================================================================
 # Configure trusted-firmware-a build
-TF_A_CONFIG = "optee nand usb"
+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 8dbb398c9..fdef10dc1 100644
--- a/meta-digi-arm/conf/machine/ccmp15-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccmp15-dvk.conf
@@ -105,7 +105,7 @@ ST_DEBUG_TRACE = "0"
 # trusted-firmware-a
 # =========================================================================
 # Configure trusted-firmware-a build
-TF_A_CONFIG = "optee nand usb"
+TF_A_CONFIG = "optee nand"
 
 # =========================================================================
 # optee
diff --git a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_%.bbappend b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_%.bbappend
index 15e441ddb..ba9b87759 100644
--- a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_%.bbappend
+++ b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_%.bbappend
@@ -13,3 +13,5 @@ SRCREV = "${AUTOREV}"
 SRC_URI = " \
     ${TFA_GIT_URI};branch=${SRCBRANCH} \
 "
+
+TF_A_CONFIG[nand]   = "${DEVICE_BOARD_ENABLE:NAND},STM32MP_RAW_NAND=1 ${@'STM32MP_FORCE_MTD_START_OFFSET=${TF_A_MTD_START_OFFSET_NAND}' if ${TF_A_MTD_START_OFFSET_NAND} else ''} STM32MP_USB_PROGRAMMER=1"