Patchwork [20/22] arch-armv7a.inc: fix armv7a-vfp-neon -> armv7a compat case

login
register
mail settings
Submitter Saul Wold
Date Aug. 1, 2011, 7:36 a.m.
Message ID <e115e9e68704cb7b327f4f7c215953873f1fdea9.1312182844.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/8939/
State New, archived
Headers show

Comments

Saul Wold - Aug. 1, 2011, 7:36 a.m.
From: Koen Kooi <koen@dominion.thruhere.net>

Without this 'armv7a' is used as TUNE_ARCH but does *not* end up in PACKAGE_EXTRA_ARCHS:

arch all 1
arch any 6
arch noarch 11
arch arm 16
arch armv4 21
arch armv4t 26
arch armv5 31
arch armv5t 36
arch armv5-vfp 41
arch armv5t-vfp 46
arch armv5e 51
arch armv5te 56
arch armv5e-vfp 61
arch armv5te-vfp 66
arch armv6-vfp 71
arch armv6t-vfp 76
arch armv7-vfp 81
arch armv7t2-vfp 86
arch armv7a-vfp 91
arch armv7at2-vfp 96
arch armv7a-vfp-neon 101
arch armv7at2-vfp-neon 106
arch beagleboard 111

Which leads to a failing do_rootfs

The fix might look like it's in the wrong line, but it's only place in the .inc where it works.

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 meta/conf/machine/include/arm/arch-armv7a.inc |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
Richard Purdie - Aug. 1, 2011, 1:10 p.m.
On Mon, 2011-08-01 at 00:36 -0700, Saul Wold wrote:
> From: Koen Kooi <koen@dominion.thruhere.net>
> 
> Without this 'armv7a' is used as TUNE_ARCH but does *not* end up in PACKAGE_EXTRA_ARCHS:
> 
> arch all 1
> arch any 6
> arch noarch 11
> arch arm 16
> arch armv4 21
> arch armv4t 26
> arch armv5 31
> arch armv5t 36
> arch armv5-vfp 41
> arch armv5t-vfp 46
> arch armv5e 51
> arch armv5te 56
> arch armv5e-vfp 61
> arch armv5te-vfp 66
> arch armv6-vfp 71
> arch armv6t-vfp 76
> arch armv7-vfp 81
> arch armv7t2-vfp 86
> arch armv7a-vfp 91
> arch armv7at2-vfp 96
> arch armv7a-vfp-neon 101
> arch armv7at2-vfp-neon 106
> arch beagleboard 111
> 
> Which leads to a failing do_rootfs
> 
> The fix might look like it's in the wrong line, but it's only place in the .inc where it works.
> 
> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
> ---
>  meta/conf/machine/include/arm/arch-armv7a.inc |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/conf/machine/include/arm/arch-armv7a.inc b/meta/conf/machine/include/arm/arch-armv7a.inc
> index ce9cee5..6ac2950 100644
> --- a/meta/conf/machine/include/arm/arch-armv7a.inc
> +++ b/meta/conf/machine/include/arm/arch-armv7a.inc
> @@ -17,7 +17,7 @@ TUNE_FEATURES_tune-armv7at-neon ?= "armv7a vfp neon thumb"
>  PACKAGE_EXTRA_ARCHS_tune-armv7a = "${PACKAGE_EXTRA_ARCHS_tune-armv7} armv7a-vfp"
>  PACKAGE_EXTRA_ARCHS_tune-armv7a-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7a} armv7a-vfp-neon"
>  PACKAGE_EXTRA_ARCHS_tune-armv7at = "${PACKAGE_EXTRA_ARCHS_tune-armv7t} armv7a-vfp armv7at2-vfp"
> -PACKAGE_EXTRA_ARCHS_tune-armv7at-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7at} armv7a-vfp-neon armv7at2-vfp-neon"
> +PACKAGE_EXTRA_ARCHS_tune-armv7at-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7at} armv7a armv7a-vfp-neon armv7at2-vfp-neon"

Nearly :)

You need to add it to the PACKAGE_EXTRA_ARCHS_tune-armv7a and
PACKAGE_EXTRA_ARCHS_tune-armv7at lines.

Cheers,

Richard

Patch

diff --git a/meta/conf/machine/include/arm/arch-armv7a.inc b/meta/conf/machine/include/arm/arch-armv7a.inc
index ce9cee5..6ac2950 100644
--- a/meta/conf/machine/include/arm/arch-armv7a.inc
+++ b/meta/conf/machine/include/arm/arch-armv7a.inc
@@ -17,7 +17,7 @@  TUNE_FEATURES_tune-armv7at-neon ?= "armv7a vfp neon thumb"
 PACKAGE_EXTRA_ARCHS_tune-armv7a = "${PACKAGE_EXTRA_ARCHS_tune-armv7} armv7a-vfp"
 PACKAGE_EXTRA_ARCHS_tune-armv7a-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7a} armv7a-vfp-neon"
 PACKAGE_EXTRA_ARCHS_tune-armv7at = "${PACKAGE_EXTRA_ARCHS_tune-armv7t} armv7a-vfp armv7at2-vfp"
-PACKAGE_EXTRA_ARCHS_tune-armv7at-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7at} armv7a-vfp-neon armv7at2-vfp-neon"
+PACKAGE_EXTRA_ARCHS_tune-armv7at-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7at} armv7a armv7a-vfp-neon armv7at2-vfp-neon"
 
 # VFP Tunes
 AVAILTUNES += "armv7hf armv7thf armv7hf-neon armv7thf-neon
@@ -39,7 +39,7 @@  TUNE_FEATURES_tune-armv7atb-neon ?= "${TUNE_FEATURES_tune-armv7at-neon} bigendia
 PACKAGE_EXTRA_ARCHS_tune-armv7ab = "${PACKAGE_EXTRA_ARCHS_tune-armv7} armv7ab-vfp"
 PACKAGE_EXTRA_ARCHS_tune-armv7atb = "${PACKAGE_EXTRA_ARCHS_tune-armv7t} armv7ab-vfp armv7at2b-vfp"
 PACKAGE_EXTRA_ARCHS_tune-armv7ab-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7a} armv7ab-vfp-neon"
-PACKAGE_EXTRA_ARCHS_tune-armv7atb-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7at} armv7ab-vfp-neon armv7at2b-vfp-neon"
+PACKAGE_EXTRA_ARCHS_tune-armv7atb-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7at} armv7ab armv7ab-vfp-neon armv7at2b-vfp-neon"
 
 # Big Endian + VFP
 AVAILTUNES += "armv7ahfb armv7athfb armv7ahfb-neon armv7athfb-neon"