| Submitter | Matthew McClintock |
|---|---|
| Date | March 6, 2012, 11:20 p.m. |
| Message ID | <1331076055-15262-1-git-send-email-msm@freescale.com> |
| Download | mbox | patch |
| Permalink | /patch/22847/ |
| State | New |
| Headers | show |
Comments
> We can use the default value for TUNE_PKGARCH, and now we > just append "-nf" if TARGET_FPU is fpu-soft > > Signed-off-by: Matthew McClintock <msm@freescale.com> > --- > meta/conf/machine/include/powerpc/arch-powerpc.inc | 6 ++---- > 1 files changed, 2 insertions(+), 4 deletions(-) > > diff --git > a/meta/conf/machine/include/powerpc/arch-powerpc.inc > b/meta/conf/machine/include/powerpc/arch-powerpc.inc > index c9b2829..abd72ed 100644 > --- a/meta/conf/machine/include/powerpc/arch-powerpc.inc > +++ b/meta/conf/machine/include/powerpc/arch-powerpc.inc > @@ -18,10 +18,8 @@ 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-hard" , "", "-nf", d)}" > - > -PPCPKGARCH = "${TUNE_ARCH}${PPCPKGSFX_FPU}" > -TUNE_PKGARCH ?= "${PPCPKGARCH}" > +PPCPKGSFX_FPU = "${@['', > '-nf'][bb.data.getVar('TARGET_FPU',d,1) in ['fpu-soft']]}" > +TUNE_PKGARCH_append = "${PPCPKGSFX_FPU}" > > # Basic tune definitions > AVAILTUNES += "powerpc powerpc-nf" This fixes my issues with e500v2 cores. Tested-by: Dirk Eibach <eibach@gdsys.de>
On Tue, 2012-03-06 at 17:20 -0600, Matthew McClintock wrote: > We can use the default value for TUNE_PKGARCH, and now we just > append "-nf" if TARGET_FPU is fpu-soft > > Signed-off-by: Matthew McClintock <msm@freescale.com> > --- > meta/conf/machine/include/powerpc/arch-powerpc.inc | 6 ++---- > 1 files changed, 2 insertions(+), 4 deletions(-) > > diff --git a/meta/conf/machine/include/powerpc/arch-powerpc.inc b/meta/conf/machine/include/powerpc/arch-powerpc.inc > index c9b2829..abd72ed 100644 > --- a/meta/conf/machine/include/powerpc/arch-powerpc.inc > +++ b/meta/conf/machine/include/powerpc/arch-powerpc.inc > @@ -18,10 +18,8 @@ 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-hard" , "", "-nf", d)}" > - > -PPCPKGARCH = "${TUNE_ARCH}${PPCPKGSFX_FPU}" > -TUNE_PKGARCH ?= "${PPCPKGARCH}" > +PPCPKGSFX_FPU = "${@['', '-nf'][bb.data.getVar('TARGET_FPU',d,1) in ['fpu-soft']]}" bb.data is deprecated and we should translate: bb.data.getVar('TARGET_FPU',d,1) -> d.getVar('TARGET_FPU', True) Cheers, Richard
On Tue, 2012-03-06 at 17:20 -0600, Matthew McClintock wrote: > We can use the default value for TUNE_PKGARCH, and now we just > append "-nf" if TARGET_FPU is fpu-soft > > Signed-off-by: Matthew McClintock <msm@freescale.com> > --- > meta/conf/machine/include/powerpc/arch-powerpc.inc | 6 ++---- > 1 files changed, 2 insertions(+), 4 deletions(-) > > diff --git a/meta/conf/machine/include/powerpc/arch-powerpc.inc b/meta/conf/machine/include/powerpc/arch-powerpc.inc > index c9b2829..abd72ed 100644 > --- a/meta/conf/machine/include/powerpc/arch-powerpc.inc > +++ b/meta/conf/machine/include/powerpc/arch-powerpc.inc > @@ -18,10 +18,8 @@ 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-hard" , "", "-nf", d)}" > - > -PPCPKGARCH = "${TUNE_ARCH}${PPCPKGSFX_FPU}" > -TUNE_PKGARCH ?= "${PPCPKGARCH}" > +PPCPKGSFX_FPU = "${@['', '-nf'][bb.data.getVar('TARGET_FPU',d,1) in ['fpu-soft']]}" > +TUNE_PKGARCH_append = "${PPCPKGSFX_FPU}" Can we please do d.getVar(xxx, True) and not bb.data and ,1 :) Cheers, Richard
On 3/8/12 2:15 PM, Richard Purdie wrote: > On Tue, 2012-03-06 at 17:20 -0600, Matthew McClintock wrote: >> We can use the default value for TUNE_PKGARCH, and now we just >> append "-nf" if TARGET_FPU is fpu-soft >> >> Signed-off-by: Matthew McClintock<msm@freescale.com> >> --- >> meta/conf/machine/include/powerpc/arch-powerpc.inc | 6 ++---- >> 1 files changed, 2 insertions(+), 4 deletions(-) >> >> diff --git a/meta/conf/machine/include/powerpc/arch-powerpc.inc b/meta/conf/machine/include/powerpc/arch-powerpc.inc >> index c9b2829..abd72ed 100644 >> --- a/meta/conf/machine/include/powerpc/arch-powerpc.inc >> +++ b/meta/conf/machine/include/powerpc/arch-powerpc.inc >> @@ -18,10 +18,8 @@ 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-hard" , "", "-nf", d)}" >> - >> -PPCPKGARCH = "${TUNE_ARCH}${PPCPKGSFX_FPU}" >> -TUNE_PKGARCH ?= "${PPCPKGARCH}" >> +PPCPKGSFX_FPU = "${@['', '-nf'][bb.data.getVar('TARGET_FPU',d,1) in ['fpu-soft']]}" >> +TUNE_PKGARCH_append = "${PPCPKGSFX_FPU}" > > Can we please do d.getVar(xxx, True) and not bb.data and ,1 :) This was originally done with a check for fpu-hard and not fpu-soft to ensure that fpu-soft became the default value when one or the other wasn't set. I don't know if it really matters which is used, but that is why it was done that way. --Mark > Cheers, > > Richard > > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
On Fri, Mar 9, 2012 at 10:45 AM, Mark Hatle <mark.hatle@windriver.com> wrote: > On 3/8/12 2:15 PM, Richard Purdie wrote: >> >> On Tue, 2012-03-06 at 17:20 -0600, Matthew McClintock wrote: >>> >>> We can use the default value for TUNE_PKGARCH, and now we just >>> append "-nf" if TARGET_FPU is fpu-soft >>> >>> Signed-off-by: Matthew McClintock<msm@freescale.com> >>> --- >>> meta/conf/machine/include/powerpc/arch-powerpc.inc | 6 ++---- >>> 1 files changed, 2 insertions(+), 4 deletions(-) >>> >>> diff --git a/meta/conf/machine/include/powerpc/arch-powerpc.inc >>> b/meta/conf/machine/include/powerpc/arch-powerpc.inc >>> index c9b2829..abd72ed 100644 >>> --- a/meta/conf/machine/include/powerpc/arch-powerpc.inc >>> +++ b/meta/conf/machine/include/powerpc/arch-powerpc.inc >>> @@ -18,10 +18,8 @@ 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-hard" , "", >>> "-nf", d)}" >>> - >>> -PPCPKGARCH = "${TUNE_ARCH}${PPCPKGSFX_FPU}" >>> -TUNE_PKGARCH ?= "${PPCPKGARCH}" >>> +PPCPKGSFX_FPU = "${@['', '-nf'][bb.data.getVar('TARGET_FPU',d,1) in >>> ['fpu-soft']]}" >>> +TUNE_PKGARCH_append = "${PPCPKGSFX_FPU}" >> >> >> Can we please do d.getVar(xxx, True) and not bb.data and ,1 :) > > > This was originally done with a check for fpu-hard and not fpu-soft to > ensure that fpu-soft became the default value when one or the other wasn't > set. > > I don't know if it really matters which is used, but that is why it was done > that way. That logic was not quite working for us - since we don't set fpu-hard, but rather ppc-efd and ppc-efs... so I had to invert this... -M
On Wed, Mar 7, 2012 at 11:41 AM, Richard Purdie <richard.purdie@linuxfoundation.org> wrote: > On Tue, 2012-03-06 at 17:20 -0600, Matthew McClintock wrote: >> We can use the default value for TUNE_PKGARCH, and now we just >> append "-nf" if TARGET_FPU is fpu-soft >> >> Signed-off-by: Matthew McClintock <msm@freescale.com> >> --- >> meta/conf/machine/include/powerpc/arch-powerpc.inc | 6 ++---- >> 1 files changed, 2 insertions(+), 4 deletions(-) >> >> diff --git a/meta/conf/machine/include/powerpc/arch-powerpc.inc b/meta/conf/machine/include/powerpc/arch-powerpc.inc >> index c9b2829..abd72ed 100644 >> --- a/meta/conf/machine/include/powerpc/arch-powerpc.inc >> +++ b/meta/conf/machine/include/powerpc/arch-powerpc.inc >> @@ -18,10 +18,8 @@ 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-hard" , "", "-nf", d)}" >> - >> -PPCPKGARCH = "${TUNE_ARCH}${PPCPKGSFX_FPU}" >> -TUNE_PKGARCH ?= "${PPCPKGARCH}" >> +PPCPKGSFX_FPU = "${@['', '-nf'][bb.data.getVar('TARGET_FPU',d,1) in ['fpu-soft']]}" > > bb.data is deprecated and we should translate: > > bb.data.getVar('TARGET_FPU',d,1) -> d.getVar('TARGET_FPU', True) I already sent a new patch here: http://patches.openembedded.org/patch/22931/ -M
Patch
diff --git a/meta/conf/machine/include/powerpc/arch-powerpc.inc b/meta/conf/machine/include/powerpc/arch-powerpc.inc index c9b2829..abd72ed 100644 --- a/meta/conf/machine/include/powerpc/arch-powerpc.inc +++ b/meta/conf/machine/include/powerpc/arch-powerpc.inc @@ -18,10 +18,8 @@ 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-hard" , "", "-nf", d)}" - -PPCPKGARCH = "${TUNE_ARCH}${PPCPKGSFX_FPU}" -TUNE_PKGARCH ?= "${PPCPKGARCH}" +PPCPKGSFX_FPU = "${@['', '-nf'][bb.data.getVar('TARGET_FPU',d,1) in ['fpu-soft']]}" +TUNE_PKGARCH_append = "${PPCPKGSFX_FPU}" # Basic tune definitions AVAILTUNES += "powerpc powerpc-nf"
We can use the default value for TUNE_PKGARCH, and now we just append "-nf" if TARGET_FPU is fpu-soft Signed-off-by: Matthew McClintock <msm@freescale.com> --- meta/conf/machine/include/powerpc/arch-powerpc.inc | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-)