From: Otavio Salvador <otavio@ossystems.com.br>
Date: Tue, 18 Sep 2012 14:56:23 +0000 (-0300)
Subject: Merge remote branch 'freescale/denzil'
X-Git-Tag: 2.1~1712
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=4610e4043cd0fddf3c48a982f860bb20cd1ce5d3;p=meta-freescale.git

Merge remote branch 'freescale/denzil'

* freescale/denzil:
  Move fsl-default*.inc from distro to machine
---

4610e4043cd0fddf3c48a982f860bb20cd1ce5d3
diff --cc meta-fsl-arm/conf/machine/include/imx-base.inc
index 11457098,68a19112..46394302
--- a/meta-fsl-arm/conf/machine/include/imx-base.inc
+++ b/meta-fsl-arm/conf/machine/include/imx-base.inc
@@@ -1,12 -1,9 +1,12 @@@
  # Provides the i.MX common settings
  
- include conf/distro/include/fsl-default-settings.inc
- include conf/distro/include/fsl-default-versions.inc
- include conf/distro/include/fsl-default-providers.inc
+ include conf/machine/include/fsl-default-settings.inc
+ include conf/machine/include/fsl-default-versions.inc
+ include conf/machine/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"