[U-Boot,1/2] board/cadence/xtfpga: move SYS_MONITOR_LEN to Kconfig

Message ID 1518478759-11609-2-git-send-email-jcmvbkbc@gmail.com
State New
Delegated to: Tom Rini
Headers show
Series
  • xtensa: clean up SYS_MONITOR_LEN/SYS_TEXT_ADDR
Related show

Commit Message

Max Filippov Feb. 12, 2018, 11:39 p.m.
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
---
 board/cadence/xtfpga/Kconfig | 5 +++++
 include/configs/xtfpga.h     | 7 -------
 2 files changed, 5 insertions(+), 7 deletions(-)

Comments

Tom Rini Feb. 24, 2018, 3:23 a.m. | #1
On Mon, Feb 12, 2018 at 03:39:18PM -0800, Max Filippov wrote:

> Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
> ---
>  board/cadence/xtfpga/Kconfig | 5 +++++
>  include/configs/xtfpga.h     | 7 -------
>  2 files changed, 5 insertions(+), 7 deletions(-)
> 
> diff --git a/board/cadence/xtfpga/Kconfig b/board/cadence/xtfpga/Kconfig
> index 69296be49c7a..67ae3860b6d4 100644
> --- a/board/cadence/xtfpga/Kconfig
> +++ b/board/cadence/xtfpga/Kconfig
> @@ -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
> diff --git a/include/configs/xtfpga.h b/include/configs/xtfpga.h
> index 79cc1e8fc1b8..86c7e7cf279c 100644
> --- a/include/configs/xtfpga.h
> +++ b/include/configs/xtfpga.h
> @@ -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) */

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

Patch

diff --git a/board/cadence/xtfpga/Kconfig b/board/cadence/xtfpga/Kconfig
index 69296be49c7a..67ae3860b6d4 100644
--- a/board/cadence/xtfpga/Kconfig
+++ b/board/cadence/xtfpga/Kconfig
@@ -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
diff --git a/include/configs/xtfpga.h b/include/configs/xtfpga.h
index 79cc1e8fc1b8..86c7e7cf279c 100644
--- a/include/configs/xtfpga.h
+++ b/include/configs/xtfpga.h
@@ -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) */