From: Michal Simek <michal.simek@xilinx.com>
Date: Thu, 22 Aug 2013 12:52:02 +0000 (+0200)
Subject: zynq: Use arch_cpu_init() instead of lowlevel_init()
X-Git-Tag: v2014.01-rc1~77^2~35
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=262f08d6ea18a62f827b8ccb60f355ca2eaf6e2b

zynq: Use arch_cpu_init() instead of lowlevel_init()

Zynq lowlevel_init() was implemented in C but stack
pointer is setup after function call in _main().
Move architecture setup to arch_cpu_init() which is call
as the first function in board_init_f() which
already have correct stack pointer.

Reported-by: Sven Schwermer <sven.schwermer@tuhh.de>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

diff --git a/arch/arm/cpu/armv7/zynq/cpu.c b/arch/arm/cpu/armv7/zynq/cpu.c
index 49149861f8..2bb38438ae 100644
--- a/arch/arm/cpu/armv7/zynq/cpu.c
+++ b/arch/arm/cpu/armv7/zynq/cpu.c
@@ -10,6 +10,10 @@
 #include <asm/arch/hardware.h>
 
 void lowlevel_init(void)
+{
+}
+
+int arch_cpu_init(void)
 {
 	zynq_slcr_unlock();
 	/* remap DDR to zero, FILTERSTART */
@@ -31,6 +35,8 @@ void lowlevel_init(void)
 	writel(0xC, &slcr_base->ddr_urgent);
 
 	zynq_slcr_lock();
+
+	return 0;
 }
 
 void reset_cpu(ulong addr)