From: Lothar Waßmann <LW@KARO-electronics.de>
Date: Fri, 21 Aug 2015 14:49:20 +0000 (+0200)
Subject: ARM: mxs: use CONFIG_SPL_STACK to set up SPL stack pointer
X-Git-Tag: KARO-TX6-2015-09-18~4034^2~1^2
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=cb36f5c23004009bb0631b5d6316f0048e1fcb3e

ARM: mxs: use CONFIG_SPL_STACK to set up SPL stack pointer
---

diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c b/arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c
index 0aa06125b9..93689a18a5 100644
--- a/arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c
+++ b/arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c
@@ -204,7 +204,7 @@ static void mxs_mem_setup_cpu_and_hbus(void)
 		&clkctrl_regs->hw_clkctrl_clkseq_clr);
 }
 
-void data_abort_memdetect_handler(void)
+static void data_abort_memdetect_handler(void)
 {
 	asm volatile("subs pc, lr, #4");
 }
diff --git a/arch/arm/lib/vectors.S b/arch/arm/lib/vectors.S
index 1b51f003f3..2ac7ffe473 100644
--- a/arch/arm/lib/vectors.S
+++ b/arch/arm/lib/vectors.S
@@ -117,10 +117,10 @@ fiq:
 /* IRQ stack memory (calculated at run-time) + 8 bytes */
 .globl IRQ_STACK_START_IN
 IRQ_STACK_START_IN:
-#ifndef IRAM_BASE_ADDR
+#ifndef CONFIG_SPL_STACK
 	.word	0x0badc0de
 #else
-	.word	IRAM_BASE_ADDR + 0x20
+	.word	CONFIG_SPL_STACK
 #endif
 
 #ifdef CONFIG_USE_IRQ