[PATCH] ARM: Do not build hyp.S for AArch64

[PATCH] ARM: Do not build hyp.S for AArch64

[Andrey Smirnov]

This file is only meant for ARMv7 and trying to build it on ARMv8
results in a build break.

Fixes: baa1aec03 ("ARM: allow secure monitor code to be built without PSCI")
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---

I feel like this should really be gated by CONFIG_CPU32v7 since I
think the code in question is ARMv7-only, but I am not
sure. Comments/advise are wellcome.

Thanks,
Andrey Smirnov

 arch/arm/cpu/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/cpu/Makefile b/arch/arm/cpu/Makefile
index 45de2728d..390fa4437 100644
--- a/arch/arm/cpu/Makefile
+++ b/arch/arm/cpu/Makefile
@@ -4,7 +4,7 @@ obj-$(CONFIG_ARM_EXCEPTIONS) += exceptions$(S64).o interrupts$(S64).o
 obj-$(CONFIG_MMU) += mmu$(S64).o
 lwl-y += lowlevel$(S64).o
 obj-pbl-$(CONFIG_MMU) += mmu-early$(S64).o
-obj-pbl-y += hyp.o
+obj-pbl-$(if $(S64),,y) += hyp.o
 AFLAGS_hyp.o :=-Wa,-march=armv7-a -Wa,-mcpu=all
 AFLAGS_pbl-hyp.o :=-Wa,-march=armv7-a -Wa,-mcpu=all
 
-- 
2.19.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH] ARM: Do not build hyp.S for AArch64

[Sascha Hauer]

On Wed, Nov 14, 2018 at 07:00:24PM -0800, Andrey Smirnov wrote:
> This file is only meant for ARMv7 and trying to build it on ARMv8
> results in a build break.
> 
> Fixes: baa1aec03 ("ARM: allow secure monitor code to be built without PSCI")
> Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
> ---
> 
> I feel like this should really be gated by CONFIG_CPU32v7 since I
> think the code in question is ARMv7-only, but I am not
> sure. Comments/advise are wellcome.

Please rebase. Current master has

obj-pbl-$(CONFIG_CPU_32v7) += hyp.o

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox