From ad1123e7958bfd1f97a40eaada206eb285c8f540 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 16 Dec 2011 10:27:28 +0000 Subject: [PATCH] avoid changing settings under the hood of non-BSP machines In case Meta-Freescale is used together with other layers it shouldn't change any setting except when using the BSD specific machines thus the include files are moved onto a imx53-base.inc file. Signed-off-by: Otavio Salvador --- meta-fsl-arm/conf/layer.conf | 5 ----- meta-fsl-arm/conf/machine/imx53ard.conf | 1 + meta-fsl-arm/conf/machine/imx53qsb.conf | 1 + meta-fsl-arm/conf/machine/include/imx53-base.inc | 3 +++ 4 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 meta-fsl-arm/conf/machine/include/imx53-base.inc diff --git a/meta-fsl-arm/conf/layer.conf b/meta-fsl-arm/conf/layer.conf index 2cf083d9..cbd2297f 100644 --- a/meta-fsl-arm/conf/layer.conf +++ b/meta-fsl-arm/conf/layer.conf @@ -1,11 +1,6 @@ # We have a conf and classes directory, add to BBPATH BBPATH := "${BBPATH}:${LAYERDIR}" -# Include default versions -include conf/distro/include/fsl-default-versions.inc -include conf/distro/include/fsl-default-revisions.inc -include conf/distro/include/fsl-default-providers.inc - # We have a packages directory, add to BBFILES BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend" diff --git a/meta-fsl-arm/conf/machine/imx53ard.conf b/meta-fsl-arm/conf/machine/imx53ard.conf index 8a0a08d4..73fc3a25 100644 --- a/meta-fsl-arm/conf/machine/imx53ard.conf +++ b/meta-fsl-arm/conf/machine/imx53ard.conf @@ -2,6 +2,7 @@ #@NAME: imx53 SABRE tablet board #@DESCRIPTION: Machine configuration for Freescale imx53 sabre tablet board +include conf/machine/include/imx53-base.inc include conf/machine/include/tune-cortexa8.inc # Todo: diff --git a/meta-fsl-arm/conf/machine/imx53qsb.conf b/meta-fsl-arm/conf/machine/imx53qsb.conf index cd922f8e..e9b8ff64 100644 --- a/meta-fsl-arm/conf/machine/imx53qsb.conf +++ b/meta-fsl-arm/conf/machine/imx53qsb.conf @@ -3,6 +3,7 @@ #@DESCRIPTION: Machine configuration for Freescale imx53 quick start board #TARGET_ARCH = "arm" +include conf/machine/include/imx53-base.inc include conf/machine/include/tune-cortexa8.inc # Todo: diff --git a/meta-fsl-arm/conf/machine/include/imx53-base.inc b/meta-fsl-arm/conf/machine/include/imx53-base.inc new file mode 100644 index 00000000..de72a150 --- /dev/null +++ b/meta-fsl-arm/conf/machine/include/imx53-base.inc @@ -0,0 +1,3 @@ +include conf/distro/include/fsl-default-versions.inc +include conf/distro/include/fsl-default-revisions.inc +include conf/distro/include/fsl-default-providers.inc -- 2.40.1