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>
This commit is contained in:
parent
d328ae22b7
commit
78e1a7c0d1
|
@ -0,0 +1,17 @@
|
|||
2012/03/30 - Mark Hatle <mark.hatle@windriver.com>
|
||||
- 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][<family>][-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-<tune>.
|
||||
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -4,10 +4,10 @@ require conf/machine/include/powerpc/arch-powerpc.inc
|
|||
|
||||
TUNEVALID[ppc603e] = "Enable ppc603e specific processor optimizations"
|
||||
TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ppc603e", "-mcpu=603e", "", d)}"
|
||||
TUNE_PKGARCH_tune-ppc603e = "ppc603e"
|
||||
|
||||
AVAILTUNES = "ppc603e"
|
||||
AVAILTUNES += "ppc603e"
|
||||
TUNE_FEATURES_tune-ppc603e = "m32 fpu-hard ppc603e"
|
||||
TUNE_PKGARCH_tune-ppc603e = "ppc603e"
|
||||
PACKAGE_EXTRA_ARCHS_tune-ppc603e = "${PACKAGE_EXTRA_ARCHS_tune-powerpc} ppc603e"
|
||||
|
||||
# glibc configure options to get 603e specific library (for sqrt)
|
||||
|
|
|
@ -4,8 +4,8 @@ require conf/machine/include/powerpc/arch-powerpc.inc
|
|||
|
||||
TUNEVALID[ppce300c2] = "Enable ppce300c2 specific processor optimizations"
|
||||
TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ppce300c2", "-mcpu=e300c2", "", d)}"
|
||||
TUNE_PKGARCH_tune-ppce300c2 = "ppce300c2"
|
||||
|
||||
AVAILTUNES += "ppce300c2"
|
||||
TUNE_FEATURES_tune-ppce300c2 = "m32 fpu-soft ppce300c2"
|
||||
TUNE_PKGARCH_tune-ppce300c2 = "ppce300c2"
|
||||
PACKAGE_EXTRA_ARCHS_tune-ppce300c2 = "${PACKAGE_EXTRA_ARCHS_tune-powerpc-nf} ppce300c2"
|
||||
|
|
|
@ -4,13 +4,17 @@ require conf/machine/include/powerpc/arch-powerpc.inc
|
|||
|
||||
TUNEVALID[ppce500] = "Enable ppce500 specific processor optimizations"
|
||||
TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ppce500", "-mcpu=8540", "", d)}"
|
||||
TUNE_PKGARCH_tune-ppce500 = "ppce500"
|
||||
|
||||
TUNEVALID[spe] = "Enable SPE ABI extensions"
|
||||
TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "spe", "-mabi=spe -mspe -mfloat-gprs=double", "", d)}"
|
||||
TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", [ "ppce500", "spe" ], "-mabi=spe -mspe -mfloat-gprs=single", "", d)}"
|
||||
TARGET_FPU .= "${@bb.utils.contains("TUNE_FEATURES", [ "ppce500" , "spe" ], "ppc-efs", "", d)}"
|
||||
|
||||
TARGET_FPU = "ppc-efs"
|
||||
# spe is defined potentially in two places, so we want to be sure it will
|
||||
# only write spe once to the ABIEXTENSIONS field.
|
||||
SPEABIEXTENSION = "${@bb.utils.contains("TUNE_FEATURES", "spe", "spe", "", d)}"
|
||||
ABIEXTENSION .= "${SPEABIEXTENSION}"
|
||||
|
||||
AVAILTUNES += "ppce500"
|
||||
TUNE_FEATURES_tune-ppce500 = "m32 spe ppce500"
|
||||
TUNE_PKGARCH_tune-ppce500 = "ppce500"
|
||||
PACKAGE_EXTRA_ARCHS_tune-ppce500 = "ppce500"
|
||||
|
|
|
@ -4,10 +4,10 @@ require conf/machine/include/powerpc/arch-powerpc.inc
|
|||
|
||||
TUNEVALID[ppce500mc] = "Enable ppce500mc specific processor optimizations"
|
||||
TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ppce500mc", "-mcpu=e500mc", "", d)}"
|
||||
TUNE_PKGARCH_tune-ppce500mc = "ppce500mc"
|
||||
|
||||
AVAILTUNES = "ppce500mc"
|
||||
AVAILTUNES += "ppce500mc"
|
||||
TUNE_FEATURES_tune-ppce500mc = "m32 fpu-hard ppce500mc"
|
||||
TUNE_PKGARCH_tune-ppce500mc = "ppce500mc"
|
||||
PACKAGE_EXTRA_ARCHS_tune-ppce500mc = "${PACKAGE_EXTRA_ARCHS_tune-powerpc} ppce500mc"
|
||||
|
||||
# glibc configure options to get e500mc specific library (for sqrt)
|
||||
|
|
|
@ -4,13 +4,17 @@ require conf/machine/include/powerpc/arch-powerpc.inc
|
|||
|
||||
TUNEVALID[ppce500v2] = "Enable ppce500v2 specific processor optimizations"
|
||||
TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ppce500v2", "-mcpu=8548", "", d)}"
|
||||
TUNE_PKGARCH_tune-ppce500v2 = "ppce500v2"
|
||||
|
||||
TUNEVALID[spe] = "Enable SPE ABI extensions"
|
||||
TUNE_CCARGS += '${@bb.utils.contains("TUNE_FEATURES", "spe", "-mabi=spe -mspe -mfloat-gprs=double", "", d)}'
|
||||
TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", [ "ppce500v2", "spe" ], "-mabi=spe -mspe -mfloat-gprs=double", "", d)}"
|
||||
TARGET_FPU .= "${@bb.utils.contains("TUNE_FEATURES", [ "ppce500v2" , "spe" ], "ppc-efd", "", d)}"
|
||||
|
||||
TARGET_FPU = "ppc-efd"
|
||||
# spe is defined potentially in two places, so we want to be sure it will
|
||||
# only write spe once to the ABIEXTENSIONS field.
|
||||
SPEABIEXTENSION = "${@bb.utils.contains("TUNE_FEATURES", "spe", "spe", "", d)}"
|
||||
ABIEXTENSION .= "${SPEABIEXTENSION}"
|
||||
|
||||
AVAILTUNES += "ppce500v2"
|
||||
TUNE_FEATURES_tune-ppce500v2 = "m32 spe ppce500v2"
|
||||
TUNE_PKGARCH_tune-ppce500v2 = "ppce500v2"
|
||||
PACKAGE_EXTRA_ARCHS_tune-ppce500v2 = "ppce500v2"
|
||||
|
|
|
@ -7,14 +7,14 @@ TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "e5500", "-mcpu=e5500", ""
|
|||
|
||||
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"
|
||||
PACKAGE_EXTRA_ARCHS_tune-ppce5500 = "${PACKAGE_EXTRA_ARCHS_tune-powerpc} 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"
|
||||
PACKAGE_EXTRA_ARCHS_tune-ppc64e5500 = "${PACKAGE_EXTRA_ARCHS_tune-powerpc64} ppc64e5500"
|
||||
|
||||
# glibc configure options to get e5500 specific library (for sqrt)
|
||||
GLIBC_EXTRA_OECONF += "${@bb.utils.contains("TUNE_FEATURES", "e5500", "--with-cpu=e5500", "", d)}"
|
||||
|
|
Loading…
Reference in New Issue