summaryrefslogtreecommitdiffstats
path: root/meta/conf/machine
diff options
context:
space:
mode:
authorMatthew McClintock <msm@freescale.com>2012-02-23 00:21:49 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-28 12:27:50 +0000
commite42bc47ef80ae56a2de7b918a7e06cbda30cab10 (patch)
tree4fbf09dc6b9cadb80b293555ccaa4245432c3df3 /meta/conf/machine
parentdf329ad709401d958389d120de6f3f39b7d8c255 (diff)
downloadpoky-e42bc47ef80ae56a2de7b918a7e06cbda30cab10.tar.gz
tune-ppce5500: consolidate ppce5500 and ppc64e5500 into one tune file
We don't need two files for this. Also this fixes some mutlilib build issues where we were not able to select the multilib arch to be ppce5500 or ppc64e5500. Changes recently made to meta-fsl-ppc layer depend on this change as well (From OE-Core rev: 4fbb72a359fea2e0922f472f48f186bbd1ca2b36) Signed-off-by: Matthew McClintock <msm@freescale.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/machine')
-rw-r--r--meta/conf/machine/include/tune-ppce5500-32b.inc15
-rw-r--r--meta/conf/machine/include/tune-ppce5500-64b.inc15
-rw-r--r--meta/conf/machine/include/tune-ppce5500.inc20
3 files changed, 20 insertions, 30 deletions
diff --git a/meta/conf/machine/include/tune-ppce5500-32b.inc b/meta/conf/machine/include/tune-ppce5500-32b.inc
deleted file mode 100644
index 7a9e533f2d..0000000000
--- a/meta/conf/machine/include/tune-ppce5500-32b.inc
+++ /dev/null
@@ -1,15 +0,0 @@
1DEFAULTTUNE ?= "ppce5500"
2
3require conf/machine/include/powerpc/arch-powerpc64.inc
4
5TUNEVALID[ppce5500] = "Enable ppce5500 specific processor optimizations"
6TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ppce5500", "-mcpu=e5500", "", d)}"
7TUNE_PKGARCH = "${@bb.utils.contains("TUNE_FEATURES", "ppce5500", "ppce5500", "${PPCPKGARCH}", d)}"
8
9AVAILTUNES = "ppce5500"
10TUNE_FEATURES_tune-ppce5500 = "m32 ppce5500"
11PACKAGE_EXTRA_ARCHS_tune-ppce5500 = "powerpc ppce5500"
12BASE_LIB_tune-ppce5500 = "lib"
13
14# glibc configure options to get e5500 specific library (for sqrt)
15GLIBC_EXTRA_OECONF += "${@bb.utils.contains("TUNE_FEATURES", "ppce5500", "--with-cpu=e5500", "", d)}"
diff --git a/meta/conf/machine/include/tune-ppce5500-64b.inc b/meta/conf/machine/include/tune-ppce5500-64b.inc
deleted file mode 100644
index 683d25f9f3..0000000000
--- a/meta/conf/machine/include/tune-ppce5500-64b.inc
+++ /dev/null
@@ -1,15 +0,0 @@
1DEFAULTTUNE ?= "ppc64e5500"
2
3require conf/machine/include/powerpc/arch-powerpc64.inc
4
5TUNEVALID[ppc64e5500] = "Enable ppc64e5500 specific processor optimizations"
6TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ppc64e5500", "-mcpu=e5500", "", d)}"
7TUNE_PKGARCH = "${@bb.utils.contains("TUNE_FEATURES", "ppc64e5500", "ppc64e5500", "${PPCPKGARCH}", d)}"
8
9AVAILTUNES = "ppc64e5500"
10TUNE_FEATURES_tune-ppc64e5500 = "m64 ppc64e5500"
11PACKAGE_EXTRA_ARCHS_tune-ppc64e5500 = "powerpc64 ppc64e5500"
12BASE_LIB_tune-ppc64e5500 = "lib64"
13
14# glibc configure options to get e5500 specific library (for sqrt)
15GLIBC_EXTRA_OECONF += "${@bb.utils.contains("TUNE_FEATURES", "ppc64e5500", "--with-cpu=e5500", "", d)}"
diff --git a/meta/conf/machine/include/tune-ppce5500.inc b/meta/conf/machine/include/tune-ppce5500.inc
new file mode 100644
index 0000000000..fe8d79d51d
--- /dev/null
+++ b/meta/conf/machine/include/tune-ppce5500.inc
@@ -0,0 +1,20 @@
1DEFAULTTUNE ?= "ppce5500"
2
3require conf/machine/include/powerpc/arch-powerpc64.inc
4
5TUNEVALID[e5500] = "Enable Freescale e5500 specific processor optimizations"
6TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "e5500", "-mcpu=e5500", "", d)}"
7
8AVAILTUNES += "ppce5500 ppc64e5500"
9TUNE_FEATURES_tune-ppce5500 = "m32 fpu-hard e5500"
10PACKAGE_EXTRA_ARCHS_tune-ppce5500 = "${PACKAGE_EXTRA_ARCHS_tune-powerpc} ppce5500"
11BASE_LIB_tune-ppce5500 = "lib"
12TUNE_PKGARCH_tune-ppce5500 = "ppce5500"
13
14TUNE_FEATURES_tune-ppc64e5500 = "m64 fpu-hard e5500"
15PACKAGE_EXTRA_ARCHS_tune-ppc64e5500 = "${PACKAGE_EXTRA_ARCHS_tune-powerpc64} ppc64e5500"
16BASE_LIB_tune-ppc64e5500 = "lib64"
17TUNE_PKGARCH_tune-ppc64e5500 = "ppc64e5500"
18
19# glibc configure options to get e5500 specific library (for sqrt)
20GLIBC_EXTRA_OECONF += "${@bb.utils.contains("TUNE_FEATURES", "e5500", "--with-cpu=e5500", "", d)}"