This had previously been reverted as it may cause some stack
usage. Now that we have a stack on entry, it should be safe to
so.

Signed-off-by: Lucas Stach <[email protected]>
---
 arch/arm/boards/avnet-zedboard/lowlevel.c | 1 -
 arch/arm/mach-zynq/cpu_init.c             | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boards/avnet-zedboard/lowlevel.c 
b/arch/arm/boards/avnet-zedboard/lowlevel.c
index c681764bd009..1ecddf24085f 100644
--- a/arch/arm/boards/avnet-zedboard/lowlevel.c
+++ b/arch/arm/boards/avnet-zedboard/lowlevel.c
@@ -301,7 +301,6 @@ ENTRY_FUNCTION_WITHSTACK(start_avnet_zedboard, 0xfffff000, 
r0, r1, r2)
        writel((1<<7), 0xe000a208 );    // Output enable
        writel((1<<7), 0xe000a040 );    // DATA Register
 
-       arm_cpu_lowlevel_init();
        zynq_cpu_lowlevel_init();
 
        avnet_zedboard_ps7_init();
diff --git a/arch/arm/mach-zynq/cpu_init.c b/arch/arm/mach-zynq/cpu_init.c
index 7194c7e21627..cc7b8d1142a9 100644
--- a/arch/arm/mach-zynq/cpu_init.c
+++ b/arch/arm/mach-zynq/cpu_init.c
@@ -7,6 +7,8 @@
 
 void zynq_cpu_lowlevel_init(void)
 {
+       arm_cpu_lowlevel_init();
+
        enable_arm_errata_761320_war();
        enable_arm_errata_794072_war();
        enable_arm_errata_845369_war();
-- 
2.47.1


Reply via email to