浏览代码

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>
Max Filippov 7 年之前
父节点
当前提交
10117a2985
共有 3 个文件被更改,包括 5 次插入6 次删除
  1. 1 1
      arch/xtensa/cpu/start.S
  2. 2 2
      arch/xtensa/cpu/u-boot.lds
  3. 2 3
      include/configs/xtfpga.h

+ 1 - 1
arch/xtensa/cpu/start.S

@@ -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

+ 2 - 2
arch/xtensa/cpu/u-boot.lds

@@ -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))

+ 2 - 3
include/configs/xtfpga.h

@@ -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 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' */
 /* Used by tftpboot; env var 'loadaddr' */
 #define CONFIG_SYS_LOAD_ADDR		MEMADDR(0x02000000)
 #define CONFIG_SYS_LOAD_ADDR		MEMADDR(0x02000000)