diff --git a/meta-digi-arm/conf/machine/ccmp13-dvk.conf b/meta-digi-arm/conf/machine/ccmp13-dvk.conf
index 7ecd6c0a1..ec899c9e9 100644
--- a/meta-digi-arm/conf/machine/ccmp13-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccmp13-dvk.conf
@@ -17,8 +17,9 @@ MACHINEOVERRIDES = "arm:armv7ve:stcommon:stm32mpcommon:stm32mp1common:${DIGI_FAM
 # =========================================================================
 # boot device
 # =========================================================================
-# Configure the list of boards that enable NAND
+# Configure the list of boards that enable NAND/SDCARD
 DEVICE_BOARD_ENABLE:NAND   += "ccmp13-dvk"
+DEVICE_BOARD_ENABLE:SDCARD += "${@bb.utils.contains('BOOTDEVICE_LABELS', 'sdcard', 'ccmp13-dvk', '', d)}"
 
 # =========================================================================
 # U-Boot configs
diff --git a/meta-digi-arm/conf/machine/ccmp15-dvk.conf b/meta-digi-arm/conf/machine/ccmp15-dvk.conf
index 64dd70af7..fa6c11550 100644
--- a/meta-digi-arm/conf/machine/ccmp15-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccmp15-dvk.conf
@@ -17,8 +17,9 @@ MACHINEOVERRIDES = "arm:armv7ve:stcommon:stm32mpcommon:stm32mp1common:${DIGI_FAM
 # =========================================================================
 # boot device
 # =========================================================================
-# Configure the list of boards that enable NAND
+# Configure the list of boards that enable NAND/SDCARD
 DEVICE_BOARD_ENABLE:NAND   += "ccmp15-dvk"
+DEVICE_BOARD_ENABLE:SDCARD += "${@bb.utils.contains('BOOTDEVICE_LABELS', 'sdcard', 'ccmp15-dvk', '', d)}"
 
 # =========================================================================
 # U-Boot configs