diff options
| author | Max Filippov <jcmvbkbc@gmail.com> | 2018-02-12 15:39:19 -0800 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-02-23 10:21:41 -0500 |
| commit | 10117a298554d586e7a288a9fa0b574ce35d62a0 (patch) | |
| tree | a75db473fccd8729d41d46153803c9dab699efb7 | |
| parent | fa2c14676c7c6f3115dd4d9b2a4cc3b35c3ad2a2 (diff) | |
| download | u-boot-10117a298554d586e7a288a9fa0b574ce35d62a0.tar.gz u-boot-10117a298554d586e7a288a9fa0b574ce35d62a0.tar.xz u-boot-10117a298554d586e7a288a9fa0b574ce35d62a0.zip | |
xtensa: clean up CONFIG_SYS_TEXT_ADDR
Drop CONFIG_SYS_MEMORY_TOP. Rename CONFIG_SYS_TEXT_ADDR to
XTENSA_SYS_TEXT_ADDR.
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
| -rw-r--r-- | arch/xtensa/cpu/start.S | 2 | ||||
| -rw-r--r-- | arch/xtensa/cpu/u-boot.lds | 4 | ||||
| -rw-r--r-- | include/configs/xtfpga.h | 5 |
3 files changed, 5 insertions, 6 deletions
diff --git a/arch/xtensa/cpu/start.S b/arch/xtensa/cpu/start.S index 8e4bc99e42..cdb875da53 100644 --- a/arch/xtensa/cpu/start.S +++ b/arch/xtensa/cpu/start.S @@ -226,7 +226,7 @@ _start: #endif movi a0, 0 - movi sp, (CONFIG_SYS_TEXT_ADDR - 16) & 0xfffffff0 + movi sp, (XTENSA_SYS_TEXT_ADDR - 16) & 0xfffffff0 #ifdef CONFIG_DEBUG_UART movi a4, debug_uart_init diff --git a/arch/xtensa/cpu/u-boot.lds b/arch/xtensa/cpu/u-boot.lds index 853ae5a948..7200bc59fb 100644 --- a/arch/xtensa/cpu/u-boot.lds +++ b/arch/xtensa/cpu/u-boot.lds @@ -74,9 +74,9 @@ SECTIONS SECTION_VECTOR(DoubleExceptionVector,text,XCHAL_DOUBLEEXC_VECTOR_VADDR, FOLLOWING(.DoubleExceptionVector.literal)) - __monitor_start = CONFIG_SYS_TEXT_ADDR; + __monitor_start = XTENSA_SYS_TEXT_ADDR; - SECTION_text(CONFIG_SYS_TEXT_ADDR, FOLLOWING(.DoubleExceptionVector.text)) + SECTION_text(XTENSA_SYS_TEXT_ADDR, FOLLOWING(.DoubleExceptionVector.text)) SECTION_rodata(ALIGN(16), FOLLOWING(.text)) SECTION_u_boot_list(ALIGN(16), FOLLOWING(.rodata)) SECTION_data(ALIGN(16), FOLLOWING(.u_boot_list)) diff --git a/include/configs/xtfpga.h b/include/configs/xtfpga.h index 79cc1e8fc1..496f3772d5 100644 --- a/include/configs/xtfpga.h +++ b/include/configs/xtfpga.h @@ -98,9 +98,8 @@ #define CONFIG_SYS_MEMORY_SIZE CONFIG_SYS_SDRAM_SIZE #endif -#define CONFIG_SYS_MEMORY_TOP MEMADDR(CONFIG_SYS_MEMORY_SIZE) -#define CONFIG_SYS_TEXT_ADDR \ - (CONFIG_SYS_MEMORY_TOP - CONFIG_SYS_MONITOR_LEN) +#define XTENSA_SYS_TEXT_ADDR \ + (MEMADDR(CONFIG_SYS_MEMORY_SIZE) - CONFIG_SYS_MONITOR_LEN) /* Used by tftpboot; env var 'loadaddr' */ #define CONFIG_SYS_LOAD_ADDR MEMADDR(0x02000000) |