From 2a65e6d5693314f9608486ed949e88f548880aac Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 16 Sep 2008 20:13:39 +0000 Subject: 2008-09-16 Joel Sherrill * Makefile.am, startup/linkcmds: Use top level shared bsp_get_work_area() implementation. --- c/src/lib/libbsp/bfin/bf537Stamp/ChangeLog | 5 +++++ c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am | 2 +- c/src/lib/libbsp/bfin/bf537Stamp/startup/linkcmds | 3 ++- c/src/lib/libbsp/bfin/eZKit533/ChangeLog | 5 +++++ c/src/lib/libbsp/bfin/eZKit533/Makefile.am | 2 +- c/src/lib/libbsp/bfin/eZKit533/startup/linkcmds | 4 ++-- c/src/lib/libbsp/sh/gensh1/ChangeLog | 5 +++++ c/src/lib/libbsp/sh/gensh1/Makefile.am | 2 +- c/src/lib/libbsp/sh/gensh1/startup/linkcmds | 3 ++- 9 files changed, 24 insertions(+), 7 deletions(-) diff --git a/c/src/lib/libbsp/bfin/bf537Stamp/ChangeLog b/c/src/lib/libbsp/bfin/bf537Stamp/ChangeLog index 48f7d301b3..ff8f786a26 100644 --- a/c/src/lib/libbsp/bfin/bf537Stamp/ChangeLog +++ b/c/src/lib/libbsp/bfin/bf537Stamp/ChangeLog @@ -1,3 +1,8 @@ +2008-09-16 Joel Sherrill + + * Makefile.am, startup/linkcmds: Use top level shared + bsp_get_work_area() implementation. + 2008-09-16 Joel Sherrill * startup/bspstart.c: Remove unnecessary includes of diff --git a/c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am b/c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am index c3c98c0ace..5d682bb18e 100644 --- a/c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am +++ b/c/src/lib/libbsp/bfin/bf537Stamp/Makefile.am @@ -31,7 +31,7 @@ startup_rel_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \ ../../shared/bsppredriverhook.c startup/bspstart.c \ ../../shared/bspclean.c ../../shared/sbrk.c ../../shared/setvec.c \ ../../shared/bootcard.c ../../shared/gnatinstallhandler.c \ - ../shared/bspgetworkarea.c + ../../shared/bspgetworkarea.c startup_rel_CPPFLAGS = $(AM_CPPFLAGS) startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) diff --git a/c/src/lib/libbsp/bfin/bf537Stamp/startup/linkcmds b/c/src/lib/libbsp/bfin/bf537Stamp/startup/linkcmds index 316c2ec5e9..90b2ae59b4 100644 --- a/c/src/lib/libbsp/bfin/bf537Stamp/startup/linkcmds +++ b/c/src/lib/libbsp/bfin/bf537Stamp/startup/linkcmds @@ -13,6 +13,7 @@ ENTRY(__start) */ _RamBase = DEFINED(_RamBase) ? _RamBase : 0x0; _RamSize = DEFINED(_RamSize) ? _RamSize : 0x04000000; +_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x0; _StackSize = DEFINED(_StackSize) ? _StackSize : 0x1000; MEMORY @@ -111,7 +112,7 @@ SECTIONS _stack_init = .; . += _StackSize; _clear_end = .; - _WorkArea = .; + _WorkAreaBase = .; _end = .; __end = .; } > sdram diff --git a/c/src/lib/libbsp/bfin/eZKit533/ChangeLog b/c/src/lib/libbsp/bfin/eZKit533/ChangeLog index c70c64f562..d5e2282ccf 100644 --- a/c/src/lib/libbsp/bfin/eZKit533/ChangeLog +++ b/c/src/lib/libbsp/bfin/eZKit533/ChangeLog @@ -1,3 +1,8 @@ +2008-09-16 Joel Sherrill + + * Makefile.am, startup/linkcmds: Use top level shared + bsp_get_work_area() implementation. + 2008-09-16 Joel Sherrill * startup/bspstart.c: Remove unnecessary includes of diff --git a/c/src/lib/libbsp/bfin/eZKit533/Makefile.am b/c/src/lib/libbsp/bfin/eZKit533/Makefile.am index f6234c5795..f21aeddadd 100644 --- a/c/src/lib/libbsp/bfin/eZKit533/Makefile.am +++ b/c/src/lib/libbsp/bfin/eZKit533/Makefile.am @@ -32,7 +32,7 @@ startup_rel_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \ ../../shared/bsppredriverhook.c startup/bspstart.c \ ../../shared/bspclean.c ../../shared/sbrk.c ../../shared/setvec.c \ ../../shared/bootcard.c ../../shared/gnatinstallhandler.c \ - ../shared/bspgetworkarea.c + ../../shared/bspgetworkarea.c startup_rel_CPPFLAGS = $(AM_CPPFLAGS) startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) diff --git a/c/src/lib/libbsp/bfin/eZKit533/startup/linkcmds b/c/src/lib/libbsp/bfin/eZKit533/startup/linkcmds index 8d233307cb..51d5d0513b 100644 --- a/c/src/lib/libbsp/bfin/eZKit533/startup/linkcmds +++ b/c/src/lib/libbsp/bfin/eZKit533/startup/linkcmds @@ -9,7 +9,7 @@ ENTRY(__start) */ _RamBase = DEFINED(_RamBase) ? _RamBase : 0x0; _RamSize = DEFINED(_RamSize) ? _RamSize : 0x01000000; -_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x10000; +_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x0; _StackSize = DEFINED(_StackSize) ? _StackSize : 0x1000; MEMORY @@ -101,7 +101,7 @@ SECTIONS _stack_init = .; . += _StackSize; _clear_end = .; - _WorkArea = .; + _WorkAreaBase = .; _end = .; __end = .; } > sdram diff --git a/c/src/lib/libbsp/sh/gensh1/ChangeLog b/c/src/lib/libbsp/sh/gensh1/ChangeLog index b8ae164eb4..ac7abc2218 100644 --- a/c/src/lib/libbsp/sh/gensh1/ChangeLog +++ b/c/src/lib/libbsp/sh/gensh1/ChangeLog @@ -1,3 +1,8 @@ +2008-09-16 Joel Sherrill + + * Makefile.am, startup/linkcmds: Use top level shared + bsp_get_work_area() implementation. + 2008-09-15 Joel Sherrill * Makefile.am, configure.ac, include/bsp.h, startup/linkcmds: Use diff --git a/c/src/lib/libbsp/sh/gensh1/Makefile.am b/c/src/lib/libbsp/sh/gensh1/Makefile.am index 81f6c0c732..50cae8f020 100644 --- a/c/src/lib/libbsp/sh/gensh1/Makefile.am +++ b/c/src/lib/libbsp/sh/gensh1/Makefile.am @@ -36,7 +36,7 @@ CLEANFILES = scitab.c startup_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \ ../../shared/bsppredriverhook.c ../shared/bspstart.c startup/bspclean.c \ - ../shared/bspgetworkarea.c ../../shared/bsppretaskinghook.c \ + ../../shared/bspgetworkarea.c ../../shared/bsppretaskinghook.c \ ../../shared/sbrk.c ../../shared/bootcard.c ../shared/bsphwinit.c \ ../../shared/gnatinstallhandler.c scitab_SOURCES = scitab.c diff --git a/c/src/lib/libbsp/sh/gensh1/startup/linkcmds b/c/src/lib/libbsp/sh/gensh1/startup/linkcmds index c31b982343..02554b55bb 100644 --- a/c/src/lib/libbsp/sh/gensh1/startup/linkcmds +++ b/c/src/lib/libbsp/sh/gensh1/startup/linkcmds @@ -33,6 +33,7 @@ ENTRY(_start) _RamBase = DEFINED(_RamBase) ? _RamBase : 0x0a040000; _RamSize = DEFINED(_RamSize) ? _RamSize : 512K; +_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x0; MEMORY { @@ -179,7 +180,7 @@ SECTIONS _end = . ; PROVIDE (end = .); - _WorkSpaceStart = . ; + _WorkAreaBase = . ; _CPU_Interrupt_stack_low = 0x0f000000 ; _CPU_Interrupt_stack_high = _CPU_Interrupt_stack_low + 4096 ; -- cgit v1.2.3