[U-Boot] [PATCH] rockchip: Move config SYS_MALLOC_LEN to Kconfig

Kever Yang kever.yang at rock-chips.com
Mon Aug 19 07:04:04 UTC 2019


Use Kconfig for option SYS_MALLOC_LEN and default to 0x2000000.

Signed-off-by: Kever Yang <kever.yang at rock-chips.com>
---

 Kconfig                         | 3 ++-
 include/configs/rk3036_common.h | 1 -
 include/configs/rk3128_common.h | 1 -
 include/configs/rk3188_common.h | 1 -
 include/configs/rk322x_common.h | 1 -
 include/configs/rk3288_common.h | 1 -
 include/configs/rk3328_common.h | 1 -
 include/configs/rk3368_common.h | 1 -
 include/configs/rk3399_common.h | 1 -
 include/configs/rv1108_common.h | 1 -
 10 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/Kconfig b/Kconfig
index d2eb744e70..d5538dd3f4 100644
--- a/Kconfig
+++ b/Kconfig
@@ -156,7 +156,8 @@ config SYS_MALLOC_F_LEN
 
 config SYS_MALLOC_LEN
 	hex "Define memory for Dynamic allocation"
-	depends on ARCH_ZYNQ || ARCH_VERSAL || ARCH_STM32MP
+	depends on ARCH_ZYNQ || ARCH_VERSAL || ARCH_STM32MP || ARCH_ROCKCHIP
+	default 0x2000000 if ARCH_ROCKCHIP
 	help
 	  This defines memory to be allocated for Dynamic allocation
 	  TODO: Use for other architectures
diff --git a/include/configs/rk3036_common.h b/include/configs/rk3036_common.h
index 66331a1376..7f148eff87 100644
--- a/include/configs/rk3036_common.h
+++ b/include/configs/rk3036_common.h
@@ -8,7 +8,6 @@
 #include <asm/arch-rockchip/hardware.h>
 #include "rockchip-common.h"
 
-#define CONFIG_SYS_MALLOC_LEN		(32 << 20)
 #define CONFIG_SYS_CBSIZE		1024
 #define CONFIG_SKIP_LOWLEVEL_INIT
 
diff --git a/include/configs/rk3128_common.h b/include/configs/rk3128_common.h
index d12696d6b3..be55fb73ed 100644
--- a/include/configs/rk3128_common.h
+++ b/include/configs/rk3128_common.h
@@ -10,7 +10,6 @@
 
 #define CONFIG_SYS_MAXARGS		16
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_MALLOC_LEN		(32 << 20)
 #define CONFIG_SYS_CBSIZE		1024
 #define CONFIG_SKIP_LOWLEVEL_INIT
 
diff --git a/include/configs/rk3188_common.h b/include/configs/rk3188_common.h
index 44e8d0ccd2..3bcc04808a 100644
--- a/include/configs/rk3188_common.h
+++ b/include/configs/rk3188_common.h
@@ -12,7 +12,6 @@
 #include "rockchip-common.h"
 
 #define CONFIG_SKIP_LOWLEVEL_INIT_ONLY
-#define CONFIG_SYS_MALLOC_LEN		(32 << 20)
 #define CONFIG_SYS_CBSIZE		1024
 
 #ifdef CONFIG_SPL_ROCKCHIP_BACK_TO_BROM
diff --git a/include/configs/rk322x_common.h b/include/configs/rk322x_common.h
index f2fb7e07b9..7e0c831174 100644
--- a/include/configs/rk322x_common.h
+++ b/include/configs/rk322x_common.h
@@ -9,7 +9,6 @@
 #include "rockchip-common.h"
 
 #define CONFIG_SKIP_LOWLEVEL_INIT
-#define CONFIG_SYS_MALLOC_LEN		(32 << 20)
 #define CONFIG_SYS_CBSIZE		1024
 #define CONFIG_SYS_BOOTM_LEN	(64 << 20)	/*  64M */
 
diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h
index 84b474ac7b..4a62da3ef7 100644
--- a/include/configs/rk3288_common.h
+++ b/include/configs/rk3288_common.h
@@ -12,7 +12,6 @@
 #define CONFIG_SYS_BOOTM_LEN (16 << 20) /* 16MB */
 
 #define CONFIG_SKIP_LOWLEVEL_INIT_ONLY
-#define CONFIG_SYS_MALLOC_LEN		(32 << 20)
 #define CONFIG_SYS_CBSIZE		1024
 
 #define CONFIG_ROCKCHIP_STIMER_BASE	0xff810020
diff --git a/include/configs/rk3328_common.h b/include/configs/rk3328_common.h
index 6ed7525304..f8b56bae4f 100644
--- a/include/configs/rk3328_common.h
+++ b/include/configs/rk3328_common.h
@@ -12,7 +12,6 @@
 
 #define CONFIG_ROCKCHIP_STIMER_BASE    0xff1d0020
 
-#define CONFIG_SYS_MALLOC_LEN		(32 << 20)
 #define CONFIG_SYS_CBSIZE		1024
 #define CONFIG_SKIP_LOWLEVEL_INIT
 
diff --git a/include/configs/rk3368_common.h b/include/configs/rk3368_common.h
index 340413dbba..e4b2114a0d 100644
--- a/include/configs/rk3368_common.h
+++ b/include/configs/rk3368_common.h
@@ -16,7 +16,6 @@
 #define CONFIG_SYS_SDRAM_BASE		0
 #define SDRAM_MAX_SIZE			0xff000000
 #define CONFIG_BAUDRATE			115200
-#define CONFIG_SYS_MALLOC_LEN		(32 << 20)
 #define CONFIG_SYS_CBSIZE		1024
 #define CONFIG_SKIP_LOWLEVEL_INIT
 
diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h
index 12ad60d443..a5e69b26ad 100644
--- a/include/configs/rk3399_common.h
+++ b/include/configs/rk3399_common.h
@@ -8,7 +8,6 @@
 
 #include "rockchip-common.h"
 
-#define CONFIG_SYS_MALLOC_LEN		(32 << 20)
 #define CONFIG_SYS_CBSIZE		1024
 #define CONFIG_SKIP_LOWLEVEL_INIT
 
diff --git a/include/configs/rv1108_common.h b/include/configs/rv1108_common.h
index 691aa51e98..758e85e89d 100644
--- a/include/configs/rv1108_common.h
+++ b/include/configs/rv1108_common.h
@@ -10,7 +10,6 @@
 
 #define CONFIG_IRAM_BASE		0x10080000
 
-#define CONFIG_SYS_MALLOC_LEN		(32 << 20)
 #define CONFIG_SYS_CBSIZE		1024
 #define CONFIG_SKIP_LOWLEVEL_INIT
 
-- 
2.17.1



More information about the U-Boot mailing list