diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2011-12-16 10:27:28 +0000 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2011-12-20 11:14:58 +0000 |
commit | a1602d28cc22e7a6cf9535dd48c137170da94f97 (patch) | |
tree | f890ac0a35fd849a9b0c1ce968ba86966522415c /conf | |
parent | cd5b84b5d36fdb05442a861514bfa65d54230a81 (diff) | |
download | meta-fsl-arm-a1602d28cc22e7a6cf9535dd48c137170da94f97.tar.gz |
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 <otavio@ossystems.com.br>
Diffstat (limited to 'conf')
-rw-r--r-- | conf/layer.conf | 5 | ||||
-rw-r--r-- | conf/machine/imx53ard.conf | 1 | ||||
-rw-r--r-- | conf/machine/imx53qsb.conf | 1 | ||||
-rw-r--r-- | conf/machine/include/imx53-base.inc | 3 |
4 files changed, 5 insertions, 5 deletions
diff --git a/conf/layer.conf b/conf/layer.conf index 2cf083d..cbd2297 100644 --- a/conf/layer.conf +++ b/conf/layer.conf | |||
@@ -1,11 +1,6 @@ | |||
1 | # We have a conf and classes directory, add to BBPATH | 1 | # We have a conf and classes directory, add to BBPATH |
2 | BBPATH := "${BBPATH}:${LAYERDIR}" | 2 | BBPATH := "${BBPATH}:${LAYERDIR}" |
3 | 3 | ||
4 | # Include default versions | ||
5 | include conf/distro/include/fsl-default-versions.inc | ||
6 | include conf/distro/include/fsl-default-revisions.inc | ||
7 | include conf/distro/include/fsl-default-providers.inc | ||
8 | |||
9 | # We have a packages directory, add to BBFILES | 4 | # We have a packages directory, add to BBFILES |
10 | BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ | 5 | BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ |
11 | ${LAYERDIR}/recipes-*/*/*.bbappend" | 6 | ${LAYERDIR}/recipes-*/*/*.bbappend" |
diff --git a/conf/machine/imx53ard.conf b/conf/machine/imx53ard.conf index 8a0a08d..73fc3a2 100644 --- a/conf/machine/imx53ard.conf +++ b/conf/machine/imx53ard.conf | |||
@@ -2,6 +2,7 @@ | |||
2 | #@NAME: imx53 SABRE tablet board | 2 | #@NAME: imx53 SABRE tablet board |
3 | #@DESCRIPTION: Machine configuration for Freescale imx53 sabre tablet board | 3 | #@DESCRIPTION: Machine configuration for Freescale imx53 sabre tablet board |
4 | 4 | ||
5 | include conf/machine/include/imx53-base.inc | ||
5 | include conf/machine/include/tune-cortexa8.inc | 6 | include conf/machine/include/tune-cortexa8.inc |
6 | 7 | ||
7 | # Todo: | 8 | # Todo: |
diff --git a/conf/machine/imx53qsb.conf b/conf/machine/imx53qsb.conf index cd922f8..e9b8ff6 100644 --- a/conf/machine/imx53qsb.conf +++ b/conf/machine/imx53qsb.conf | |||
@@ -3,6 +3,7 @@ | |||
3 | #@DESCRIPTION: Machine configuration for Freescale imx53 quick start board | 3 | #@DESCRIPTION: Machine configuration for Freescale imx53 quick start board |
4 | 4 | ||
5 | #TARGET_ARCH = "arm" | 5 | #TARGET_ARCH = "arm" |
6 | include conf/machine/include/imx53-base.inc | ||
6 | include conf/machine/include/tune-cortexa8.inc | 7 | include conf/machine/include/tune-cortexa8.inc |
7 | 8 | ||
8 | # Todo: | 9 | # Todo: |
diff --git a/conf/machine/include/imx53-base.inc b/conf/machine/include/imx53-base.inc new file mode 100644 index 0000000..de72a15 --- /dev/null +++ b/conf/machine/include/imx53-base.inc | |||
@@ -0,0 +1,3 @@ | |||
1 | include conf/distro/include/fsl-default-versions.inc | ||
2 | include conf/distro/include/fsl-default-revisions.inc | ||
3 | include conf/distro/include/fsl-default-providers.inc | ||