]> git.ipfire.org Git - people/ms/u-boot.git/commitdiff
nios2: remove CONFIG_SYS_INIT_SP macro
authorThomas Chou <thomas@wytron.com.tw>
Tue, 3 Nov 2015 05:47:02 +0000 (13:47 +0800)
committerThomas Chou <thomas@wytron.com.tw>
Fri, 6 Nov 2015 01:14:12 +0000 (09:14 +0800)
Remove CONFIG_SYS_INIT_SP macro, as the initial stack is set to
below the u-boot code.

Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
Reviewed-by: Marek Vasut <marex@denx.de>
Reviewed-by: Chin Liang See <clsee@altera.com>
arch/nios2/cpu/start.S
include/configs/nios2-generic.h

index 8758e7e847a27112c02dd8fe86225913daad4b7c..bb86bbf40c4e2fa7109be59d306e51f80f703a52 100644 (file)
@@ -81,6 +81,7 @@ _cur: movhi   r5, %hi(_cur - _start)
        mov     r8, r4
        movhi   r5, %hi(_start)
        ori     r5, r5, %lo(_start)     /* r5 <- linked _start */
+       mov     sp, r5          /* initial stack below u-boot code */
        beq     r4, r5, 3f
 
        movhi   r6, %hi(CONFIG_SYS_MONITOR_LEN)
@@ -100,8 +101,6 @@ _cur:       movhi   r5, %hi(_cur - _start)
 _reloc:
 
        /* STACK INIT -- zero top two words for call back chain. */
-       movhi   sp, %hi(CONFIG_SYS_INIT_SP)
-       ori     sp, sp, %lo(CONFIG_SYS_INIT_SP)
        addi    sp, sp, -8
        stw     r0, 0(sp)
        stw     r0, 4(sp)
index 74c715d203300f0a671d97537d396dae270ba490..3a559f15fc42c7b6aba9afa7db75c5a31cff32fa 100644 (file)
@@ -84,7 +84,6 @@
                                         CONFIG_SYS_SDRAM_SIZE - \
                                         CONFIG_SYS_MONITOR_LEN)
 #define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + 0x20000)
-#define CONFIG_SYS_INIT_SP             CONFIG_SYS_MALLOC_BASE
 
 /*
  * MISC