2008-09-19 Joel Sherrill <joel.sherrill@oarcorp.com>

	* Makefile.am, startup/linkcmds: Use top level shared
	bsp_get_work_area() implementation.

18 files changed, 61 insertions, 7 deletions

diff --git a/c/src/lib/libbsp/arm/csb336/ChangeLog b/c/src/lib/libbsp/arm/csb336/ChangeLog
index 5164f2999d..59aa6cead8 100644
--- a/c/src/lib/libbsp/arm/csb336/ChangeLog
+++ b/c/src/lib/libbsp/arm/csb336/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-19	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* Makefile.am, startup/linkcmds: Use top level shared
+	bsp_get_work_area() implementation.
+
 2008-09-16	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* startup/bspstart.c: Remove unnecessary includes of
diff --git a/c/src/lib/libbsp/arm/csb336/Makefile.am b/c/src/lib/libbsp/arm/csb336/Makefile.am
index 44aacbbf76..d8a0afb841 100644
--- a/c/src/lib/libbsp/arm/csb336/Makefile.am
+++ b/c/src/lib/libbsp/arm/csb336/Makefile.am
@@ -26,7 +26,7 @@ project_lib_DATA = start.$(OBJEXT)
 dist_project_lib_DATA += startup/linkcmds
 
 startup_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \
-    ../shared/bspgetworkarea.c ../../shared/bsppretaskinghook.c \
+    ../../shared/bspgetworkarea.c ../../shared/bsppretaskinghook.c \
     ../../shared/bsppredriverhook.c startup/bspstart.c startup/bspclean.c \
     startup/memmap.c ../../shared/bootcard.c ../../shared/sbrk.c \
     ../../shared/gnatinstallhandler.c
diff --git a/c/src/lib/libbsp/arm/csb336/startup/linkcmds b/c/src/lib/libbsp/arm/csb336/startup/linkcmds
index edbec63fae..4c7b6fedfb 100644
--- a/c/src/lib/libbsp/arm/csb336/startup/linkcmds
+++ b/c/src/lib/libbsp/arm/csb336/startup/linkcmds
@@ -30,6 +30,9 @@ MEMORY {
 _sdram_base = DEFINED(_sdram_base) ? _sdram_base : 0x08200000;
 _sdram_size = DEFINED(_sdram_size) ? _sdram_size : 30M;
 
+RamBase = _sdram_base;
+RamSize = _sdram_size;
+HeapSize = DEFINED(HeapSize) ? HeapSize : 0x0;
 
 _irq_stack_size = DEFINED(_irq_stack_size) ? _irq_stack_size : 0x1000;
 _fiq_stack_size = DEFINED(_fiq_stack_size) ? _fiq_stack_size : 0x400;
@@ -198,6 +201,7 @@ SECTIONS
 
 	. = ALIGN (1024);
 	_bss_free_start = .;
+	WorkAreaBase = .;
 
   } > sdram
 
diff --git a/c/src/lib/libbsp/arm/csb337/ChangeLog b/c/src/lib/libbsp/arm/csb337/ChangeLog
index 2ca7f13dd2..11ddbae629 100644
--- a/c/src/lib/libbsp/arm/csb337/ChangeLog
+++ b/c/src/lib/libbsp/arm/csb337/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-19	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* Makefile.am, startup/linkcmds: Use top level shared
+	bsp_get_work_area() implementation.
+
 2008-09-16	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* startup/bspstart.c: Remove unnecessary includes of
diff --git a/c/src/lib/libbsp/arm/csb337/Makefile.am b/c/src/lib/libbsp/arm/csb337/Makefile.am
index e7cd71141f..a835e38e9f 100644
--- a/c/src/lib/libbsp/arm/csb337/Makefile.am
+++ b/c/src/lib/libbsp/arm/csb337/Makefile.am
@@ -26,7 +26,7 @@ project_lib_DATA = start.$(OBJEXT)
 dist_project_lib_DATA += startup/linkcmds
 
 startup_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \
