linux-sunxi/u-boot-sunxi
1
0
Fork 0
mirror of https://github.com/linux-sunxi/u-boot-sunxi.git synced 2024-02-12 11:16:03 +08:00
Code Issues Projects Releases Wiki Activity

xtensa: clean up CONFIG_SYS_TEXT_ADDR

Browse Source 
Drop CONFIG_SYS_MEMORY_TOP. Rename CONFIG_SYS_TEXT_ADDR to
XTENSA_SYS_TEXT_ADDR.

Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
This commit is contained in:
Max Filippov
2018-02-12 15:39:19 -08:00
committed by Tom Rini
parent fa2c14676c
commit 10117a2985
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/xtensa/cpu/start.S
View File

@ -226,7 +226,7 @@ _start:
#endif #endif
movi a0, 0 movi a0, 0
movi sp, (CONFIG_SYS_TEXT_ADDR - 16) & 0xfffffff0 movi sp, (XTENSA_SYS_TEXT_ADDR - 16) & 0xfffffff0
#ifdef CONFIG_DEBUG_UART #ifdef CONFIG_DEBUG_UART
movi a4, debug_uart_init movi a4, debug_uart_init

4
arch/xtensa/cpu/u-boot.lds
View File

@ -74,9 +74,9 @@ SECTIONS
SECTION_VECTOR(DoubleExceptionVector,text,XCHAL_DOUBLEEXC_VECTOR_VADDR, SECTION_VECTOR(DoubleExceptionVector,text,XCHAL_DOUBLEEXC_VECTOR_VADDR,
FOLLOWING(.DoubleExceptionVector.literal)) 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_rodata(ALIGN(16), FOLLOWING(.text))
SECTION_u_boot_list(ALIGN(16), FOLLOWING(.rodata)) SECTION_u_boot_list(ALIGN(16), FOLLOWING(.rodata))
SECTION_data(ALIGN(16), FOLLOWING(.u_boot_list)) SECTION_data(ALIGN(16), FOLLOWING(.u_boot_list))

5
include/configs/xtfpga.h
View File

@ -98,9 +98,8 @@
#define CONFIG_SYS_MEMORY_SIZE CONFIG_SYS_SDRAM_SIZE #define CONFIG_SYS_MEMORY_SIZE CONFIG_SYS_SDRAM_SIZE
#endif #endif
#define CONFIG_SYS_MEMORY_TOP MEMADDR(CONFIG_SYS_MEMORY_SIZE) #define XTENSA_SYS_TEXT_ADDR \
#define CONFIG_SYS_TEXT_ADDR \ (MEMADDR(CONFIG_SYS_MEMORY_SIZE) - CONFIG_SYS_MONITOR_LEN)
(CONFIG_SYS_MEMORY_TOP - CONFIG_SYS_MONITOR_LEN)
/* Used by tftpboot; env var 'loadaddr' */ /* Used by tftpboot; env var 'loadaddr' */
#define CONFIG_SYS_LOAD_ADDR MEMADDR(0x02000000) #define CONFIG_SYS_LOAD_ADDR MEMADDR(0x02000000)