rockchip: Move config SYS_MALLOC_LEN to Kconfig

Use Kconfig for option SYS_MALLOC_LEN and default to 0x2000000.

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

diff --git a/Kconfig b/Kconfig
index d2eb744e7023431bfeb013dc0c5f7d5618dbdaaa..d5538dd3f4b21dcde8748b27067a934d6e847982 100644 (file)
--- 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 66331a137667b779cab23da66815f3c8bf835f94..7f148eff87e56d376c74c51de138175a43f9478a 100644 (file)
--- 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 d12696d6b37fa0c57da76cb39da9f6037b73dbf3..be55fb73ed04e82736ecfb1543056f29278708d8 100644 (file)
--- 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 44e8d0ccd2b6c0896b1b400cc8eda96c27738e16..3bcc04808a3c00d070c0ffd089201627f15d0093 100644 (file)
--- 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 f2fb7e07b9b1e79b33325bf1e8c00a4380b81e81..7e0c831174a33ac928c3fda117d04f9038e85639 100644 (file)
--- 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 84b474ac7bc06078d9df9d279a0dba5dbceae962..4a62da3ef71ecffe3bae5d1e93c701d98138137c 100644 (file)
--- 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 6ed7525304cc96a73c24b1834685b4d698f6836c..f8b56bae4f93162ab6ad625a1842ca0de9ede718 100644 (file)
--- 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 340413dbbad3f82dd9c3b0a92a835f77eb22d3bc..e4b2114a0dd5f2d9aab2d9b3a994844cbbc4a8ce 100644 (file)
--- 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 12ad60d4439f559375fd8d028eb5c0ad7cbec534..a5e69b26ad0e8d19de70e16423711c2f2486f954 100644 (file)
--- 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 691aa51e9873c117b9e03efd09c5ab98790e8ff1..758e85e89df701dca3a14d0a603bab743e26c8f9 100644 (file)
--- 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