diff --git a/meta-digi-arm/conf/machine/include/ccardimx28.inc b/meta-digi-arm/conf/machine/include/ccardimx28.inc
index 58c3bdb26..61a22d0ce 100644
--- a/meta-digi-arm/conf/machine/include/ccardimx28.inc
+++ b/meta-digi-arm/conf/machine/include/ccardimx28.inc
@@ -7,6 +7,12 @@ include conf/machine/include/mxs-digi-base.inc
 DIGI_FAMILY = "ccardimx28"
 SOC_FAMILY  = "mxs:mx28:${DIGI_FAMILY}"
 
+# Disable perf features when using kernel 2.6.35 as perf fails to build otherwise
+python __anonymous() {
+    if d.getVar('IS_KERNEL_2X', True) == '1':
+        d.setVar('PERF_FEATURES_ENABLE', '')
+}
+
 # Platform u-boot settings (IS_KERNEL_2X implies also u-boot v2009.08)
 UBOOT_BSTR = "${@base_conditional('IS_KERNEL_2X', '1' , '-ivt', '', d)}"
 UBOOT_ENTRYPOINT = "0x40008000"
diff --git a/meta-digi-arm/conf/machine/include/ccimx51.inc b/meta-digi-arm/conf/machine/include/ccimx51.inc
index b167e5735..91bcf8513 100644
--- a/meta-digi-arm/conf/machine/include/ccimx51.inc
+++ b/meta-digi-arm/conf/machine/include/ccimx51.inc
@@ -8,6 +8,9 @@ include conf/machine/include/tune-cortexa8.inc
 DIGI_FAMILY = "ccimx5:ccimx51"
 SOC_FAMILY  = "mx5:mx51:${DIGI_FAMILY}"
 
+# Disable perf features when using kernel 2.6.35 as perf fails to build otherwise
+PERF_FEATURES_ENABLE = ""
+
 # Platform u-boot settings
 UBOOT_ENTRYPOINT = "0x90008000"
 UBOOT_SUFFIX = "bin"
diff --git a/meta-digi-arm/conf/machine/include/ccimx53.inc b/meta-digi-arm/conf/machine/include/ccimx53.inc
index 3708caed5..741a6da60 100644
--- a/meta-digi-arm/conf/machine/include/ccimx53.inc
+++ b/meta-digi-arm/conf/machine/include/ccimx53.inc
@@ -8,6 +8,9 @@ include conf/machine/include/tune-cortexa8.inc
 DIGI_FAMILY = "ccimx5:ccimx53"
 SOC_FAMILY  = "mx5:mx53:${DIGI_FAMILY}"
 
+# Disable perf features when using kernel 2.6.35 as perf fails to build otherwise
+PERF_FEATURES_ENABLE = ""
+
 # Platform u-boot settings
 UBOOT_ENTRYPOINT = "0x70008000"
 UBOOT_SUFFIX = "bin"
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 e260bcf31..27369e022 100644
--- a/meta-digi-arm/conf/machine/include/imx-digi-base.inc
+++ b/meta-digi-arm/conf/machine/include/imx-digi-base.inc
@@ -2,9 +2,6 @@
 include conf/machine/include/digi-defaults.inc
 include conf/machine/include/soc-family.inc
 
-# Disable perf features as 2.6.35.3 fail to build otherwise
-PERF_FEATURES_ENABLE = ""
-
 XSERVER_DRIVER = "xf86-video-fbdev"
 XSERVER_DRIVER_mx5 = "xf86-video-imxfb"
 XSERVER_DRIVER_mx6 = "xf86-video-imxfb-vivante"
diff --git a/meta-digi-arm/conf/machine/include/mxs-digi-base.inc b/meta-digi-arm/conf/machine/include/mxs-digi-base.inc
index 358e9b60b..dfa01f640 100644
--- a/meta-digi-arm/conf/machine/include/mxs-digi-base.inc
+++ b/meta-digi-arm/conf/machine/include/mxs-digi-base.inc
@@ -3,9 +3,6 @@ include conf/machine/include/digi-defaults.inc
 include conf/machine/include/soc-family.inc
 include conf/machine/include/tune-arm926ejs.inc
 
-# Disable perf features as 2.6.35.3 fail to build otherwise
-PERF_FEATURES_ENABLE_mx28 = ""
-
 XSERVER = "xserver-xorg \
            xf86-input-evdev \
            xf86-video-fbdev"