-    ../../shared/bsppredriverhook.c ../shared/bspgetworkarea.c \
+    ../../shared/bsppredriverhook.c ../../shared/bspgetworkarea.c \
     ../../shared/bsppretaskinghook.c startup/bspstart.c startup/bspclean.c \
     startup/memmap.c ../../shared/bootcard.c ../../shared/sbrk.c \
     ../../shared/gnatinstallhandler.c
diff --git a/c/src/lib/libbsp/arm/csb337/startup/linkcmds b/c/src/lib/libbsp/arm/csb337/startup/linkcmds
index 6feb2a7b4a..e85916756d 100644
--- a/c/src/lib/libbsp/arm/csb337/startup/linkcmds
+++ b/c/src/lib/libbsp/arm/csb337/startup/linkcmds
@@ -29,6 +29,9 @@ MEMORY
 _sdram_base = DEFINED(_sdram_base) ? _sdram_base : 0x20100000;
 _sdram_size = DEFINED(_sdram_size) ? _sdram_size : 15M;
 
+RamBase = _sdram_base;
+RamSize = _sdram_size;
+HeapSize = DEFINED(HeapSize) ? HeapSize : 0x0;
 
 _sram_base = DEFINED(_sram_base) ? _sram_base : 0x00000000;
 _sram_size = DEFINED(_sram_size) ? _sram_size : 16K;
@@ -183,6 +186,7 @@ SECTIONS
 
 	. = ALIGN (1024);
 	_bss_free_start = .;
+	WorkAreaBase = .;
 
     } > sdram
 
diff --git a/c/src/lib/libbsp/arm/edb7312/ChangeLog b/c/src/lib/libbsp/arm/edb7312/ChangeLog
index 16e6bb14b7..f0d3cf95d8 100644
--- a/c/src/lib/libbsp/arm/edb7312/ChangeLog
+++ b/c/src/lib/libbsp/arm/edb7312/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-19	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* Makefile.am, startup/linkcmds: Use top level shared
+	bsp_get_work_area() implementation.
+
 2008-09-16	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* startup/bspstart.c: Remove unnecessary includes of
diff --git a/c/src/lib/libbsp/arm/edb7312/Makefile.am b/c/src/lib/libbsp/arm/edb7312/Makefile.am
index 388e539164..5260503698 100644
--- a/c/src/lib/libbsp/arm/edb7312/Makefile.am
+++ b/c/src/lib/libbsp/arm/edb7312/Makefile.am
@@ -28,7 +28,7 @@ dist_project_lib_DATA += startup/linkcmds
 
 include_HEADERS += ../../arm/shared/comm/uart.h
 startup_SOURCES = ../../shared/bsppost.c ../../shared/bsplibc.c \
-    ../shared/bspgetworkarea.c ../../shared/bsppretaskinghook.c \
+    ../../shared/bspgetworkarea.c ../../shared/bsppretaskinghook.c \
     ../../shared/bsppredriverhook.c startup/bspstart.c \
     startup/bspclean.c ../../shared/bootcard.c ../../shared/sbrk.c \
     ../../shared/gnatinstallhandler.c
diff --git a/c/src/lib/libbsp/arm/edb7312/startup/linkcmds b/c/src/lib/libbsp/arm/edb7312/startup/linkcmds
index 95c7ec2074..0f7ec01bbe 100644
--- a/c/src/lib/libbsp/arm/edb7312/startup/linkcmds
+++ b/c/src/lib/libbsp/arm/edb7312/startup/linkcmds
@@ -30,6 +30,9 @@ MEMORY {
 _sdram_base = DEFINED(_sdram_base) ? _sdram_base : 0x00000000;
 _sdram_size = DEFINED(_sdram_size) ? _sdram_size : 16M;
 
+RamBase = _sdram_base;
+RamSize = _sdram_size;
+HeapSize = DEFINED(HeapSize) ? HeapSize : 0x0;
 
 _irq_stack_size = DEFINED(_irq_stack_size) ? _irq_stack_size : 0x1000;
 _fiq_stack_size = DEFINED(_fiq_stack_size) ? _fiq_stack_size : 0x400;
@@ -185,6 +188,7 @@ SECTIONS
 
 	. = ALIGN (1024);
 	_bss_free_start = .;
+	WorkAreaBase = .;
 
   } > sdram
 
