[U-Boot] [PATCH V2] ARM: Fix malloc area size for versatile and integrator

Marek Vasut marex at denx.de
Sat Nov 3 10:11:27 CET 2012


These boards couldn't save their environment because they couldn't malloc()
the whole size of the sector.

Signed-off-by: Marek Vasut <marex at denx.de>
Cc: Linus Walleij <linus.walleij at linaro.org>
---
 include/configs/integrator-common.h |    3 ++-
 include/configs/versatile.h         |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

V2: Align with current code

diff --git a/include/configs/integrator-common.h b/include/configs/integrator-common.h
index 564b418..51227e7 100644
--- a/include/configs/integrator-common.h
+++ b/include/configs/integrator-common.h
@@ -37,7 +37,8 @@
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
 #define CONFIG_SYS_MAXARGS		16	/* max number of command args */
 #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size*/
-#define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + 128*1024) /* Size of malloc() pool */
+/* Size of malloc() pool */
+#define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SECT_SIZE + 128*1024)
 
 #define CONFIG_CMDLINE_TAG		/* enable passing of ATAGs  */
 #define CONFIG_SETUP_MEMORY_TAGS
diff --git a/include/configs/versatile.h b/include/configs/versatile.h
index a65c676..2484881 100644
--- a/include/configs/versatile.h
+++ b/include/configs/versatile.h
@@ -71,7 +71,7 @@
  * Size of malloc() pool
  */
 #define CONFIG_ENV_SIZE			8192
-#define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + 128 * 1024)
+#define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SECT_SIZE + 128 * 1024)
 
 /*
  * Hardware drivers
-- 
1.7.10.4



More information about the U-Boot mailing list