8 files changed, 18 insertions, 2 deletions
diff --git a/conf/machine/imx23evk.conf b/conf/machine/imx23evk.conf
index 2722b25..a4a9078 100644
--- a/conf/machine/imx23evk.conf
+++ b/conf/machine/imx23evk.conf
@@ -7,6 +7,7 @@ include conf/machine/include/mxs-base.inc
 IMXBOOTLETS_MACHINE = "stmp378x_dev"
 
 KERNEL_IMAGETYPE = "zImage"
+KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx23-evk.dts"
 
 IMAGE_BOOTLOADER = "imx-bootlets"
 
diff --git a/conf/machine/imx28evk.conf b/conf/machine/imx28evk.conf
index c00d358..62c468f 100644
--- a/conf/machine/imx28evk.conf
+++ b/conf/machine/imx28evk.conf
@@ -13,6 +13,7 @@ UBOOT_MAKE_TARGET = "u-boot.sb"
 UBOOT_SUFFIX = "sb"
 
 KERNEL_IMAGETYPE = "uImage"
+KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx28-evk.dts"
 
 SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
 IMAGE_FSTYPES ?= "tar.bz2 ext3 uboot.mxsboot-sdcard sdcard"
diff --git a/conf/machine/imx51evk.conf b/conf/machine/imx51evk.conf
index 0f6771d..5d7bbab 100644
--- a/conf/machine/imx51evk.conf
+++ b/conf/machine/imx51evk.conf
@@ -8,6 +8,8 @@ include conf/machine/include/tune-cortexa8.inc
 
 SOC_FAMILY = "mx5"
 
+KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx51-babbage.dts"
+
 UBOOT_ENTRYPOINT = "0xa0000000"
 UBOOT_LOADADDRESS = "0xa0000000"
 UBOOT_MACHINE = "mx51evk_config"
diff --git a/conf/machine/imx53ard.conf b/conf/machine/imx53ard.conf
index d4ff4d7..9b070d0 100644
--- a/conf/machine/imx53ard.conf
+++ b/conf/machine/imx53ard.conf
@@ -8,6 +8,8 @@ include conf/machine/include/tune-cortexa8.inc
 
 SOC_FAMILY = "mx5"
 
+KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx53-ard.dts"
+
 UBOOT_ENTRYPOINT = "0x70800000"
 UBOOT_LOADADDRESS = "0x70800000"
 UBOOT_MACHINE = "mx53ard_config"
diff --git a/conf/machine/imx53qsb.conf b/conf/machine/imx53qsb.conf
index 69aa7b0..ca73671 100644
--- a/conf/machine/imx53qsb.conf
+++ b/conf/machine/imx53qsb.conf
@@ -8,6 +8,8 @@ include conf/machine/include/tune-cortexa8.inc
 
 SOC_FAMILY = "mx5"
 
+KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx53-qsb.dts"
+
 UBOOT_ENTRYPOINT = "0x70800000"
 UBOOT_LOADADDRESS = "0x70800000"
 UBOOT_MACHINE = "mx53loco_config"
diff --git a/conf/machine/imx6qsabrelite.conf b/conf/machine/imx6qsabrelite.conf
index b1daeab..e10229a 100644
--- a/conf/machine/imx6qsabrelite.conf
+++ b/conf/machine/imx6qsabrelite.conf
@@ -8,6 +8,8 @@ include conf/machine/include/tune-cortexa9.inc
 
 SOC_FAMILY = "mx6"
 
+KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx6q-sabrelite.dts"
+
 UBOOT_ENTRYPOINT =  "0x10800000"
 UBOOT_LOADADDRESS = "0x10800000"
 UBOOT_MACHINE = "mx6qsabrelite_config"
@@ -19,7 +21,7 @@ XSERVER = "xserver-xorg \
            xf86-video-fbdev"
 MACHINE_EXTRA_RRECOMMENDS = "kernel-modules \
                              imx-audio \
-                             udev-extra-rules"
+                             udev-extraconf"
 
 SERIAL_CONSOLE = "115200 ttymxc1"
 
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 20467c7..1145709 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -4,6 +4,9 @@ include conf/distro/include/fsl-default-settings.inc
 include conf/distro/include/fsl-default-versions.inc
 include conf/distro/include/fsl-default-providers.inc
 
+# Disable perf features as 2.6.35.3 fail to build otherwise
+PERF_FEATURES_ENABLE = ""
+
 # Set specific make target and binary suffix
 UBOOT_MAKE_TARGET = "u-boot.imx"
 UBOOT_SUFFIX = "imx"
@@ -19,7 +22,7 @@ MACHINE_EXTRA_RRECOMMENDS = "kernel-modules"
 MACHINE_EXTRA_RRECOMMENDS += "imx-audio \
                               imx-firmware \
                               imx-lib \
-                              udev-extra-rules \
+                              udev-extraconf \
                              "
 
 # Gstreamer plugin
diff --git a/conf/machine/include/mxs-base.inc b/conf/machine/include/mxs-base.inc
index 486e914..c92c25e 100644
--- a/conf/machine/include/mxs-base.inc
+++ b/conf/machine/include/mxs-base.inc
@@ -9,6 +9,9 @@ include conf/machine/include/tune-arm926ejs.inc
 
 SOC_FAMILY = "mxs"
 
+# Disable perf features as 2.6.35.3 fail to build otherwise
+PERF_FEATURES_ENABLE = ""
+
 XSERVER = "xserver-xorg \
            xf86-input-evdev \
            xf86-video-fbdev"