diff --git a/meta-digi-arm/conf/layer.conf b/meta-digi-arm/conf/layer.conf
index 114137dd3..6056573d4 100644
--- a/meta-digi-arm/conf/layer.conf
+++ b/meta-digi-arm/conf/layer.conf
@@ -9,7 +9,9 @@ BBFILE_COLLECTIONS += "digi-arm"
 BBFILE_PATTERN_digi-arm := "^${LAYERDIR}/"
 BBFILE_PRIORITY_digi-arm = "5"
 
-LAYERDEPENDS_digi-arm = "core freescale-layer"
+LAYERDEPENDS_digi-arm = "core"
+LAYERDEPENDS_digi-arm += "${@oe.utils.conditional('DEY_BUILD_PLATFORM', 'NXP', 'freescale-layer', '', d)}"
+LAYERDEPENDS_digi-arm += "${@oe.utils.conditional('DEY_BUILD_PLATFORM', 'STM', 'stm-st-stm32mp', '', d)}"
 
 LAYERSERIES_COMPAT_digi-arm = "hardknott"
 
diff --git a/meta-digi-arm/conf/machine/include/imx-digi-base.inc b/meta-digi-arm/conf/machine/include/imx-digi-base.inc
index ba90793e8..596bf2f42 100644
--- a/meta-digi-arm/conf/machine/include/imx-digi-base.inc
+++ b/meta-digi-arm/conf/machine/include/imx-digi-base.inc
@@ -138,3 +138,5 @@ MACHINEOVERRIDES =. "use-nxp-bsp:"
 # U-Boot 2017.X requires a specific dtc version.
 PREFERRED_VERSION_dtc-native_ccimx6 ?= "1.4.5"
 PREFERRED_VERSION_nativesdk-dtc_ccimx6 ?= "1.4.5"
+
+DEY_BUILD_PLATFORM = "NXP"