summaryrefslogtreecommitdiff
path: root/meta/conf
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:14:51 +0000
commit4fbb72a359fea2e0922f472f48f186bbd1ca2b36 (patch)
tree63fd17994e18865b83f8caed23b94bf18f2bf9cf /meta/conf
parentd19298a4915e00f4a91364d64ddc5fb9689b23c9 (diff)
downloadopenembedded-core-4fbb72a359fea2e0922f472f48f186bbd1ca2b36.tar.gz
openembedded-core-4fbb72a359fea2e0922f472f48f186bbd1ca2b36.tar.bz2
openembedded-core-4fbb72a359fea2e0922f472f48f186bbd1ca2b36.zip
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 Signed-off-by: Matthew McClintock <msm@freescale.com>
Diffstat (limited to 'meta/conf')
-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 @@
-DEFAULTTUNE ?= "ppce5500"
-
-require conf/machine/include/powerpc/arch-powerpc64.inc
-
-TUNEVALID[ppce5500] = "Enable ppce5500 specific processor optimizations"
-TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ppce5500", "-mcpu=e5500", "", d)}"
-TUNE_PKGARCH = "${@bb.utils.contains("TUNE_FEATURES", "ppce5500", "ppce5500", "${PPCPKGARCH}", d)}"
-
-AVAILTUNES = "ppce5500"
-TUNE_FEATURES_tune-ppce5500 = "m32 ppce5500"
-PACKAGE_EXTRA_ARCHS_tune-ppce5500 = "powerpc ppce5500"
-BASE_LIB_tune-ppce5500 = "lib"
-
-# glibc configure options to get e5500 specific library (for sqrt)
-GLIBC_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 @@
-DEFAULTTUNE ?= "ppc64e5500"
-
-require conf/machine/include/powerpc/arch-powerpc64.inc
-
-TUNEVALID[ppc64e5500] = "Enable ppc64e5500 specific processor optimizations"
-TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ppc64e5500", "-mcpu=e5500", "", d)}"
-TUNE_PKGARCH = "${@bb.utils.contains("TUNE_FEATURES", "ppc64e5500", "ppc64e5500", "${PPCPKGARCH}", d)}"
-
-AVAILTUNES = "ppc64e5500"
-TUNE_FEATURES_tune-ppc64e5500 = "m64 ppc64e5500"
-PACKAGE_EXTRA_ARCHS_tune-ppc64e5500 = "powerpc64 ppc64e5500"
-BASE_LIB_tune-ppc64e5500 = "lib64"
-
-# glibc configure options to get e5500 specific library (for sqrt)
-GLIBC_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 @@
+DEFAULTTUNE ?= "ppce5500"
+
+require conf/machine/include/powerpc/arch-powerpc64.inc
+
+TUNEVALID[e5500] = "Enable Freescale e5500 specific processor optimizations"
+TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "e5500", "-mcpu=e5500", "", d)}"
+
+AVAILTUNES += "ppce5500 ppc64e5500"
+TUNE_FEATURES_tune-ppce5500 = "m32 fpu-hard e5500"
+PACKAGE_EXTRA_ARCHS_tune-ppce5500 = "${PACKAGE_EXTRA_ARCHS_tune-powerpc} ppce5500"
+BASE_LIB_tune-ppce5500 = "lib"
+TUNE_PKGARCH_tune-ppce5500 = "ppce5500"
+
+TUNE_FEATURES_tune-ppc64e5500 = "m64 fpu-hard e5500"
+PACKAGE_EXTRA_ARCHS_tune-ppc64e5500 = "${PACKAGE_EXTRA_ARCHS_tune-powerpc64} ppc64e5500"
+BASE_LIB_tune-ppc64e5500 = "lib64"
+TUNE_PKGARCH_tune-ppc64e5500 = "ppc64e5500"
+
+# glibc configure options to get e5500 specific library (for sqrt)
+GLIBC_EXTRA_OECONF += "${@bb.utils.contains("TUNE_FEATURES", "e5500", "--with-cpu=e5500", "", d)}"