From: Otavio Salvador Date: Wed, 12 Feb 2014 14:02:27 +0000 (-0200) Subject: imx31pdf, imx35pdf: Remove duplicate inclusion of soc-family.inc X-Git-Tag: 2.1~1076 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=ef45304b3ca1a711fbcd3525fb05d2c80248a8b9;p=meta-freescale.git 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 --- diff --git a/meta-fsl-arm/conf/machine/imx31pdk.conf b/meta-fsl-arm/conf/machine/imx31pdk.conf index aca26c82..50da78ee 100644 --- a/meta-fsl-arm/conf/machine/imx31pdk.conf +++ b/meta-fsl-arm/conf/machine/imx31pdk.conf @@ -3,7 +3,6 @@ #@SOC: i.MX31 #@DESCRIPTION: Machine configuration for Freescale i.MX31 Platform Development Kit -include conf/machine/include/soc-family.inc include conf/machine/include/imx-base.inc require conf/machine/include/tune-arm1136jf-s.inc diff --git a/meta-fsl-arm/conf/machine/imx35pdk.conf b/meta-fsl-arm/conf/machine/imx35pdk.conf index ac7a8c5d..b49e9f23 100644 --- a/meta-fsl-arm/conf/machine/imx35pdk.conf +++ b/meta-fsl-arm/conf/machine/imx35pdk.conf @@ -3,7 +3,6 @@ #@SOC: i.MX35 #@DESCRIPTION: Machine configuration for Freescale i.MX35 Platform Development Kit -include conf/machine/include/soc-family.inc include conf/machine/include/imx-base.inc require conf/machine/include/tune-arm1136jf-s.inc