diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-09-16 22:16:25 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-09-16 22:16:25 +0000 |
| commit | 07ce99e933afa42e93a55a34e732d6db9ef8c90c (patch) | |
| tree | 488977eabdfe1291265b58f7c2e6b41e98383815 /c/src/lib/libbsp/m68k/gen68340 | |
| parent | 2008-09-16 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
| download | rtems-07ce99e933afa42e93a55a34e732d6db9ef8c90c.tar.bz2 | |
2008-09-16 Joel Sherrill <joel.sherrill@oarcorp.com>
* Makefile.am, startup/linkcmds: Use top level shared
bsp_get_work_area() implementation.
Diffstat (limited to 'c/src/lib/libbsp/m68k/gen68340')
| -rw-r--r-- | c/src/lib/libbsp/m68k/gen68340/ChangeLog | 5 | ||||
| -rw-r--r-- | c/src/lib/libbsp/m68k/gen68340/Makefile.am | 2 | ||||
| -rw-r--r-- | c/src/lib/libbsp/m68k/gen68340/startup/linkcmds | 10 |
3 files changed, 11 insertions, 6 deletions
diff --git a/c/src/lib/libbsp/m68k/gen68340/ChangeLog b/c/src/lib/libbsp/m68k/gen68340/ChangeLog index 6e30cea16c..3a93816f82 100644 --- a/c/src/lib/libbsp/m68k/gen68340/ChangeLog +++ b/c/src/lib/libbsp/m68k/gen68340/ChangeLog @@ -1,5 +1,10 @@ 2008-09-16 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> + * Makefile.am, configure.ac, clock/ckinit.c, startup/linkcmds: Add use of bsp_get_work_area() in its own file and rely on BSP Framework to perform more initialization. Remove unnecessary includes of diff --git a/c/src/lib/libbsp/m68k/gen68340/Makefile.am b/c/src/lib/libbsp/m68k/gen68340/Makefile.am index 9a7d82cc2f..3fc9cee8c4 100644 --- a/c/src/lib/libbsp/m68k/gen68340/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68340/Makefile.am @@ -31,7 +31,7 @@ project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds startup_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \ - ../../shared/bsppredriverhook.c ../../m68k/shared/m68kbspgetworkarea.c \ + ../../shared/bsppredriverhook.c ../../shared/bspgetworkarea.c \ ../../shared/bsppost.c ../../shared/bspstart.c startup/init68340.c \ ../../shared/bootcard.c ../../shared/bsppretaskinghook.c \ ../../shared/sbrk.c ../../m68k/shared/setvec.c \ diff --git a/c/src/lib/libbsp/m68k/gen68340/startup/linkcmds b/c/src/lib/libbsp/m68k/gen68340/startup/linkcmds index 8541a58e83..c713e7eb64 100644 --- a/c/src/lib/libbsp/m68k/gen68340/startup/linkcmds +++ b/c/src/lib/libbsp/m68k/gen68340/startup/linkcmds @@ -20,15 +20,15 @@ /* * Declare some sizes. */ -_RamBase = DEFINED(_RamBase) ? _RamBase : 0x10000000; -_RamSize = DEFINED(_RamSize) ? _RamSize : 4M; -_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x0; +RamBase = DEFINED(RamBase) ? RamBase : 0x10000000; +RamSize = DEFINED(RamSize) ? RamSize : 4M; +HeapSize = DEFINED(HeapSize) ? HeapSize : 0x0; _StackSize = DEFINED(_StackSize) ? _StackSize : 0x1000; /* * Declare on-board memory. * It would be nice if the ram length could be given as - * LENGTH=_RamSize, but gld doesn't allow non-constant + * LENGTH=RamSize, but gld doesn't allow non-constant * values in the LENGTH expression. */ MEMORY { @@ -169,7 +169,7 @@ SECTIONS { _stack_init = .; _clear_end = .; - _WorkspaceBase = .; + WorkAreaBase = .; } >ram /* |