7 files changed, 17 insertions, 38 deletions
diff --git a/c/src/lib/libbsp/arm/ChangeLog b/c/src/lib/libbsp/arm/ChangeLog
index 260395b096..590255eddd 100644
--- a/c/src/lib/libbsp/arm/ChangeLog
+++ b/c/src/lib/libbsp/arm/ChangeLog
@@ -1,3 +1,20 @@
+2008-05-15	Joel Sherrill <joel.sherrill@OARcorp.com>
+
+	* csb336/startup/bspstart.c, csb337/startup/bspstart.c,
+	edb7312/startup/bspstart.c, gba/startup/bspstart.c,
+	gp32/startup/bspstart.c, rtl22xx/startup/bspstart.c: Add capability
+	for bootcard.c BSP Initialization Framework to ask the BSP where it
+	has memory for the RTEMS Workspace and C Program Heap. These
+	collectively are referred to as work area. If the BSP supports this,
+	then it does not have to include code to split the available memory
+	between the two areas. This reduces the amount of code in the BSP
+	specific bspstart.c file. Additionally, the shared framework can
+	initialize the C Library, call rtems_debug_enable(), and dirty the
+	work area memory. Until most/all BSPs support this new capability, if
+	the BSP supports this, it should call
+	RTEMS_BSP_BOOTCARD_HANDLES_RAM_ALLOCATION from its configure.ac. When
+	the transition is complete, this autoconf macro can be removed.
+
 2008-05-06	Ray Xu <rayx.cn@gmail.com>
 
 	* acinclude.m4: Add smdk2410. Update gp32 to use shared code.
diff --git a/c/src/lib/libbsp/arm/csb336/startup/bspstart.c b/c/src/lib/libbsp/arm/csb336/startup/bspstart.c
index a4fbdbc113..d132fb8f41 100644
--- a/c/src/lib/libbsp/arm/csb336/startup/bspstart.c
+++ b/c/src/lib/libbsp/arm/csb336/startup/bspstart.c
@@ -56,13 +56,6 @@ void bsp_pretasking_hook(void)
 
     /* call rtems lib init - malloc stuff */
     bsp_libc_init((void *)heap_start, heap_size, 0);
-
-#ifdef RTEMS_DEBUG
-
-    rtems_debug_enable(RTEMS_DEBUG_ALL_MASK);
-
-#endif /* RTEMS_DEBUG */
-
 } 
  
 
diff --git a/c/src/lib/libbsp/arm/csb337/startup/bspstart.c b/c/src/lib/libbsp/arm/csb337/startup/bspstart.c
index 7f6fe4b903..2484cfe24c 100644
--- a/c/src/lib/libbsp/arm/csb337/startup/bspstart.c
+++ b/c/src/lib/libbsp/arm/csb337/startup/bspstart.c
@@ -60,13 +60,6 @@ void bsp_pretasking_hook(void)
 
     /* call rtems lib init - malloc stuff */
     bsp_libc_init((void *)heap_start, heap_size, 0);
-
-#ifdef RTEMS_DEBUG
-
-    rtems_debug_enable(RTEMS_DEBUG_ALL_MASK);
-
-#endif /* RTEMS_DEBUG */
-
 } 
  
 
diff --git a/c/src/lib/libbsp/arm/edb7312/startup/bspstart.c b/c/src/lib/libbsp/arm/edb7312/startup/bspstart.c
index e85c4445be..b03933c1c9 100644
--- a/c/src/lib/libbsp/arm/edb7312/startup/bspstart.c
+++ b/c/src/lib/libbsp/arm/edb7312/startup/bspstart.c
@@ -79,12 +79,6 @@ void bsp_pretasking_hook(void)
 
     bsp_libc_init((void *)heap_start, heap_size, 0);
 
-#ifdef RTEMS_DEBUG
-
-  rtems_debug_enable(RTEMS_DEBUG_ALL_MASK);
-
-#endif /* RTEMS_DEBUG */
-
 } /* bsp_pretasking_hook */
 
 /**************************************************************************/
diff --git a/c/src/lib/libbsp/arm/gba/startup/bspstart.c b/c/src/lib/libbsp/arm/gba/startup/bspstart.c
index 8ee67e993c..2de543821f 100644
--- a/c/src/lib/libbsp/arm/gba/startup/bspstart.c
+++ b/c/src/lib/libbsp/arm/gba/startup/bspstart.c
@@ -89,11 +89,6 @@ void bsp_pretasking_hook(void)
 
   rtemsFreeMemStart += _heap_size;
 
-
-#ifdef RTEMS_DEBUG
-  rtems_debug_enable(RTEMS_DEBUG_ALL_MASK);
-#endif /* RTEMS_DEBUG */
-
 #if BSP_DEBUG
   /*  The following information is very useful when debugging. */
   printk("[bsp_pretasking_hook]\n");
diff --git a/c/src/lib/libbsp/arm/gp32/startup/bspstart.c b/c/src/lib/libbsp/arm/gp32/startup/bspstart.c
index 35a0f481e2..7a226cb882 100644
--- a/c/src/lib/libbsp/arm/gp32/startup/bspstart.c
+++ b/c/src/lib/libbsp/arm/gp32/startup/bspstart.c
@@ -61,12 +61,6 @@ void bsp_pretasking_hook(void)
     /* call rtems lib init - malloc stuff */
     bsp_libc_init((void *)heap_start, heap_size, 0);
 
-#ifdef RTEMS_DEBUG
-
-    rtems_debug_enable(RTEMS_DEBUG_ALL_MASK);
-
-#endif /* RTEMS_DEBUG */
-
 } /* bsp_pretasking_hook */
 
 Thread bsp_idle_task(uint32_t ignored)
diff --git a/c/src/lib/libbsp/arm/rtl22xx/startup/bspstart.c b/c/src/lib/libbsp/arm/rtl22xx/startup/bspstart.c
index 2ec5ffd3c6..8a1616d033 100644
--- a/c/src/lib/libbsp/arm/rtl22xx/startup/bspstart.c
+++ b/c/src/lib/libbsp/arm/rtl22xx/startup/bspstart.c
@@ -85,13 +85,6 @@ void bsp_pretasking_hook(void)
     heap_size = 0x40000;
 
     bsp_libc_init((void *)heap_start, heap_size, 0);
-
-#ifdef RTEMS_DEBUG
-
-    rtems_debug_enable(RTEMS_DEBUG_ALL_MASK);
-
-#endif /* RTEMS_DEBUG */
-
 } /* bsp_pretasking_hook */
 
 /**************************************************************************/