From 78e1a7c0d1df6d649b398da778cab173cbaddef9 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Fri, 30 Mar 2012 14:31:20 -0500 Subject: 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-} 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 Signed-off-by: Richard Purdie --- meta/conf/machine/include/powerpc/README | 17 +++++++++++++++++ meta/conf/machine/include/powerpc/arch-powerpc.inc | 15 ++++++++------- meta/conf/machine/include/powerpc/arch-powerpc64.inc | 1 + 3 files changed, 26 insertions(+), 7 deletions(-) create mode 100644 meta/conf/machine/include/powerpc/README (limited to 'meta/conf/machine/include/powerpc') 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 @@ +2012/03/30 - Mark Hatle + - Initial revision + +There are 4 primary PowerPC ABIs. +# *) Hard/Soft Floating Point +# *) 32-bit/64-bit + +TUNE_ARCH is defined as either "powerpc" or "powerpc64" based on the m32 +or m64 feature. + +May of the PowerPC package archictures are based on legacy Linux names. +However, a general naming scheme should be similar to: ppc[64][][-nf]. +(Note: the default package architectures are "powerpc" and "powerpc64".) + +TUNE_PKGARCH is defined as TUNE_PKGARCH_tune-${DEFAULTTUNE}. All +PowerPC tunings are required to define TUNE_PKGARCH_tune-. + 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 @@ DEFAULTTUNE ?= "powerpc" +TUNE_PKGARCH = "${TUNE_PKGARCH_tune-${DEFAULTTUNE}}" +ABIEXTENSION ?= "" + TUNEVALID[m32] = "Power ELF32 standard ABI" TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m32", "-m32", "", d)}" TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", "m32", "powerpc", "", d)}" @@ -16,16 +19,14 @@ TUNEVALID[fpu-soft] = "Use software FPU." TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "fpu-soft", "-msoft-float", "", d)}" TARGET_FPU .= "${@bb.utils.contains("TUNE_FEATURES", "fpu-soft", "soft", "", d)}" -ABIEXTENSION = "${@['','spe'][d.getVar('TARGET_FPU', True) in ['ppc-efd', 'ppc-efs']]}" - -PPCPKGSFX_FPU = "${@['', '-nf'][d.getVar('TARGET_FPU', True) in ['fpu-soft']]}" -TUNE_PKGARCH_append = "${PPCPKGSFX_FPU}" - # Basic tune definitions AVAILTUNES += "powerpc powerpc-nf" -TUNE_FEATURES_tune-powerpc-nf ?= "m32 fpu-soft" +TUNE_FEATURES_tune-powerpc-nf = "m32 fpu-soft" BASE_LIB_tune-powerpc-nf = "lib" +TUNE_PKGARCH_tune-powerpc-nf = "powerpc-nf" PACKAGE_EXTRA_ARCHS_tune-powerpc-nf = "powerpc-nf" -TUNE_FEATURES_tune-powerpc ?= "m32 fpu-hard" + +TUNE_FEATURES_tune-powerpc = "m32 fpu-hard" BASE_LIB_tune-powerpc = "lib" +TUNE_PKGARCH_tune-powerpc = "powerpc" PACKAGE_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", "", AVAILTUNES += "powerpc64" TUNE_FEATURES_tune-powerpc64 ?= "m64 fpu-hard" BASE_LIB_tune-powerpc64 = "lib64" +TUNE_PKGARCH_tune-powerpc64 = "powerpc64" PACKAGE_EXTRA_ARCHS_tune-powerpc64 = "powerpc64" -- cgit v1.2.3-54-g00ecf