summaryrefslogtreecommitdiffstats
path: root/meta/conf/machine/include/powerpc
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2012-03-30 14:31:20 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-04 17:17:55 +0100
commit78e1a7c0d1df6d649b398da778cab173cbaddef9 (patch)
tree2074b9916a1a84250ef69c71eb957f3453b98345 /meta/conf/machine/include/powerpc
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/machine/include/powerpc')
-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
3 files changed, 26 insertions, 7 deletions
diff --git a/meta/conf/machine/include/powerpc/README b/meta/conf/machine/include/powerpc/README
new file mode 100644
index 0000000000..e87fb5082c
--- /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 c5fd6b7173..12909d9651 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 48cd08e601..a5e975574e 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"