diff options
| author | Thomas Chou <thomas@wytron.com.tw> | 2015-11-03 13:47:02 +0800 |
|---|---|---|
| committer | Thomas Chou <thomas@wytron.com.tw> | 2015-11-06 09:14:12 +0800 |
| commit | 65af9f69716ca0a765eebb8c14d851f89e2196d3 (patch) | |
| tree | b665d7ee4727b9df19f09f39442685ab0d6d39af | |
| parent | 92ae05cfc70c07642983438a180184e98bcc3249 (diff) | |
| download | u-boot-65af9f69716ca0a765eebb8c14d851f89e2196d3.tar.gz u-boot-65af9f69716ca0a765eebb8c14d851f89e2196d3.tar.xz u-boot-65af9f69716ca0a765eebb8c14d851f89e2196d3.zip | |
nios2: remove CONFIG_SYS_INIT_SP macro
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>
| -rw-r--r-- | arch/nios2/cpu/start.S | 3 | ||||
| -rw-r--r-- | include/configs/nios2-generic.h | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/nios2/cpu/start.S b/arch/nios2/cpu/start.S index 8758e7e847..bb86bbf40c 100644 --- a/arch/nios2/cpu/start.S +++ b/arch/nios2/cpu/start.S @@ -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) diff --git a/include/configs/nios2-generic.h b/include/configs/nios2-generic.h index 74c715d203..3a559f15fc 100644 --- a/include/configs/nios2-generic.h +++ b/include/configs/nios2-generic.h @@ -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 |