Patchwork [2/2] tune-ppce5500: consolidate ppce5500 and ppc64e5500 into one tune file

login
register
mail settings
Submitter Matthew McClintock
Date Feb. 23, 2012, 6:21 a.m.
Message ID <1329978109-642-2-git-send-email-msm@freescale.com>
Download mbox | patch
Permalink /patch/21611/
State Accepted
Commit 4fbb72a359fea2e0922f472f48f186bbd1ca2b36
Headers show

Comments

Matthew McClintock - Feb. 23, 2012, 6:21 a.m.
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>
---
 meta/conf/machine/include/tune-ppce5500-32b.inc |   15 ---------------
 meta/conf/machine/include/tune-ppce5500-64b.inc |   15 ---------------
 meta/conf/machine/include/tune-ppce5500.inc     |   20 ++++++++++++++++++++
 3 files changed, 20 insertions(+), 30 deletions(-)
 delete mode 100644 meta/conf/machine/include/tune-ppce5500-32b.inc
 delete mode 100644 meta/conf/machine/include/tune-ppce5500-64b.inc
 create mode 100644 meta/conf/machine/include/tune-ppce5500.inc

Patch

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 7a9e533..0000000
--- 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 683d25f..0000000
--- 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 0000000..fe8d79d
--- /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)}"