From cb36f5c23004009bb0631b5d6316f0048e1fcb3e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Lothar=20Wa=C3=9Fmann?= Date: Fri, 21 Aug 2015 16:49:20 +0200 Subject: [PATCH] ARM: mxs: use CONFIG_SPL_STACK to set up SPL stack pointer --- arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c | 2 +- arch/arm/lib/vectors.S | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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 -- 2.39.2