[OE-core] [PATCH 1/2] microblaze tune: Correct two minor issues with the microblaze tune

[Nathan Rossi]

On Sat, 1 Feb 2020 at 08:13, Mark Hatle <mark.hatle at kernel.crashing.org> wrote:
>
> From: Mark Hatle <mark.hatle at 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 at xilinx.com>
> Signed-off-by: Mark Hatle <mark.hatle at 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 at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core