diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2014-02-12 12:02:27 -0200 |
|---|---|---|
| committer | Otavio Salvador <otavio@ossystems.com.br> | 2014-02-12 12:02:27 -0200 |
| commit | ef45304b3ca1a711fbcd3525fb05d2c80248a8b9 (patch) | |
| tree | 87cc6e15c495dfd7d12b53f2f068056100f3d0e3 | |
| parent | cc6d00af074698fb391fe8727fdefd26979c5aad (diff) | |
| download | meta-freescale-ef45304b3ca1a711fbcd3525fb05d2c80248a8b9.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>
| -rw-r--r-- | meta-fsl-arm/conf/machine/imx31pdk.conf | 1 | ||||
| -rw-r--r-- | meta-fsl-arm/conf/machine/imx35pdk.conf | 1 |
2 files changed, 0 insertions, 2 deletions
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 @@ | |||
| 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 | ||
| 6 | include conf/machine/include/soc-family.inc | ||
| 7 | include conf/machine/include/imx-base.inc | 6 | include conf/machine/include/imx-base.inc |
| 8 | require conf/machine/include/tune-arm1136jf-s.inc | 7 | require conf/machine/include/tune-arm1136jf-s.inc |
| 9 | 8 | ||
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 @@ | |||
| 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 | ||
| 6 | include conf/machine/include/soc-family.inc | ||
| 7 | include conf/machine/include/imx-base.inc | 6 | include conf/machine/include/imx-base.inc |
| 8 | require conf/machine/include/tune-arm1136jf-s.inc | 7 | require conf/machine/include/tune-arm1136jf-s.inc |
| 9 | 8 | ||