summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2012-03-30 19:31:20 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-04 16:17:55 (GMT)
commit78e1a7c0d1df6d649b398da778cab173cbaddef9 (patch)
tree2074b9916a1a84250ef69c71eb957f3453b98345 /meta/conf
parentd328ae22b71f35dd746bd095891100be39925f68 (diff)
downloadpoky-78e1a7c0d1df6d649b398da778cab173cbaddef9.tar.gz
conf/machine/include: Cleanup PowerPC tunings to match README
Cleanup the PowerPC tunings to match the new tuning README file. Default PowerPC to using TUNE_PKGARCH = ${TUNE_PKGARCH_tune-<tune>} Fix AVAILTUNE settings in ppc603e, and ppce500mc to be addative. Correct potentially overlapping "spe" definitions in ppce500 and ppce500v2. (From OE-Core rev: f81f71bcff4bb1032b034b068efe6065113ca9e7) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/machine/include/powerpc/README17
-rw-r--r--meta/conf/machine/include/powerpc/arch-powerpc.inc15
-rw-r--r--meta/conf/machine/include/powerpc/arch-powerpc64.inc1
-rw-r--r--meta/conf/machine/include/tune-ppc603e.inc4
-rw-r--r--meta/conf/machine/include/tune-ppce300c2.inc2
-rw-r--r--meta/conf/machine/include/tune-ppce500.inc10
-rw-r--r--meta/conf/machine/include/tune-ppce500mc.inc4
-rw-r--r--meta/conf/machine/include/tune-ppce500v2.inc10
-rw-r--r--meta/conf/machine/include/tune-ppce5500.inc4
9 files changed, 47 insertions, 20 deletions
diff --git a/meta/conf/machine/include/powerpc/README b/meta/conf/machine/include/powerpc/README
new file mode 100644
index 0000000..e87fb50
--- /dev/null
+++ b/meta/conf/machine/include/powerpc/README
@@ -0,0 +1,17 @@
12012/03/30 - Mark Hatle <mark.hatle@windriver.com>
2 - Initial revision
3
4There are 4 primary PowerPC ABIs.
5# *) Hard/Soft Floating Point
6# *) 32-bit/64-bit
7
8TUNE_ARCH is defined as either "powerpc" or "powerpc64" based on the m32
9or m64 feature.
10
11May of the PowerPC package archictures are based on legacy Linux names.
12However, a general naming scheme should be similar to: ppc[64][<family>][-nf].
13(Note: the default package architectures are "powerpc" and "powerpc64".)
14
15TUNE_PKGARCH is defined as TUNE_PKGARCH_tune-${DEFAULTTUNE}. All
16PowerPC tunings are required to define TUNE_PKGARCH_tune-<tune>.
17
diff --git a/meta/conf/machine/include/powerpc/arch-powerpc.inc b/meta/conf/machine/include/powerpc/arch-powerpc.inc
index c5fd6b7..12909d9 100644
--- a/meta/conf/machine/include/powerpc/arch-powerpc.inc
+++ b/meta/conf/machine/include/powerpc/arch-powerpc.inc
@@ -5,6 +5,9 @@
5 5
6DEFAULTTUNE ?= "powerpc" 6DEFAULTTUNE ?= "powerpc"
7 7
8TUNE_PKGARCH = "${TUNE_PKGARCH_tune-${DEFAULTTUNE}}"
9ABIEXTENSION ?= ""
10
8TUNEVALID[m32] = "Power ELF32 standard ABI" 11TUNEVALID[m32] = "Power ELF32 standard ABI"
9TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m32", "-m32", "", d)}" 12TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m32", "-m32", "", d)}"
10TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", "m32", "powerpc", "", d)}" 13TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", "m32", "powerpc", "", d)}"
@@ -16,16 +19,14 @@ TUNEVALID[fpu-soft] = "Use software FPU."
16TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "fpu-soft", "-msoft-float", "", d)}" 19TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "fpu-soft", "-msoft-float", "", d)}"
17TARGET_FPU .= "${@bb.utils.contains("TUNE_FEATURES", "fpu-soft", "soft", "", d)}" 20TARGET_FPU .= "${@bb.utils.contains("TUNE_FEATURES", "fpu-soft", "soft", "", d)}"
18 21
19ABIEXTENSION = "${@['','spe'][d.getVar('TARGET_FPU', True) in ['ppc-efd', 'ppc-efs']]}"
20
21PPCPKGSFX_FPU = "${@['', '-nf'][d.getVar('TARGET_FPU', True) in ['fpu-soft']]}"
22TUNE_PKGARCH_append = "${PPCPKGSFX_FPU}"
23
24# Basic tune definitions 22# Basic tune definitions
25AVAILTUNES += "powerpc powerpc-nf" 23AVAILTUNES += "powerpc powerpc-nf"
26TUNE_FEATURES_tune-powerpc-nf ?= "m32 fpu-soft" 24TUNE_FEATURES_tune-powerpc-nf = "m32 fpu-soft"
27BASE_LIB_tune-powerpc-nf = "lib" 25BASE_LIB_tune-powerpc-nf = "lib"
26TUNE_PKGARCH_tune-powerpc-nf = "powerpc-nf"
28PACKAGE_EXTRA_ARCHS_tune-powerpc-nf = "powerpc-nf" 27PACKAGE_EXTRA_ARCHS_tune-powerpc-nf = "powerpc-nf"
29TUNE_FEATURES_tune-powerpc ?= "m32 fpu-hard" 28
29TUNE_FEATURES_tune-powerpc = "m32 fpu-hard"
30BASE_LIB_tune-powerpc = "lib" 30BASE_LIB_tune-powerpc = "lib"
31TUNE_PKGARCH_tune-powerpc = "powerpc"
31PACKAGE_EXTRA_ARCHS_tune-powerpc = "powerpc" 32PACKAGE_EXTRA_ARCHS_tune-powerpc = "powerpc"
diff --git a/meta/conf/machine/include/powerpc/arch-powerpc64.inc b/meta/conf/machine/include/powerpc/arch-powerpc64.inc
index 48cd08e..a5e9755 100644
--- a/meta/conf/machine/include/powerpc/arch-powerpc64.inc
+++ b/meta/conf/machine/include/powerpc/arch-powerpc64.inc
@@ -10,4 +10,5 @@ TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", [ "m64" ], "powerpc64", "",
10AVAILTUNES += "powerpc64" 10AVAILTUNES += "powerpc64"
11TUNE_FEATURES_tune-powerpc64 ?= "m64 fpu-hard" 11TUNE_FEATURES_tune-powerpc64 ?= "m64 fpu-hard"
12BASE_LIB_tune-powerpc64 = "lib64" 12BASE_LIB_tune-powerpc64 = "lib64"
13TUNE_PKGARCH_tune-powerpc64 = "powerpc64"
13PACKAGE_EXTRA_ARCHS_tune-powerpc64 = "powerpc64" 14PACKAGE_EXTRA_ARCHS_tune-powerpc64 = "powerpc64"
diff --git a/meta/conf/machine/include/tune-ppc603e.inc b/meta/conf/machine/include/tune-ppc603e.inc
index 02cebe7..6557c1d 100644
--- a/meta/conf/machine/include/tune-ppc603e.inc
+++ b/meta/conf/machine/include/tune-ppc603e.inc
@@ -4,10 +4,10 @@ require conf/machine/include/powerpc/arch-powerpc.inc
4 4
5TUNEVALID[ppc603e] = "Enable ppc603e specific processor optimizations" 5TUNEVALID[ppc603e] = "Enable ppc603e specific processor optimizations"
6TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ppc603e", "-mcpu=603e", "", d)}" 6TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ppc603e", "-mcpu=603e", "", d)}"
7TUNE_PKGARCH_tune-ppc603e = "ppc603e"
8 7
9AVAILTUNES = "ppc603e" 8AVAILTUNES += "ppc603e"
10TUNE_FEATURES_tune-ppc603e = "m32 fpu-hard ppc603e" 9TUNE_FEATURES_tune-ppc603e = "m32 fpu-hard ppc603e"
10TUNE_PKGARCH_tune-ppc603e = "ppc603e"
11PACKAGE_EXTRA_ARCHS_tune-ppc603e = "${PACKAGE_EXTRA_ARCHS_tune-powerpc} ppc603e" 11PACKAGE_EXTRA_ARCHS_tune-ppc603e = "${PACKAGE_EXTRA_ARCHS_tune-powerpc} ppc603e"
12 12
13# glibc configure options to get 603e specific library (for sqrt) 13# glibc configure options to get 603e specific library (for sqrt)
diff --git a/meta/conf/machine/include/tune-ppce300c2.inc b/meta/conf/machine/include/tune-ppce300c2.inc
index 27ef4a8..aae8ac0 100644
--- a/meta/conf/machine/include/tune-ppce300c2.inc
+++ b/meta/conf/machine/include/tune-ppce300c2.inc
@@ -4,8 +4,8 @@ require conf/machine/include/powerpc/arch-powerpc.inc
4 4
5TUNEVALID[ppce300c2] = "Enable ppce300c2 specific processor optimizations" 5TUNEVALID[ppce300c2] = "Enable ppce300c2 specific processor optimizations"
6TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ppce300c2", "-mcpu=e300c2", "", d)}" 6TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ppce300c2", "-mcpu=e300c2", "", d)}"
7TUNE_PKGARCH_tune-ppce300c2 = "ppce300c2"
8 7
9AVAILTUNES += "ppce300c2" 8AVAILTUNES += "ppce300c2"
10TUNE_FEATURES_tune-ppce300c2 = "m32 fpu-soft ppce300c2" 9TUNE_FEATURES_tune-ppce300c2 = "m32 fpu-soft ppce300c2"
10TUNE_PKGARCH_tune-ppce300c2 = "ppce300c2"
11PACKAGE_EXTRA_ARCHS_tune-ppce300c2 = "${PACKAGE_EXTRA_ARCHS_tune-powerpc-nf} ppce300c2" 11PACKAGE_EXTRA_ARCHS_tune-ppce300c2 = "${PACKAGE_EXTRA_ARCHS_tune-powerpc-nf} ppce300c2"
diff --git a/meta/conf/machine/include/tune-ppce500.inc b/meta/conf/machine/include/tune-ppce500.inc
index feb1967..be43722 100644
--- a/meta/conf/machine/include/tune-ppce500.inc
+++ b/meta/conf/machine/include/tune-ppce500.inc
@@ -4,13 +4,17 @@ require conf/machine/include/powerpc/arch-powerpc.inc
4 4
5TUNEVALID[ppce500] = "Enable ppce500 specific processor optimizations" 5TUNEVALID[ppce500] = "Enable ppce500 specific processor optimizations"
6TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ppce500", "-mcpu=8540", "", d)}" 6TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ppce500", "-mcpu=8540", "", d)}"
7TUNE_PKGARCH_tune-ppce500 = "ppce500"
8 7
9TUNEVALID[spe] = "Enable SPE ABI extensions" 8TUNEVALID[spe] = "Enable SPE ABI extensions"
10TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "spe", "-mabi=spe -mspe -mfloat-gprs=double", "", d)}" 9TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", [ "ppce500", "spe" ], "-mabi=spe -mspe -mfloat-gprs=single", "", d)}"
10TARGET_FPU .= "${@bb.utils.contains("TUNE_FEATURES", [ "ppce500" , "spe" ], "ppc-efs", "", d)}"
11 11
12TARGET_FPU = "ppc-efs" 12# spe is defined potentially in two places, so we want to be sure it will
13# only write spe once to the ABIEXTENSIONS field.
14SPEABIEXTENSION = "${@bb.utils.contains("TUNE_FEATURES", "spe", "spe", "", d)}"
15ABIEXTENSION .= "${SPEABIEXTENSION}"
13 16
14AVAILTUNES += "ppce500" 17AVAILTUNES += "ppce500"
15TUNE_FEATURES_tune-ppce500 = "m32 spe ppce500" 18TUNE_FEATURES_tune-ppce500 = "m32 spe ppce500"
19TUNE_PKGARCH_tune-ppce500 = "ppce500"
16PACKAGE_EXTRA_ARCHS_tune-ppce500 = "ppce500" 20PACKAGE_EXTRA_ARCHS_tune-ppce500 = "ppce500"
diff --git a/meta/conf/machine/include/tune-ppce500mc.inc b/meta/conf/machine/include/tune-ppce500mc.inc
index 51e6f53..0e09384 100644
--- a/meta/conf/machine/include/tune-ppce500mc.inc
+++ b/meta/conf/machine/include/tune-ppce500mc.inc
@@ -4,10 +4,10 @@ require conf/machine/include/powerpc/arch-powerpc.inc
4 4
5TUNEVALID[ppce500mc] = "Enable ppce500mc specific processor optimizations" 5TUNEVALID[ppce500mc] = "Enable ppce500mc specific processor optimizations"
6TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ppce500mc", "-mcpu=e500mc", "", d)}" 6TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ppce500mc", "-mcpu=e500mc", "", d)}"
7TUNE_PKGARCH_tune-ppce500mc = "ppce500mc"
8 7
9AVAILTUNES = "ppce500mc" 8AVAILTUNES += "ppce500mc"
10TUNE_FEATURES_tune-ppce500mc = "m32 fpu-hard ppce500mc" 9TUNE_FEATURES_tune-ppce500mc = "m32 fpu-hard ppce500mc"
10TUNE_PKGARCH_tune-ppce500mc = "ppce500mc"
11PACKAGE_EXTRA_ARCHS_tune-ppce500mc = "${PACKAGE_EXTRA_ARCHS_tune-powerpc} ppce500mc" 11PACKAGE_EXTRA_ARCHS_tune-ppce500mc = "${PACKAGE_EXTRA_ARCHS_tune-powerpc} ppce500mc"
12 12
13# glibc configure options to get e500mc specific library (for sqrt) 13# glibc configure options to get e500mc specific library (for sqrt)
diff --git a/meta/conf/machine/include/tune-ppce500v2.inc b/meta/conf/machine/include/tune-ppce500v2.inc
index f0158d0..3fe47da 100644
--- a/meta/conf/machine/include/tune-ppce500v2.inc
+++ b/meta/conf/machine/include/tune-ppce500v2.inc
@@ -4,13 +4,17 @@ require conf/machine/include/powerpc/arch-powerpc.inc
4 4
5TUNEVALID[ppce500v2] = "Enable ppce500v2 specific processor optimizations" 5TUNEVALID[ppce500v2] = "Enable ppce500v2 specific processor optimizations"
6TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ppce500v2", "-mcpu=8548", "", d)}" 6TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ppce500v2", "-mcpu=8548", "", d)}"
7TUNE_PKGARCH_tune-ppce500v2 = "ppce500v2"
8 7
9TUNEVALID[spe] = "Enable SPE ABI extensions" 8TUNEVALID[spe] = "Enable SPE ABI extensions"
10TUNE_CCARGS += '${@bb.utils.contains("TUNE_FEATURES", "spe", "-mabi=spe -mspe -mfloat-gprs=double", "", d)}' 9TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", [ "ppce500v2", "spe" ], "-mabi=spe -mspe -mfloat-gprs=double", "", d)}"
10TARGET_FPU .= "${@bb.utils.contains("TUNE_FEATURES", [ "ppce500v2" , "spe" ], "ppc-efd", "", d)}"
11 11
12TARGET_FPU = "ppc-efd" 12# spe is defined potentially in two places, so we want to be sure it will
13# only write spe once to the ABIEXTENSIONS field.
14SPEABIEXTENSION = "${@bb.utils.contains("TUNE_FEATURES", "spe", "spe", "", d)}"
15ABIEXTENSION .= "${SPEABIEXTENSION}"
13 16
14AVAILTUNES += "ppce500v2" 17AVAILTUNES += "ppce500v2"
15TUNE_FEATURES_tune-ppce500v2 = "m32 spe ppce500v2" 18TUNE_FEATURES_tune-ppce500v2 = "m32 spe ppce500v2"
19TUNE_PKGARCH_tune-ppce500v2 = "ppce500v2"
16PACKAGE_EXTRA_ARCHS_tune-ppce500v2 = "ppce500v2" 20PACKAGE_EXTRA_ARCHS_tune-ppce500v2 = "ppce500v2"
diff --git a/meta/conf/machine/include/tune-ppce5500.inc b/meta/conf/machine/include/tune-ppce5500.inc
index fe8d79d..8ab0fc5 100644
--- a/meta/conf/machine/include/tune-ppce5500.inc
+++ b/meta/conf/machine/include/tune-ppce5500.inc
@@ -7,14 +7,14 @@ TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "e5500", "-mcpu=e5500", ""
7 7
8AVAILTUNES += "ppce5500 ppc64e5500" 8AVAILTUNES += "ppce5500 ppc64e5500"
9TUNE_FEATURES_tune-ppce5500 = "m32 fpu-hard e5500" 9TUNE_FEATURES_tune-ppce5500 = "m32 fpu-hard e5500"
10PACKAGE_EXTRA_ARCHS_tune-ppce5500 = "${PACKAGE_EXTRA_ARCHS_tune-powerpc} ppce5500"
11BASE_LIB_tune-ppce5500 = "lib" 10BASE_LIB_tune-ppce5500 = "lib"
12TUNE_PKGARCH_tune-ppce5500 = "ppce5500" 11TUNE_PKGARCH_tune-ppce5500 = "ppce5500"
12PACKAGE_EXTRA_ARCHS_tune-ppce5500 = "${PACKAGE_EXTRA_ARCHS_tune-powerpc} ppce5500"
13 13
14TUNE_FEATURES_tune-ppc64e5500 = "m64 fpu-hard e5500" 14TUNE_FEATURES_tune-ppc64e5500 = "m64 fpu-hard e5500"
15PACKAGE_EXTRA_ARCHS_tune-ppc64e5500 = "${PACKAGE_EXTRA_ARCHS_tune-powerpc64} ppc64e5500"
16BASE_LIB_tune-ppc64e5500 = "lib64" 15BASE_LIB_tune-ppc64e5500 = "lib64"
17TUNE_PKGARCH_tune-ppc64e5500 = "ppc64e5500" 16TUNE_PKGARCH_tune-ppc64e5500 = "ppc64e5500"
17PACKAGE_EXTRA_ARCHS_tune-ppc64e5500 = "${PACKAGE_EXTRA_ARCHS_tune-powerpc64} ppc64e5500"
18 18
19# glibc configure options to get e5500 specific library (for sqrt) 19# glibc configure options to get e5500 specific library (for sqrt)
20GLIBC_EXTRA_OECONF += "${@bb.utils.contains("TUNE_FEATURES", "e5500", "--with-cpu=e5500", "", d)}" 20GLIBC_EXTRA_OECONF += "${@bb.utils.contains("TUNE_FEATURES", "e5500", "--with-cpu=e5500", "", d)}"