diff --git a/c/src/lib/libbsp/arm/gp32/ChangeLog b/c/src/lib/libbsp/arm/gp32/ChangeLog
index 67d10d8ba4..1394a3ae52 100644
--- a/c/src/lib/libbsp/arm/gp32/ChangeLog
+++ b/c/src/lib/libbsp/arm/gp32/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-19	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* Makefile.am, startup/linkcmds: Use top level shared
+	bsp_get_work_area() implementation.
+
 2008-09-16	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* startup/bspstart.c: Remove unnecessary includes of
diff --git a/c/src/lib/libbsp/arm/gp32/Makefile.am b/c/src/lib/libbsp/arm/gp32/Makefile.am
index a978b2de91..384c1f8c31 100644
--- a/c/src/lib/libbsp/arm/gp32/Makefile.am
+++ b/c/src/lib/libbsp/arm/gp32/Makefile.am
@@ -27,7 +27,7 @@ project_lib_DATA = start.$(OBJEXT)
 dist_project_lib_DATA += startup/linkcmds
 
 startup_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \
-    ../../shared/bsppredriverhook.c ../shared/bspgetworkarea.c \
+    ../../shared/bsppredriverhook.c ../../shared/bspgetworkarea.c \
     ../../shared/bsppretaskinghook.c startup/bspstart.c startup/bspclean.c \
     startup/memmap.c ../../shared/bootcard.c ../../shared/sbrk.c \
     ../../shared/gnatinstallhandler.c
diff --git a/c/src/lib/libbsp/arm/gp32/startup/linkcmds b/c/src/lib/libbsp/arm/gp32/startup/linkcmds
index 86ea44c7d3..619efc2db3 100644
--- a/c/src/lib/libbsp/arm/gp32/startup/linkcmds
+++ b/c/src/lib/libbsp/arm/gp32/startup/linkcmds
@@ -28,6 +28,9 @@ MEMORY {
 _sdram_base = DEFINED(_sdram_base) ? _sdram_base : 0xc000000;
 _sdram_size = DEFINED(_sdram_size) ? _sdram_size : 7M;
 
+RamBase = _sdram_base;
+RamSize = _sdram_size;
+HeapSize = DEFINED(HeapSize) ? HeapSize : 0x0;
 
 _irq_stack_size = DEFINED(_irq_stack_size) ? _irq_stack_size : 0x1000;
 _fiq_stack_size = DEFINED(_fiq_stack_size) ? _fiq_stack_size : 0x400;
@@ -225,6 +228,7 @@ SECTIONS
 
 	. = ALIGN (1024);
 	_bss_free_start = .;
+	WorkAreaBase = .;
 
   } > sdram
   _axf_bss_end = . ;
diff --git a/c/src/lib/libbsp/arm/rtl22xx/ChangeLog b/c/src/lib/libbsp/arm/rtl22xx/ChangeLog
index 5367451ad2..90b3aac480 100644
--- a/c/src/lib/libbsp/arm/rtl22xx/ChangeLog
+++ b/c/src/lib/libbsp/arm/rtl22xx/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-19	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* Makefile.am, startup/linkcmds: Use top level shared
+	bsp_get_work_area() implementation.
+
 2008-09-16	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* startup/bspstart.c: Remove unnecessary includes of
diff --git a/c/src/lib/libbsp/arm/rtl22xx/Makefile.am b/c/src/lib/libbsp/arm/rtl22xx/Makefile.am
index b991bb9375..d8c85eb4c7 100644
--- a/c/src/lib/libbsp/arm/rtl22xx/Makefile.am
+++ b/c/src/lib/libbsp/arm/rtl22xx/Makefile.am
@@ -29,7 +29,7 @@ dist_project_lib_DATA += startup/linkcmds
 include_HEADERS += ../../arm/shared/comm/uart.h
 startup_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \
     ../../shared/bsppredriverhook.c ../../shared/bsppretaskinghook.c \
-    ../shared/bspgetworkarea.c startup/bspstart.c startup/bspclean.c \
+    ../../shared/bspgetworkarea.c startup/bspstart.c startup/bspclean.c \
     ../../shared/bootcard.c ../../shared/sbrk.c \
     ../../shared/gnatinstallhandler.c
 console_SOURCES = ../../shared/console.c
