* [PATCH 1/2] microblaze tune: Correct two minor issues with the microblaze tune
@ 2020-01-31 22:07 Mark Hatle
2020-01-31 22:07 ` [PATCH 2/2] populate_sdk_base: if the SDKIMAGE_FEATURES changes, refresh the SDK Mark Hatle
2020-02-01 4:49 ` [PATCH 1/2] microblaze tune: Correct two minor issues with the microblaze tune Nathan Rossi
0 siblings, 2 replies; 5+ messages in thread
From: Mark Hatle @ 2020-01-31 22:07 UTC (permalink / raw)
To: openembedded-core
From: Mark Hatle <mark.hatle@xilinx.com>
TUNE_ARCH - microblazeeb is not a valid architecture, microblaze is big
endian, microblazeel is the little endian version.
Version arguments:
If a version feature is not defined, then we don't want to set either
TUNE_CCARGS or MBPKGARCH_VERSION.
Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
---
meta/conf/machine/include/microblaze/arch-microblaze.inc | 2 +-
.../include/microblaze/feature-microblaze-versions.inc | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/conf/machine/include/microblaze/arch-microblaze.inc b/meta/conf/machine/include/microblaze/arch-microblaze.inc
index eab7171cb2..265898b6b6 100644
--- a/meta/conf/machine/include/microblaze/arch-microblaze.inc
+++ b/meta/conf/machine/include/microblaze/arch-microblaze.inc
@@ -46,7 +46,7 @@ require conf/machine/include/microblaze/feature-microblaze-versions.inc
require conf/machine/include/microblaze/feature-microblaze-math.inc
# Architecture name, either 'microblazeeb' or 'microblazeel' depending on endianess
-TUNE_ARCH = "microblaze${@bb.utils.contains("TUNE_FEATURES", "bigendian", "eb", "el", d)}"
+TUNE_ARCH = "microblaze${@bb.utils.contains("TUNE_FEATURES", "bigendian", "", "el", d)}"
# Package Architecture formatting
TUNE_PKGARCH = "microblaze${MBPKGARCH_ENDIAN}${MBPKGARCH_VERSION}${MBPKGARCH_TUNE}${MBPKGARCH_MATH}"
diff --git a/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc b/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc
index 3221e2aab7..003fde3e07 100644
--- a/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc
+++ b/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc
@@ -64,6 +64,6 @@ TUNECONFLICTS[v10.0] = "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.1 v9.2 v9.3
TUNECONFLICTS[v11.0] = "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.1 v9.2 v9.3 v9.4 v9.5 v9.6 v10.0"
# Version flags
-TUNE_CCARGS += "-mcpu=${@microblaze_current_version(d, True)}"
-MBPKGARCH_VERSION = "-${@microblaze_current_version(d)}"
+TUNE_CCARGS += "${@'-mcpu=${@microblaze_current_version(d, True)' if microblaze_current_version(d, True) != '' else ''}"
+MBPKGARCH_VERSION = "${@'-${@microblaze_current_version(d, True)' if microblaze_current_version(d, True) != '' else ''}"
--
2.17.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] populate_sdk_base: if the SDKIMAGE_FEATURES changes, refresh the SDK
2020-01-31 22:07 [PATCH 1/2] microblaze tune: Correct two minor issues with the microblaze tune Mark Hatle
@ 2020-01-31 22:07 ` Mark Hatle
2020-02-01 4:49 ` [PATCH 1/2] microblaze tune: Correct two minor issues with the microblaze tune Nathan Rossi
1 sibling, 0 replies; 5+ messages in thread
From: Mark Hatle @ 2020-01-31 22:07 UTC (permalink / raw)
To: openembedded-core
Since the features are processed by a python fragment, we need to explicitly
list the variables that should affect the resulting hash, and thus sstate
re-use.
Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
---
meta/classes/populate_sdk_base.bbclass | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass
index d03465b6fc..3248bb01c3 100644
--- a/meta/classes/populate_sdk_base.bbclass
+++ b/meta/classes/populate_sdk_base.bbclass
@@ -21,6 +21,7 @@ def complementary_globs(featurevar, d):
SDKIMAGE_FEATURES ??= "dev-pkgs dbg-pkgs src-pkgs ${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation', 'doc-pkgs', '', d)}"
SDKIMAGE_INSTALL_COMPLEMENTARY = '${@complementary_globs("SDKIMAGE_FEATURES", d)}'
+SDKIMAGE_INSTALL_COMPLEMENTARY[vardeps] += "SDKIMAGE_FEATURES"
PACKAGE_ARCHS_append_task-populate-sdk = " sdk-provides-dummy-target"
SDK_PACKAGE_ARCHS += "sdk-provides-dummy-${SDKPKGSUFFIX}"
--
2.17.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] microblaze tune: Correct two minor issues with the microblaze tune
2020-01-31 22:07 [PATCH 1/2] microblaze tune: Correct two minor issues with the microblaze tune Mark Hatle
2020-01-31 22:07 ` [PATCH 2/2] populate_sdk_base: if the SDKIMAGE_FEATURES changes, refresh the SDK Mark Hatle
@ 2020-02-01 4:49 ` Nathan Rossi
2020-02-03 18:55 ` Mark Hatle
1 sibling, 1 reply; 5+ messages in thread
From: Nathan Rossi @ 2020-02-01 4:49 UTC (permalink / raw)
To: Mark Hatle; +Cc: openembedded-core
On Sat, 1 Feb 2020 at 08:13, Mark Hatle <mark.hatle@kernel.crashing.org> wrote:
>
> From: Mark Hatle <mark.hatle@xilinx.com>
>
> TUNE_ARCH - microblazeeb is not a valid architecture, microblaze is big
> endian, microblazeel is the little endian version.
>
> Version arguments:
> If a version feature is not defined, then we don't want to set either
> TUNE_CCARGS or MBPKGARCH_VERSION.
>
> Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
> Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
> ---
> meta/conf/machine/include/microblaze/arch-microblaze.inc | 2 +-
> .../include/microblaze/feature-microblaze-versions.inc | 4 ++--
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/meta/conf/machine/include/microblaze/arch-microblaze.inc b/meta/conf/machine/include/microblaze/arch-microblaze.inc
> index eab7171cb2..265898b6b6 100644
> --- a/meta/conf/machine/include/microblaze/arch-microblaze.inc
> +++ b/meta/conf/machine/include/microblaze/arch-microblaze.inc
> @@ -46,7 +46,7 @@ require conf/machine/include/microblaze/feature-microblaze-versions.inc
> require conf/machine/include/microblaze/feature-microblaze-math.inc
>
> # Architecture name, either 'microblazeeb' or 'microblazeel' depending on endianess
Worth updating the comment at the same time.
> -TUNE_ARCH = "microblaze${@bb.utils.contains("TUNE_FEATURES", "bigendian", "eb", "el", d)}"
> +TUNE_ARCH = "microblaze${@bb.utils.contains("TUNE_FEATURES", "bigendian", "", "el", d)}"
This change will break some things in oe-core (and probably
meta-xilinx too). They should be updated at the same time.
Might also be worth removing the microblazeeb references in siteinfo,
and elf.py. Since they were added to support this.
Regards,
Nathan
>
> # Package Architecture formatting
> TUNE_PKGARCH = "microblaze${MBPKGARCH_ENDIAN}${MBPKGARCH_VERSION}${MBPKGARCH_TUNE}${MBPKGARCH_MATH}"
> diff --git a/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc b/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc
> index 3221e2aab7..003fde3e07 100644
> --- a/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc
> +++ b/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc
> @@ -64,6 +64,6 @@ TUNECONFLICTS[v10.0] = "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.1 v9.2 v9.3
> TUNECONFLICTS[v11.0] = "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.1 v9.2 v9.3 v9.4 v9.5 v9.6 v10.0"
>
> # Version flags
> -TUNE_CCARGS += "-mcpu=${@microblaze_current_version(d, True)}"
> -MBPKGARCH_VERSION = "-${@microblaze_current_version(d)}"
> +TUNE_CCARGS += "${@'-mcpu=${@microblaze_current_version(d, True)' if microblaze_current_version(d, True) != '' else ''}"
> +MBPKGARCH_VERSION = "${@'-${@microblaze_current_version(d, True)' if microblaze_current_version(d, True) != '' else ''}"
>
> --
> 2.17.1
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] microblaze tune: Correct two minor issues with the microblaze tune
2020-02-01 4:49 ` [PATCH 1/2] microblaze tune: Correct two minor issues with the microblaze tune Nathan Rossi
@ 2020-02-03 18:55 ` Mark Hatle
2020-02-04 8:16 ` Nathan Rossi
0 siblings, 1 reply; 5+ messages in thread
From: Mark Hatle @ 2020-02-03 18:55 UTC (permalink / raw)
To: Nathan Rossi; +Cc: openembedded-core
On 1/31/20 10:49 PM, Nathan Rossi wrote:
> On Sat, 1 Feb 2020 at 08:13, Mark Hatle <mark.hatle@kernel.crashing.org> wrote:
>>
>> From: Mark Hatle <mark.hatle@xilinx.com>
>>
>> TUNE_ARCH - microblazeeb is not a valid architecture, microblaze is big
>> endian, microblazeel is the little endian version.
>>
>> Version arguments:
>> If a version feature is not defined, then we don't want to set either
>> TUNE_CCARGS or MBPKGARCH_VERSION.
>>
>> Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
>> Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
>> ---
>> meta/conf/machine/include/microblaze/arch-microblaze.inc | 2 +-
>> .../include/microblaze/feature-microblaze-versions.inc | 4 ++--
>> 2 files changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/meta/conf/machine/include/microblaze/arch-microblaze.inc b/meta/conf/machine/include/microblaze/arch-microblaze.inc
>> index eab7171cb2..265898b6b6 100644
>> --- a/meta/conf/machine/include/microblaze/arch-microblaze.inc
>> +++ b/meta/conf/machine/include/microblaze/arch-microblaze.inc
>> @@ -46,7 +46,7 @@ require conf/machine/include/microblaze/feature-microblaze-versions.inc
>> require conf/machine/include/microblaze/feature-microblaze-math.inc
>>
>> # Architecture name, either 'microblazeeb' or 'microblazeel' depending on endianess
>
> Worth updating the comment at the same time.
>
>> -TUNE_ARCH = "microblaze${@bb.utils.contains("TUNE_FEATURES", "bigendian", "eb", "el", d)}"
>> +TUNE_ARCH = "microblaze${@bb.utils.contains("TUNE_FEATURES", "bigendian", "", "el", d)}"
>
> This change will break some things in oe-core (and probably
> meta-xilinx too). They should be updated at the same time.
Do you have an example of what? Cause without this, all autoconf invocation of
big endian failed for me due to invalid architecture.
> Might also be worth removing the microblazeeb references in siteinfo,
> and elf.py. Since they were added to support this.
I looked at these and left them "just in case", as they didn't seem to conflict
with anything that I saw.
--Mark
> Regards,
> Nathan
>
>>
>> # Package Architecture formatting
>> TUNE_PKGARCH = "microblaze${MBPKGARCH_ENDIAN}${MBPKGARCH_VERSION}${MBPKGARCH_TUNE}${MBPKGARCH_MATH}"
>> diff --git a/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc b/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc
>> index 3221e2aab7..003fde3e07 100644
>> --- a/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc
>> +++ b/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc
>> @@ -64,6 +64,6 @@ TUNECONFLICTS[v10.0] = "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.1 v9.2 v9.3
>> TUNECONFLICTS[v11.0] = "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.1 v9.2 v9.3 v9.4 v9.5 v9.6 v10.0"
>>
>> # Version flags
>> -TUNE_CCARGS += "-mcpu=${@microblaze_current_version(d, True)}"
>> -MBPKGARCH_VERSION = "-${@microblaze_current_version(d)}"
>> +TUNE_CCARGS += "${@'-mcpu=${@microblaze_current_version(d, True)' if microblaze_current_version(d, True) != '' else ''}"
>> +MBPKGARCH_VERSION = "${@'-${@microblaze_current_version(d, True)' if microblaze_current_version(d, True) != '' else ''}"
>>
>> --
>> 2.17.1
>>
>> --
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] microblaze tune: Correct two minor issues with the microblaze tune
2020-02-03 18:55 ` Mark Hatle
@ 2020-02-04 8:16 ` Nathan Rossi
0 siblings, 0 replies; 5+ messages in thread
From: Nathan Rossi @ 2020-02-04 8:16 UTC (permalink / raw)
To: Mark Hatle; +Cc: openembedded-core
On Tue, 4 Feb 2020 at 04:55, Mark Hatle <mark.hatle@kernel.crashing.org> wrote:
>
>
>
> On 1/31/20 10:49 PM, Nathan Rossi wrote:
> > On Sat, 1 Feb 2020 at 08:13, Mark Hatle <mark.hatle@kernel.crashing.org> wrote:
> >>
> >> From: Mark Hatle <mark.hatle@xilinx.com>
> >>
> >> TUNE_ARCH - microblazeeb is not a valid architecture, microblaze is big
> >> endian, microblazeel is the little endian version.
> >>
> >> Version arguments:
> >> If a version feature is not defined, then we don't want to set either
> >> TUNE_CCARGS or MBPKGARCH_VERSION.
> >>
> >> Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
> >> Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
> >> ---
> >> meta/conf/machine/include/microblaze/arch-microblaze.inc | 2 +-
> >> .../include/microblaze/feature-microblaze-versions.inc | 4 ++--
> >> 2 files changed, 3 insertions(+), 3 deletions(-)
> >>
> >> diff --git a/meta/conf/machine/include/microblaze/arch-microblaze.inc b/meta/conf/machine/include/microblaze/arch-microblaze.inc
> >> index eab7171cb2..265898b6b6 100644
> >> --- a/meta/conf/machine/include/microblaze/arch-microblaze.inc
> >> +++ b/meta/conf/machine/include/microblaze/arch-microblaze.inc
> >> @@ -46,7 +46,7 @@ require conf/machine/include/microblaze/feature-microblaze-versions.inc
> >> require conf/machine/include/microblaze/feature-microblaze-math.inc
> >>
> >> # Architecture name, either 'microblazeeb' or 'microblazeel' depending on endianess
> >
> > Worth updating the comment at the same time.
> >
> >> -TUNE_ARCH = "microblaze${@bb.utils.contains("TUNE_FEATURES", "bigendian", "eb", "el", d)}"
> >> +TUNE_ARCH = "microblaze${@bb.utils.contains("TUNE_FEATURES", "bigendian", "", "el", d)}"
> >
> > This change will break some things in oe-core (and probably
> > meta-xilinx too). They should be updated at the same time.
>
> Do you have an example of what? Cause without this, all autoconf invocation of
> big endian failed for me due to invalid architecture.
So core-image-minimal builds were working when I had been testing, but
that was a number of releases ago now.
There are only a few instances in oe-core that check for "microblazeeb".
classes/meson.bbclass:60: elif arch == "microblazeel" or arch ==
"microblazeeb":
Probably just arch.startswith("microblaze") here
classes/kernel-arch.bbclass:37: elif re.match('microblazee[bl]',
a): return 'microblaze'
This one won't break, since "microblaze" is already a valid kernel
arch. But for clean up just needs to be microblazeel.
recipes-extended/ghostscript/ghostscript/microblazeeb/objarch.h
>
> > Might also be worth removing the microblazeeb references in siteinfo,
> > and elf.py. Since they were added to support this.
>
> I looked at these and left them "just in case", as they didn't seem to conflict
> with anything that I saw.
Leaving them is fine, though removal to avoid confusion and for clean
up in general is probably a good idea.
Thanks,
Nathan
>
> --Mark
>
> > Regards,
> > Nathan
> >
> >>
> >> # Package Architecture formatting
> >> TUNE_PKGARCH = "microblaze${MBPKGARCH_ENDIAN}${MBPKGARCH_VERSION}${MBPKGARCH_TUNE}${MBPKGARCH_MATH}"
> >> diff --git a/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc b/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc
> >> index 3221e2aab7..003fde3e07 100644
> >> --- a/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc
> >> +++ b/meta/conf/machine/include/microblaze/feature-microblaze-versions.inc
> >> @@ -64,6 +64,6 @@ TUNECONFLICTS[v10.0] = "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.1 v9.2 v9.3
> >> TUNECONFLICTS[v11.0] = "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.1 v9.2 v9.3 v9.4 v9.5 v9.6 v10.0"
> >>
> >> # Version flags
> >> -TUNE_CCARGS += "-mcpu=${@microblaze_current_version(d, True)}"
> >> -MBPKGARCH_VERSION = "-${@microblaze_current_version(d)}"
> >> +TUNE_CCARGS += "${@'-mcpu=${@microblaze_current_version(d, True)' if microblaze_current_version(d, True) != '' else ''}"
> >> +MBPKGARCH_VERSION = "${@'-${@microblaze_current_version(d, True)' if microblaze_current_version(d, True) != '' else ''}"
> >>
> >> --
> >> 2.17.1
> >>
> >> --
> >> _______________________________________________
> >> Openembedded-core mailing list
> >> Openembedded-core@lists.openembedded.org
> >> http://lists.openembedded.org/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-02-04 8:16 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-31 22:07 [PATCH 1/2] microblaze tune: Correct two minor issues with the microblaze tune Mark Hatle
2020-01-31 22:07 ` [PATCH 2/2] populate_sdk_base: if the SDKIMAGE_FEATURES changes, refresh the SDK Mark Hatle
2020-02-01 4:49 ` [PATCH 1/2] microblaze tune: Correct two minor issues with the microblaze tune Nathan Rossi
2020-02-03 18:55 ` Mark Hatle
2020-02-04 8:16 ` Nathan Rossi
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.