Skip to contentSkip to conversation

xtensa: clean up SYS_MONITOR_LEN/SYS_TEXT_ADDR

PATCH New Max Filippov 2 participants 5 messages Feb 12, 2018 – Feb 24, 2018 Tensilica Xtensa port (xtensa)

lore
Share & tools
lore

Max Filippov

author maintainer
#0 lore raw

cover xtensa: clean up SYS_MONITOR_LEN/SYS_TEXT_ADDR

Hello,

this series moves SYS_MONITOR_LEN to Kconfig for board/cadence/xtfpga, removes SYS_MEMORY_TOP and renames CONFIG_SYS_TEXT_ADDR to XTENSA_SYS_TEXT_ADDR.

Max Filippov (2):
board/cadence/xtfpga: move SYS_MONITOR_LEN to Kconfig
xtensa: clean up CONFIG_SYS_TEXT_ADDR

 arch/xtensa/cpu/start.S      |  2 +-
 arch/xtensa/cpu/u-boot.lds   |  4 ++--
 board/cadence/xtfpga/Kconfig |  5 +++++
 include/configs/xtfpga.h     | 12 ++----------
 4 files changed, 10 insertions(+), 13 deletions(-)
Signature · 1 line
2.1.4
author maintainer
#1 lore raw

PATCH 1/2 board/cadence/xtfpga: move SYS_MONITOR_LEN to Kconfig

---
 board/cadence/xtfpga/Kconfig | 5 +++++
 include/configs/xtfpga.h     | 7 -------
 2 files changed, 5 insertions(+), 7 deletions(-)
board/cadence/xtfpga/Kconfig +5 -0
index 69296be49c7a..67ae3860b6d4 100644
@@ -36,4 +36,9 @@ config BOARD_SDRAM_SIZE
 	default 0x18000000 if XTFPGA_ML605
 	default 0x38000000 if XTFPGA_KC705
 
+config SYS_MONITOR_LEN
+	hex
+	default 0x00020000 if XTFPGA_LX60
+	default 0x00040000 if !XTFPGA_LX60
+
 endif
include/configs/xtfpga.h +0 -7
index 79cc1e8fc1b8..86c7e7cf279c 100644
@@ -59,13 +59,6 @@
 
 #define CONFIG_SYS_SDRAM_BASE		MEMADDR(0x00000000)
 
-/* Lx60 can only map 128kb memory (instead of 256kb) when running under OCD */
-#ifdef CONFIG_XTFPGA_LX60
-# define CONFIG_SYS_MONITOR_LEN		0x00020000	/* 128KB */
-#else
-# define CONFIG_SYS_MONITOR_LEN		0x00040000	/* 256KB */
-#endif
-
 #define CONFIG_SYS_MALLOC_LEN		(256 << 10)	/* heap  256KB */
 
 /* Linux boot param area in RAM (used only when booting linux) */
Signature · 1 line
2.1.4
#2 lore raw

PATCH 1/2 board/cadence/xtfpga: move SYS_MONITOR_LEN to Kconfig

Quoted 28 lines · Max Filippov
---
 board/cadence/xtfpga/Kconfig | 5 +++++
 include/configs/xtfpga.h     | 7 -------
 2 files changed, 5 insertions(+), 7 deletions(-)
board/cadence/xtfpga/Kconfig +5 -0
index 69296be49c7a..67ae3860b6d4 100644
@@ -36,4 +36,9 @@ config BOARD_SDRAM_SIZE
 	default 0x18000000 if XTFPGA_ML605
 	default 0x38000000 if XTFPGA_KC705
 
+config SYS_MONITOR_LEN
+	hex
+	default 0x00020000 if XTFPGA_LX60
+	default 0x00040000 if !XTFPGA_LX60
+
 endif
include/configs/xtfpga.h +0 -0
index 79cc1e8fc1b8..86c7e7cf279c 100644
@@ -59,13 +59,6 @@
 
 #define CONFIG_SYS_SDRAM_BASE		MEMADDR(0x00000000)
 

include/configs/xtfpga.h line 64

Quoted 10 lines
include/configs/xtfpga.h +0 -7
-/* Lx60 can only map 128kb memory (instead of 256kb) when running under OCD */
-#ifdef CONFIG_XTFPGA_LX60
-# define CONFIG_SYS_MONITOR_LEN		0x00020000	/* 128KB */
-#else
-# define CONFIG_SYS_MONITOR_LEN		0x00040000	/* 256KB */
-#endif
-
 #define CONFIG_SYS_MALLOC_LEN		(256 << 10)	/* heap  256KB */
 
 /* Linux boot param area in RAM (used only when booting linux) */

We need to migrate everyone, not just xtensa. This might be a tad tricky, so I'll put it on my plate. Thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180223/f64d10d8/attachment.sig>
author maintainer
#3 lore raw

PATCH 2/2 xtensa: clean up CONFIG_SYS_TEXT_ADDR

In reply to Max Filippov

Drop CONFIG_SYS_MEMORY_TOP. Rename CONFIG_SYS_TEXT_ADDR to XTENSA_SYS_TEXT_ADDR.

---
 arch/xtensa/cpu/start.S    | 2 +-
 arch/xtensa/cpu/u-boot.lds | 4 ++--
 include/configs/xtfpga.h   | 5 ++---
 3 files changed, 5 insertions(+), 6 deletions(-)
arch/xtensa/cpu/start.S +1 -1
index 8e4bc99e4295..cdb875da5339 100644
@@ -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
arch/xtensa/cpu/u-boot.lds +2 -2
index 853ae5a94891..7200bc59fbfc 100644
@@ -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))
include/configs/xtfpga.h +2 -3
index 86c7e7cf279c..d0b3b34571d2 100644
@@ -91,9 +91,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)
Signature · 1 line
2.1.4
#4 lore raw

PATCH 2/2 xtensa: clean up CONFIG_SYS_TEXT_ADDR

Quoted 4 lines · Max Filippov

Drop CONFIG_SYS_MEMORY_TOP. Rename CONFIG_SYS_TEXT_ADDR to XTENSA_SYS_TEXT_ADDR.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180223/35b8ba14/attachment.sig>