On Aug 2, 2011, at 2:35 PM, Saul Wold wrote: > On 08/02/2011 09:31 AM, Kumar Gala wrote: >> Add some uniformity to the naming scheme and reduce a bit of redudancy. >> >> Names are now back to: ppc603e, ppce300c2, ppce500, ppce500mc, >> ppce500v2. >> >> On 64-bit we'll have something like ppc64e5500. >> >> Signed-off-by: Kumar Gala<[email protected]> >> --- >> meta/conf/machine/include/powerpc/arch-powerpc.inc | 5 +++-- >> meta/conf/machine/include/tune-ppc603e.inc | 2 +- >> meta/conf/machine/include/tune-ppce300c2.inc | 2 +- >> meta/conf/machine/include/tune-ppce500.inc | 2 +- >> meta/conf/machine/include/tune-ppce500mc.inc | 2 +- >> meta/conf/machine/include/tune-ppce500v2.inc | 2 +- >> 6 files changed, 8 insertions(+), 7 deletions(-) >> >> diff --git a/meta/conf/machine/include/powerpc/arch-powerpc.inc >> b/meta/conf/machine/include/powerpc/arch-powerpc.inc >> index 93b1c05..a8226ea 100644 >> --- a/meta/conf/machine/include/powerpc/arch-powerpc.inc >> +++ b/meta/conf/machine/include/powerpc/arch-powerpc.inc >> @@ -3,6 +3,7 @@ >> # *) Hard Floating Point on 64-bit >> >> DEFAULTTUNE ?= "powerpc" >> +TUNE_PKGARCH ?= "ppc" >> >> TUNEVALID[m32] = "Power ELF32 standard ABI" >> TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m32", "-m32", "", >> d)}" >> @@ -12,6 +13,7 @@ TUNEVALID[m64] = "Power ELF64 standard ABI" >> TUNE_CONFLICTS[m64] = "m32 nf" >> TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "m64", "-m64", "", >> d)}" >> TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", [ "m64" ], "powerpc64", >> "", d)}" >> +TUNE_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", [ "m64" ], "64", "", >> d)}" >> >> TUNEVALID[fpu-hard] = "Use hardware FPU." >> TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "fpu-hard", >> "-mhard-float", "", d)}" >> @@ -23,8 +25,7 @@ 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 = "${@bb.utils.contains("TUNE_FEATURES", "fpu-soft", "-nf", >> "", d)}" >> - >> -TUNE_PKGARCH ?= "${TUNE_ARCH}${PPCPKGSFX_FPU}" >> +TUNE_PKGARCH .= "${PPCPKGSFX_FPU}" >> >> # Basic tune definitions >> AVAILTUNES += "powerpc powerpc-nf" >> diff --git a/meta/conf/machine/include/tune-ppc603e.inc >> b/meta/conf/machine/include/tune-ppc603e.inc >> index 7c05394..12ba425 100644 >> --- a/meta/conf/machine/include/tune-ppc603e.inc >> +++ b/meta/conf/machine/include/tune-ppc603e.inc >> @@ -4,7 +4,7 @@ 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 .= "${@bb.utils.contains("TUNE_FEATURES", "ppc603e", >> "ppc603e", "", d)}" >> +TUNE_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "ppc603e", "603e", >> "", d)}" >> >> AVAILTUNES += "ppc603e" >> TUNE_FEATURES_tune-ppc603e = "m32 fpu-hard ppc603e" >> diff --git a/meta/conf/machine/include/tune-ppce300c2.inc >> b/meta/conf/machine/include/tune-ppce300c2.inc >> index bad2611..6fe3e42 100644 >> --- a/meta/conf/machine/include/tune-ppce300c2.inc >> +++ b/meta/conf/machine/include/tune-ppce300c2.inc >> @@ -4,7 +4,7 @@ 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 = "${@bb.utils.contains("TUNE_FEATURES", "ppce300c2", >> "ppce300c2", "${TUNE_ARCH}", d)}" >> +TUNE_PKGARCH = "${@bb.utils.contains("TUNE_FEATURES", "ppce300c2", >> "e300c2", "${TUNE_ARCH}", d)}" >> >> AVAILTUNES += "ppce300c2" >> TUNE_FEATURES_tune-ppce300c2 = "m32 fpu-soft ppce300c2" >> diff --git a/meta/conf/machine/include/tune-ppce500.inc >> b/meta/conf/machine/include/tune-ppce500.inc >> index c34d631..0e850f1 100644 >> --- a/meta/conf/machine/include/tune-ppce500.inc >> +++ b/meta/conf/machine/include/tune-ppce500.inc >> @@ -4,7 +4,7 @@ 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 .= "${@bb.utils.contains("TUNE_FEATURES", "ppce500", >> "ppce500", "", d)}" >> +TUNE_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "ppce500", "e500", >> "", d)}" >> >> TUNEVALID[spe] = "Enable SPE ABI extensions" >> TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "spe", "-mabi=spe >> -mspe", "", d)}" >> diff --git a/meta/conf/machine/include/tune-ppce500mc.inc >> b/meta/conf/machine/include/tune-ppce500mc.inc >> index 73217dd..9fee226 100644 >> --- a/meta/conf/machine/include/tune-ppce500mc.inc >> +++ b/meta/conf/machine/include/tune-ppce500mc.inc >> @@ -4,7 +4,7 @@ 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 .= "${@bb.utils.contains("TUNE_FEATURES", "ppce500mc", >> "ppce500mc", "", d)}" >> +TUNE_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "ppce500mc", >> "e500mc", "", d)}" >> >> AVAILTUNES += "ppce500mc" >> TUNE_FEATURES_tune-ppce500mc = "m32 fpu-hard ppce500mc" >> diff --git a/meta/conf/machine/include/tune-ppce500v2.inc >> b/meta/conf/machine/include/tune-ppce500v2.inc >> index 819d68a..2a0451b 100644 >> --- a/meta/conf/machine/include/tune-ppce500v2.inc >> +++ b/meta/conf/machine/include/tune-ppce500v2.inc >> @@ -4,7 +4,7 @@ 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 .= "${@bb.utils.contains("TUNE_FEATURES", "ppce500v2", >> "ppce500v2", "", d)}" >> +TUNE_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "ppce500v2", >> "e500v2", "", d)}" >> >> TUNEVALID[spe] = "Enable SPE ABI extensions" >> TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "spe", "-mabi=spe >> -mspe", "", d)}" > > > I think this needs to be rebased against the recent changes. > > Sau!
I believe what is git now supercededs this patch. - k _______________________________________________ Openembedded-core mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
