From 9f63f02755f4cbdb8ee39d8da605d2f643aae220 Mon Sep 17 00:00:00 2001
From: Ovidiu Panait <ovidiu.panait@windriver.com>
Date: Fri, 24 Jul 2020 14:12:11 +0300
Subject: [PATCH] Kconfig: Convert CONFIG_SYS_SRAM_SIZE to Kconfig

This converts ad-hoc CONFIG_SYS_SRAM_SIZE to Kconfig.

Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
---
 Kconfig                       | 7 +++++++
 include/configs/devkit8000.h  | 1 -
 include/configs/pic32mzdask.h | 2 --
 include/configs/tricorder.h   | 1 -
 scripts/config_whitelist.txt  | 1 -
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Kconfig b/Kconfig
index 9f7707a652..583d39d1a3 100644
--- a/Kconfig
+++ b/Kconfig
@@ -395,6 +395,13 @@ config SYS_SRAM_BASE
 	default 0x80000000 if TARGET_PIC32MZDASK
 	default 0x0
 
+config SYS_SRAM_SIZE
+	hex
+	default 0x00080000 if TARGET_PIC32MZDASK
+	default 0x10000 if TARGET_DEVKIT8000
+	default 0x10000 if TARGET_TRICORDER
+	default 0x0
+
 endmenu		# General setup
 
 menu "Boot images"
diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h
index 5ef0fe7f92..4a28712833 100644
--- a/include/configs/devkit8000.h
+++ b/include/configs/devkit8000.h
@@ -139,7 +139,6 @@
 
 /* SRAM config */
 #define CONFIG_SYS_SRAM_START              0x40200000
-#define CONFIG_SYS_SRAM_SIZE               0x10000
 
 /* Defines for SPL */
 
diff --git a/include/configs/pic32mzdask.h b/include/configs/pic32mzdask.h
index 25b898f2e6..d50edc7715 100644
--- a/include/configs/pic32mzdask.h
+++ b/include/configs/pic32mzdask.h
@@ -19,8 +19,6 @@
 /*----------------------------------------------------------------------
  * Memory Layout
  */
-#define CONFIG_SYS_SRAM_SIZE		0x00080000 /* 512K */
-
 /* Initial RAM for temporary stack, global data */
 #define CONFIG_SYS_INIT_RAM_SIZE	0x10000
 #define CONFIG_SYS_INIT_RAM_ADDR	\
diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h
index 02f57281af..b3ae350b77 100644
--- a/include/configs/tricorder.h
+++ b/include/configs/tricorder.h
@@ -199,7 +199,6 @@
 
 /* SRAM config */
 #define CONFIG_SYS_SRAM_START		0x40200000
-#define CONFIG_SYS_SRAM_SIZE		0x10000
 
 /* Defines for SPL */
 
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 1345cef134..0d526cf045 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -3715,7 +3715,6 @@ CONFIG_SYS_SPL_LEN
 CONFIG_SYS_SPL_MALLOC_SIZE
 CONFIG_SYS_SPL_MALLOC_START
 CONFIG_SYS_SPR
-CONFIG_SYS_SRAM_SIZE
 CONFIG_SYS_SRAM_START
 CONFIG_SYS_SRIO
 CONFIG_SYS_SRIO1_MEM_BASE
-- 
2.39.5