diff --git a/meta-digi-arm/conf/machine/include/ccardimx28.inc b/meta-digi-arm/conf/machine/include/ccardimx28.inc
index c4ce2ee3b..459e8b4b4 100644
--- a/meta-digi-arm/conf/machine/include/ccardimx28.inc
+++ b/meta-digi-arm/conf/machine/include/ccardimx28.inc
@@ -4,7 +4,8 @@
 
 include conf/machine/include/mxs-digi-base.inc
 
-SOC_FAMILY = "mxs:mx28"
+DIGI_FAMILY = "ccardimx28"
+SOC_FAMILY  = "mxs:mx28:${DIGI_FAMILY}"
 
 # Platform u-boot settings
 UBOOT_ENTRYPOINT = "0x40008000"
diff --git a/meta-digi-arm/conf/machine/include/ccimx51.inc b/meta-digi-arm/conf/machine/include/ccimx51.inc
index 02f9672dd..cf3d143fe 100644
--- a/meta-digi-arm/conf/machine/include/ccimx51.inc
+++ b/meta-digi-arm/conf/machine/include/ccimx51.inc
@@ -5,7 +5,8 @@
 include conf/machine/include/imx-digi-base.inc
 include conf/machine/include/tune-cortexa8.inc
 
-SOC_FAMILY = "mx5:mx51"
+DIGI_FAMILY = "ccimx5:ccimx51"
+SOC_FAMILY  = "mx5:mx51:${DIGI_FAMILY}"
 
 # Platform u-boot settings
 UBOOT_ENTRYPOINT = "0x90008000"
diff --git a/meta-digi-arm/conf/machine/include/ccimx53.inc b/meta-digi-arm/conf/machine/include/ccimx53.inc
index df56d07aa..b8f980ffb 100644
--- a/meta-digi-arm/conf/machine/include/ccimx53.inc
+++ b/meta-digi-arm/conf/machine/include/ccimx53.inc
@@ -5,7 +5,8 @@
 include conf/machine/include/imx-digi-base.inc
 include conf/machine/include/tune-cortexa8.inc
 
-SOC_FAMILY = "mx5:mx53"
+DIGI_FAMILY = "ccimx5:ccimx53"
+SOC_FAMILY  = "mx5:mx53:${DIGI_FAMILY}"
 
 # Platform u-boot settings
 UBOOT_ENTRYPOINT = "0x70008000"
diff --git a/meta-digi-arm/conf/machine/include/ccimx6.inc b/meta-digi-arm/conf/machine/include/ccimx6.inc
index 2063a1aa6..05c476198 100644
--- a/meta-digi-arm/conf/machine/include/ccimx6.inc
+++ b/meta-digi-arm/conf/machine/include/ccimx6.inc
@@ -5,7 +5,8 @@
 include conf/machine/include/imx-digi-base.inc
 include conf/machine/include/tune-cortexa9.inc
 
-SOC_FAMILY = "mx6:mx6q"
+DIGI_FAMILY = "ccimx6"
+SOC_FAMILY  = "mx6:mx6q:${DIGI_FAMILY}"
 
 # Platform u-boot settings
 UBOOT_ENTRYPOINT = "0x10800000"