On 2016-12-23 13:00, Ralf Ramsauer wrote:
> On ARM32 `uname -m` might return 'armv7l', on ARM64, it might return
> 'aarch64', which is not the correct ARCH in these cases. The correct
> ARCH is arm for ARM32 bit and arm64 for ARM64.
> 
> Signed-off-by: Ralf Ramsauer <[email protected]>
> ---
>  scripts/include.mk | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/scripts/include.mk b/scripts/include.mk
> index 740e7b03..aca5a5b7 100644
> --- a/scripts/include.mk
> +++ b/scripts/include.mk
> @@ -52,3 +52,9 @@ ARCH ?= $(shell uname -m)
>  ifeq ($(ARCH),x86_64)
>  override ARCH = x86
>  endif
> +ifneq (,$(findstring arm,$(ARCH)))
> +override ARCH = arm
> +endif

This matches on arm64 as well and causes unintuitive breakages there
because the wrong loader is installed - grrr.

Do we only have to fix up "armv7l"? Then what about

ifeq ($(ARCH),armv7l)

instead?

> +ifeq ($(ARCH),aarch64)
> +override ARCH = arm64
> +endif
> 

BTW, if you could test current next on your setups (TK1, TX1), that
would be appreciated. I'm basically doing

- enable
- create/load/start gic-demo
- destroy gic-demo
- load linux
- ssh linux
- disable

Jan

-- 
Siemens AG, Corporate Technology, CT RDA ITP SES-DE
Corporate Competence Center Embedded Linux

-- 
You received this message because you are subscribed to the Google Groups 
"Jailhouse" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/d/optout.

Reply via email to