[PATCH 1/2] fixup! ARM: add file for HYP mode related setup

[PATCH 1/2] fixup! ARM: add file for HYP mode related setup

[Lucas Stach]

---
 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 45de2728d01a..a35db435c1b9 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-$(CONFIG_CPU_32v7) += 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

[PATCH 2/2] fixup! ARM: install HYP vectors at PBL and Barebox entry

[Lucas Stach]

---
 arch/arm/cpu/lowlevel.S | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm/cpu/lowlevel.S b/arch/arm/cpu/lowlevel.S
index 13dfe496ad17..3b52644e43e1 100644
--- a/arch/arm/cpu/lowlevel.S
+++ b/arch/arm/cpu/lowlevel.S
@@ -8,8 +8,10 @@ ENTRY(arm_cpu_lowlevel_init)
 	/* save lr, since it may be banked away with a processor mode change */
 	mov	r2, lr
 
+#ifdef CONFIG_CPU_32v7
 	/* careful: the hyp install corrupts r0 and r1 */
 	bl	__hyp_install
+#endif
 
 	/* set the cpu to SVC32 mode, mask irq and fiq */
 	mrs	r12, cpsr
-- 
2.19.1


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

Re: [PATCH 1/2] fixup! ARM: add file for HYP mode related setup

[Sascha Hauer]

On Mon, Nov 05, 2018 at 04:38:24PM +0100, Lucas Stach wrote:
> ---
>  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 45de2728d01a..a35db435c1b9 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-$(CONFIG_CPU_32v7) += hyp.o
>  AFLAGS_hyp.o :=-Wa,-march=armv7-a -Wa,-mcpu=all
>  AFLAGS_pbl-hyp.o :=-Wa,-march=armv7-a -Wa,-mcpu=all

Applied, thanks.

The series now compiles successfully \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