From 596c8450727ff2c9e2a8053e83280682d813c82f Mon Sep 17 00:00:00 2001
From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Wed, 4 Jun 2008 11:43:10 +0200
Subject: [memory layout]: streamline memory layout

Memory layout can now be specified via kconfig options. Two
possibilities exist: default layout means the layout is stack
/ malloc heap / U-Boot. The user can also specify fixed addresses
for each TEXT_BASE / stack / malloc heap.
---
 board/eco920/config.h   | 8 --------
 board/imx27ads/config.h | 7 -------
 board/ipe337/config.h   | 7 -------
 board/netx/config.h     | 6 ++++--
 board/pcm030/config.h   | 1 -
 board/pcm037/config.h   | 4 ----
 board/pcm038/config.h   | 5 -----
 board/scb9328/config.h  | 4 ----
 8 files changed, 4 insertions(+), 38 deletions(-)

(limited to 'board')

diff --git a/board/eco920/config.h b/board/eco920/config.h
index c023517719..9aa7dde98e 100644
--- a/board/eco920/config.h
+++ b/board/eco920/config.h
@@ -68,12 +68,6 @@
 #define SDRC_MR_VAL3	0x00000000 /* Normal Mode */
 #define SDRC_TR_VAL	0x000002E0 /* Write refresh rate */
 
-/*
- * Size of malloc() pool
- */
-#define CFG_MALLOC_LEN	(512*1024)
-#define CFG_GBL_DATA_SIZE	128	/* size in bytes reserved for initial data */
-
 #define CONFIG_BAUDRATE 115200
 
 /*
@@ -127,8 +121,6 @@
 #define CLOCK_TICK_RATE		AT91C_MASTER_CLOCK/2	/* AT91C_TC0_CMR is implicitly set to */
 							/* AT91C_TC_TIMER_DIV1_CLOCK */
 
-#define CONFIG_STACKSIZE	(32 * 1024)	/* regular stack */
-
 #define CONFIG_MISC_INIT_R      1       /* call misc_init_r() on init   */
 #define CFG_SPLASH		1
 #define CFG_S1D13706FB		1
diff --git a/board/imx27ads/config.h b/board/imx27ads/config.h
index 362fe9d29f..169ac0c9c3 100644
--- a/board/imx27ads/config.h
+++ b/board/imx27ads/config.h
@@ -21,11 +21,4 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-/* FIXME: ugly....should be simply part of the BSP file */
-
-#include <asm/mach-types.h>
-
-#define CFG_MALLOC_LEN		(4096 << 10)
-#define CONFIG_STACKSIZE	( 120 << 10)	/* stack size */
-
 #endif	/* __CONFIG_H */
diff --git a/board/ipe337/config.h b/board/ipe337/config.h
index 7799345f21..aa25d0792d 100644
--- a/board/ipe337/config.h
+++ b/board/ipe337/config.h
@@ -2,13 +2,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-/*
- * Board Layout
- */
-#define CONFIG_MALLOC_LEN	(16384 << 10)
-#define CONFIG_MALLOC_BASE	(TEXT_BASE - CONFIG_MALLOC_LEN)
-#define CONFIG_STACKBASE	(CONFIG_MALLOC_BASE - 4)
-
 /*
  * Clock settings
  */
diff --git a/board/netx/config.h b/board/netx/config.h
index f622f67fc8..ca15136817 100644
--- a/board/netx/config.h
+++ b/board/netx/config.h
@@ -1,2 +1,4 @@
-#define CFG_MALLOC_LEN             (4096 << 10)
-#define CONFIG_STACKSIZE   (120<<10)      /* stack size                 */
+#ifndef __CONFIG_H
+#define __CONFIG_H
+
+#endif	/* __CONFIG_H */
diff --git a/board/pcm030/config.h b/board/pcm030/config.h
index 339ea71f8b..16b7ba8518 100644
--- a/board/pcm030/config.h
+++ b/board/pcm030/config.h
@@ -87,7 +87,6 @@ IPB Bus clocking configuration.
 #define CFG_INIT_RAM_SIZE	MPC5XXX_SRAM_SIZE	/* End of used area in DPRAM */
 #define CONFIG_EARLY_INITDATA_SIZE 0x100
 
-#define CFG_MALLOC_LEN		(8 << 20)	/* Reserve 8 MB for malloc()	*/
 #define CFG_BOOTMAPSZ		(8 << 20)	/* Initial Memory map for Linux */
 
 /*------------------------------------------------------------------------------------------------------------------------------------------------------
diff --git a/board/pcm037/config.h b/board/pcm037/config.h
index aa79c8a575..5495d0309c 100644
--- a/board/pcm037/config.h
+++ b/board/pcm037/config.h
@@ -24,10 +24,6 @@
  * Definitions related to passing arguments to kernel.
  */
 
-#define CFG_MALLOC_LEN		(4096 << 10)
-
-#define CONFIG_STACKSIZE	(120<<10)      /* stack size		     */
-
 /* #define CONFIG_SYSPLL_CLK_FREQ	26000000 */
 
 /* FIXME */
diff --git a/board/pcm038/config.h b/board/pcm038/config.h
index 51f9bd9983..b3eed0bb3c 100644
--- a/board/pcm038/config.h
+++ b/board/pcm038/config.h
@@ -21,9 +21,4 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-/* FIXME: ugly....should be simply part of the BSP file */
-
-#define CFG_MALLOC_LEN		(4096 << 10)
-#define CONFIG_STACKSIZE	( 120 << 10)	/* stack size */
-
 #endif	/* __CONFIG_H */
diff --git a/board/scb9328/config.h b/board/scb9328/config.h
index 38e11549d9..cc22b7ae72 100644
--- a/board/scb9328/config.h
+++ b/board/scb9328/config.h
@@ -24,10 +24,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define CFG_MALLOC_LEN		(4096 << 10)
-
-#define CONFIG_STACKSIZE	(120<<10)      /* stack size		     */
-
 #define CONFIG_SYSPLL_CLK_FREQ 16000000
 
 #endif	/* __CONFIG_H */
-- 
cgit v1.2.3