| Message ID | 1397871921-41789-1-git-send-email-fenghua@phytium.com.cn |
|---|---|
| State | Accepted |
| Delegated to: | Albert ARIBAUD |
| Headers | show |
Hi fenghua@phytium.com.cn, On Sat, 19 Apr 2014 09:45:21 +0800, fenghua@phytium.com.cn wrote: > From: David Feng <fenghua@phytium.com.cn> > > Signed-off-by: David Feng <fenghua@phytium.com.cn> > --- > arch/arm/cpu/armv8/start.S | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/cpu/armv8/start.S b/arch/arm/cpu/armv8/start.S > index 33d3f36..4b11aa4 100644 > --- a/arch/arm/cpu/armv8/start.S > +++ b/arch/arm/cpu/armv8/start.S > @@ -50,10 +50,10 @@ reset: > */ > adr x0, vectors > switch_el x1, 3f, 2f, 1f > -3: mrs x0, scr_el3 > +3: msr vbar_el3, x0 > + mrs x0, scr_el3 > orr x0, x0, #0xf /* SCR_EL3.NS|IRQ|FIQ|EA */ > msr scr_el3, x0 > - msr vbar_el3, x0 > msr cptr_el3, xzr /* Enable FP/SIMD */ > ldr x0, =COUNTER_FREQUENCY > msr cntfrq_el0, x0 /* Initialize CNTFRQ */ Applied to u-boot-arm/master, thanks! Amicalement,
diff --git a/arch/arm/cpu/armv8/start.S b/arch/arm/cpu/armv8/start.S index 33d3f36..4b11aa4 100644 --- a/arch/arm/cpu/armv8/start.S +++ b/arch/arm/cpu/armv8/start.S @@ -50,10 +50,10 @@ reset: */ adr x0, vectors switch_el x1, 3f, 2f, 1f -3: mrs x0, scr_el3 +3: msr vbar_el3, x0 + mrs x0, scr_el3 orr x0, x0, #0xf /* SCR_EL3.NS|IRQ|FIQ|EA */ msr scr_el3, x0 - msr vbar_el3, x0 msr cptr_el3, xzr /* Enable FP/SIMD */ ldr x0, =COUNTER_FREQUENCY msr cntfrq_el0, x0 /* Initialize CNTFRQ */