Skip to contentSkip to conversation

microblaze tune: Correct two minor issues with the microblaze tune

PATCH In review Mark Hatle 2 participants 5 messages Jan 31, 2020 – Feb 4, 2020

lore
Share & tools
lore

Mark Hatle

author
#0 lore raw

PATCH 1/2 microblaze tune: Correct two minor issues with the microblaze tune

From: Mark Hatle <[email protected]>

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.

---
 meta/conf/machine/include/microblaze/arch-microblaze.inc      | 2 +-
 .../include/microblaze/feature-microblaze-versions.inc        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
meta/conf/machine/include/microblaze/arch-microblaze.inc +1 -1
index eab7171cb2..265898b6b6 100644
@@ -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}"
meta/conf/machine/include/microblaze/feature-microblaze-versions.inc +2 -2
index 3221e2aab7..003fde3e07 100644
@@ -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 ''}"
 
Signature · 1 line
2.17.1
author
#1 lore raw

PATCH 2/2 populate_sdk_base: if the SDKIMAGE_FEATURES changes, refresh the SDK

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.

---
 meta/classes/populate_sdk_base.bbclass | 1 +
 1 file changed, 1 insertion(+)
meta/classes/populate_sdk_base.bbclass +1 -0
index d03465b6fc..3248bb01c3 100644
@@ -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}"
Signature · 1 line
2.17.1
#2 lore raw
In reply to Mark Hatle
Quoted 22 lines · Mark Hatle

From: Mark Hatle <[email protected]>

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.

---
 meta/conf/machine/include/microblaze/arch-microblaze.inc      | 2 +-
 .../include/microblaze/feature-microblaze-versions.inc        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
meta/conf/machine/include/microblaze/arch-microblaze.inc +0 -0
index eab7171cb2..265898b6b6 100644

meta/conf/machine/include/microblaze/arch-microblaze.inc require conf/machine/include/microblaze/feature-microblaze-versions.inc · line 48

Quoted 3 lines
meta/conf/machine/include/microblaze/arch-microblaze.inc +0 -0
@@ -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.

meta/conf/machine/include/microblaze/arch-microblaze.inc require conf/machine/include/microblaze/feature-microblaze-versions.inc · line 49

Quoted 2 lines
meta/conf/machine/include/microblaze/arch-microblaze.inc +1 -1
-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

Quoted 24 lines
meta/conf/machine/include/microblaze/arch-microblaze.inc +0 -0
 # Package Architecture formatting
 TUNE_PKGARCH = "microblaze${MBPKGARCH_ENDIAN}${MBPKGARCH_VERSION}${MBPKGARCH_TUNE}${MBPKGARCH_MATH}"
meta/conf/machine/include/microblaze/feature-microblaze-versions.inc +2 -3
index 3221e2aab7..003fde3e07 100644
@@ -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
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

author
#3 lore raw
Quoted 29 lines · Nathan Rossi
Quoted 22 lines · Mark Hatle

From: Mark Hatle <[email protected]>

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.

---
 meta/conf/machine/include/microblaze/arch-microblaze.inc      | 2 +-
 .../include/microblaze/feature-microblaze-versions.inc        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
meta/conf/machine/include/microblaze/arch-microblaze.inc +0 -0
index eab7171cb2..265898b6b6 100644

meta/conf/machine/include/microblaze/arch-microblaze.inc require conf/machine/include/microblaze/feature-microblaze-versions.inc · line 48

Quoted 3 lines
meta/conf/machine/include/microblaze/arch-microblaze.inc +0 -0
@@ -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.

Quoted 5 lines

meta/conf/machine/include/microblaze/arch-microblaze.inc require conf/machine/include/microblaze/feature-microblaze-versions.inc · line 49

Quoted 2 lines
meta/conf/machine/include/microblaze/arch-microblaze.inc +1 -1
-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.

Quoted 2 lines

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

Quoted 27 lines

Regards,
Nathan

Quoted 24 lines
meta/conf/machine/include/microblaze/arch-microblaze.inc +0 -0
 # Package Architecture formatting
 TUNE_PKGARCH = "microblaze${MBPKGARCH_ENDIAN}${MBPKGARCH_VERSION}${MBPKGARCH_TUNE}${MBPKGARCH_MATH}"
meta/conf/machine/include/microblaze/feature-microblaze-versions.inc +2 -3
index 3221e2aab7..003fde3e07 100644
@@ -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
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#4 lore raw
Quoted 33 lines · Mark Hatle
Quoted 29 lines · Nathan Rossi
Quoted 22 lines · Mark Hatle

From: Mark Hatle <[email protected]>

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.

---
 meta/conf/machine/include/microblaze/arch-microblaze.inc      | 2 +-
 .../include/microblaze/feature-microblaze-versions.inc        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
meta/conf/machine/include/microblaze/arch-microblaze.inc +0 -0
index eab7171cb2..265898b6b6 100644

meta/conf/machine/include/microblaze/arch-microblaze.inc require conf/machine/include/microblaze/feature-microblaze-versions.inc · line 48

Quoted 3 lines
meta/conf/machine/include/microblaze/arch-microblaze.inc +0 -0
@@ -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.

Quoted 8 lines
Quoted 5 lines

meta/conf/machine/include/microblaze/arch-microblaze.inc require conf/machine/include/microblaze/feature-microblaze-versions.inc · line 49

Quoted 2 lines
meta/conf/machine/include/microblaze/arch-microblaze.inc +1 -1
-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

Quoted 6 lines
Quoted 3 lines

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

Quoted 30 lines

--Mark

Quoted 27 lines

Regards,
Nathan

Quoted 24 lines
meta/conf/machine/include/microblaze/arch-microblaze.inc +0 -0
 # Package Architecture formatting
 TUNE_PKGARCH = "microblaze${MBPKGARCH_ENDIAN}${MBPKGARCH_VERSION}${MBPKGARCH_TUNE}${MBPKGARCH_MATH}"
meta/conf/machine/include/microblaze/feature-microblaze-versions.inc +2 -3
index 3221e2aab7..003fde3e07 100644
@@ -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
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core