diff --git a/c/src/lib/libbsp/arm/rtl22xx/startup/linkcmds b/c/src/lib/libbsp/arm/rtl22xx/startup/linkcmds
index c46e83de74..63cfc648d1 100644
--- a/c/src/lib/libbsp/arm/rtl22xx/startup/linkcmds
+++ b/c/src/lib/libbsp/arm/rtl22xx/startup/linkcmds
@@ -34,6 +34,9 @@ MEMORY {
 _sdram_base = DEFINED(_sdram_base) ? _sdram_base : 0x81000000;
 _sdram_size = DEFINED(_sdram_size) ? _sdram_size : 512K;
 
+RamBase = _sdram_base;
+RamSize = _sdram_size;
+HeapSize = DEFINED(HeapSize) ? HeapSize : 0x0;
 
 _irq_stack_size = DEFINED(_irq_stack_size) ? _irq_stack_size : 0x100;
 _fiq_stack_size = DEFINED(_fiq_stack_size) ? _fiq_stack_size : 0x50;
@@ -190,8 +193,9 @@ SECTIONS
 	_end = .;
 	__end = .;
 
-	_bss_free_start = .;
 	. = ALIGN (0x10);
+	_bss_free_start = .;
+	WorkAreaBase = .;
   } > sdram
 
 /*
diff --git a/c/src/lib/libbsp/arm/smdk2410/ChangeLog b/c/src/lib/libbsp/arm/smdk2410/ChangeLog
index a9f470d822..949d976f18 100644
--- a/c/src/lib/libbsp/arm/smdk2410/ChangeLog
+++ b/c/src/lib/libbsp/arm/smdk2410/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-19	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* Makefile.am, startup/linkcmds: Use top level shared
+	bsp_get_work_area() implementation.
+
 2008-09-14	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* Makefile.am, configure.ac, include/bspopts.h.in: Split out
diff --git a/c/src/lib/libbsp/arm/smdk2410/Makefile.am b/c/src/lib/libbsp/arm/smdk2410/Makefile.am
index 7e31bd8c02..7a562c0ce0 100644
--- a/c/src/lib/libbsp/arm/smdk2410/Makefile.am
+++ b/c/src/lib/libbsp/arm/smdk2410/Makefile.am
@@ -29,7 +29,7 @@ startup_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \
     ../gp32/startup/bspstart.c ../gp32/startup/bspclean.c startup/memmap.c \
     ../../shared/bootcard.c ../../shared/sbrk.c \
     ../../shared/bsppretaskinghook.c  \
-    ../../shared/bsppredriverhook.c ../shared/bspgetworkarea.c \
+    ../../shared/bsppredriverhook.c ../../shared/bspgetworkarea.c \
     ../../shared/gnatinstallhandler.c
 console_SOURCES = ../gp32/console/uart.c ../../shared/console.c
 abort_SOURCES = ../shared/abort/abort.c
diff --git a/c/src/lib/libbsp/arm/smdk2410/startup/linkcmds b/c/src/lib/libbsp/arm/smdk2410/startup/linkcmds
index 5000fd97f3..0285d61747 100644
--- a/c/src/lib/libbsp/arm/smdk2410/startup/linkcmds
+++ b/c/src/lib/libbsp/arm/smdk2410/startup/linkcmds
@@ -28,6 +28,9 @@ MEMORY {
 _sdram_base = DEFINED(_sdram_base) ? _sdram_base : 0x30000000;
 _sdram_size = DEFINED(_sdram_size) ? _sdram_size : 64M;
 
+RamBase = _sdram_base;
+RamSize = _sdram_size;
+HeapSize = DEFINED(HeapSize) ? HeapSize : 0x0;
 
 _irq_stack_size = DEFINED(_irq_stack_size) ? _irq_stack_size : 0x1000;
 _fiq_stack_size = DEFINED(_fiq_stack_size) ? _fiq_stack_size : 0x400;
@@ -225,6 +228,7 @@ SECTIONS
 
 	. = ALIGN (1024);
 	_bss_free_start = .;
+	_bss_free_start = .;
 
   } > sdram
   _axf_bss_end = . ;