summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2014-02-12 12:02:27 -0200
committerOtavio Salvador <otavio@ossystems.com.br>2014-02-12 12:02:27 -0200
commit2f6506bf0f77dabb3b97c0c98d337d2c3359cf9b (patch)
tree5c1353188e5f9a9e78ebcebaa3a0c9c62eef9a27 /conf
parent8f8b28ad19e87ae7934213369d95c5adf8f53caf (diff)
downloadmeta-fsl-arm-2f6506bf0f77dabb3b97c0c98d337d2c3359cf9b.tar.gz
imx31pdf, imx35pdf: Remove duplicate inclusion of soc-family.inc
This fixes following warning during build: ,----[ Warning ] | WARNING: Duplicate inclusion for .../meta/conf/machine/include/soc-family.inc | in .../sources/meta-fsl-arm/conf/machine/include/imx-base.inc `---- Change-Id: Ie23c6a25e23e1968a595969a3962d82284a6f1e9 Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/imx31pdk.conf1
-rw-r--r--conf/machine/imx35pdk.conf1
2 files changed, 0 insertions, 2 deletions
diff --git a/conf/machine/imx31pdk.conf b/conf/machine/imx31pdk.conf
index aca26c8..50da78e 100644
--- a/conf/machine/imx31pdk.conf
+++ b/conf/machine/imx31pdk.conf
@@ -3,7 +3,6 @@
3#@SOC: i.MX31 3#@SOC: i.MX31
4#@DESCRIPTION: Machine configuration for Freescale i.MX31 Platform Development Kit 4#@DESCRIPTION: Machine configuration for Freescale i.MX31 Platform Development Kit
5 5
6include conf/machine/include/soc-family.inc
7include conf/machine/include/imx-base.inc 6include conf/machine/include/imx-base.inc
8require conf/machine/include/tune-arm1136jf-s.inc 7require conf/machine/include/tune-arm1136jf-s.inc
9 8
diff --git a/conf/machine/imx35pdk.conf b/conf/machine/imx35pdk.conf
index ac7a8c5..b49e9f2 100644
--- a/conf/machine/imx35pdk.conf
+++ b/conf/machine/imx35pdk.conf
@@ -3,7 +3,6 @@
3#@SOC: i.MX35 3#@SOC: i.MX35
4#@DESCRIPTION: Machine configuration for Freescale i.MX35 Platform Development Kit 4#@DESCRIPTION: Machine configuration for Freescale i.MX35 Platform Development Kit
5 5
6include conf/machine/include/soc-family.inc
7include conf/machine/include/imx-base.inc 6include conf/machine/include/imx-base.inc
8require conf/machine/include/tune-arm1136jf-s.inc 7require conf/machine/include/tune-arm1136jf-s.inc
9 8