From 862058d59eca82357b06252d9a9b007a0d04cf52 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 16 Sep 2008 22:16:11 +0000 Subject: 2008-09-16 Joel Sherrill * Makefile.am, startup/linkcmds, startup/linkcmds_ROM: Use top level shared bsp_get_work_area() implementation. --- c/src/lib/libbsp/m68k/mrm332/ChangeLog | 5 +++++ c/src/lib/libbsp/m68k/mrm332/Makefile.am | 2 +- c/src/lib/libbsp/m68k/mrm332/startup/linkcmds | 10 +++++----- c/src/lib/libbsp/m68k/mrm332/startup/linkcmds_ROM | 10 +++++----- 4 files changed, 16 insertions(+), 11 deletions(-) (limited to 'c/src/lib/libbsp/m68k') diff --git a/c/src/lib/libbsp/m68k/mrm332/ChangeLog b/c/src/lib/libbsp/m68k/mrm332/ChangeLog index 1c18efe07e..54e91a9cf0 100644 --- a/c/src/lib/libbsp/m68k/mrm332/ChangeLog +++ b/c/src/lib/libbsp/m68k/mrm332/ChangeLog @@ -1,3 +1,8 @@ +2008-09-16 Joel Sherrill + + * Makefile.am, startup/linkcmds, startup/linkcmds_ROM: Use top level + shared bsp_get_work_area() implementation. + 2008-09-16 Joel Sherrill * startup/bspstart.c: Removed. diff --git a/c/src/lib/libbsp/m68k/mrm332/Makefile.am b/c/src/lib/libbsp/m68k/mrm332/Makefile.am index f831418c2f..cdc57252d0 100644 --- a/c/src/lib/libbsp/m68k/mrm332/Makefile.am +++ b/c/src/lib/libbsp/m68k/mrm332/Makefile.am @@ -33,7 +33,7 @@ startup_SOURCES = startup/start_c.c ../../shared/bsplibc.c \ ../../shared/bsppost.c ../../shared/bspstart.c startup/bsppredriverhook.c \ startup/bspclean.c ../../shared/bootcard.c ../../shared/sbrk.c \ ../../m68k/shared/setvec.c ../../shared/bsppretaskinghook.c \ - ../../m68k/shared/m68kbspgetworkarea.c ../../shared/gnatinstallhandler.c \ + ../../shared/bspgetworkarea.c ../../shared/gnatinstallhandler.c \ startup/except_vect_332_ROM.S clock_SOURCES = clock/ckinit.c console_SOURCES = console/console.c console/sci.c console/sci.h diff --git a/c/src/lib/libbsp/m68k/mrm332/startup/linkcmds b/c/src/lib/libbsp/m68k/mrm332/startup/linkcmds index 3a7a78108e..d5f612458f 100644 --- a/c/src/lib/libbsp/m68k/mrm332/startup/linkcmds +++ b/c/src/lib/libbsp/m68k/mrm332/startup/linkcmds @@ -33,10 +33,10 @@ __DYNAMIC = 0; /* * Declare some sizes. */ -_RamBase = DEFINED(_RamBase) ? _RamBase : 0x10000; -_RamSize = DEFINED(_RamSize) ? _RamSize : 0x70000; -_RamEnd = _RamBase + _RamSize; -_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x0; +RamBase = DEFINED(RamBase) ? RamBase : 0x10000; +RamSize = DEFINED(RamSize) ? RamSize : 0x70000; +_RamEnd = RamBase + RamSize; +HeapSize = DEFINED(HeapSize) ? HeapSize : 0x0; _StackSize = DEFINED(_StackSize) ? _StackSize : 0x2000; MEMORY @@ -159,6 +159,6 @@ SECTIONS _stack_init = .; _clear_end = .; - _WorkspaceBase = .; + WorkAreaBase = .; } >ram } diff --git a/c/src/lib/libbsp/m68k/mrm332/startup/linkcmds_ROM b/c/src/lib/libbsp/m68k/mrm332/startup/linkcmds_ROM index 7fc5902adc..d13181adf0 100644 --- a/c/src/lib/libbsp/m68k/mrm332/startup/linkcmds_ROM +++ b/c/src/lib/libbsp/m68k/mrm332/startup/linkcmds_ROM @@ -43,13 +43,13 @@ MEMORY ram : ORIGIN = 0x03000, LENGTH = 0x7d000 } -_RamBase = DEFINED(_RamBase) ? _RamBase : 0x003000; -_RamSize = DEFINED(_RamSize) ? _RamSize : 0x7d000; -_RamEnd = _RamBase + _RamSize; +RamBase = DEFINED(RamBase) ? RamBase : 0x003000; +RamSize = DEFINED(RamSize) ? RamSize : 0x7d000; +_RamEnd = RamBase + RamSize; __end_of_ram = 0x080000; _copy_data_from_rom = 1; -_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x0; +HeapSize = DEFINED(HeapSize) ? HeapSize : 0x0; _StackSize = DEFINED(_StackSize) ? _StackSize : 0x2000; /* @@ -187,7 +187,7 @@ SECTIONS _end = ALIGN(0x8); __end = ALIGN(0x8); - _WorkspaceBase = . + _StackSize; + WorkAreaBase = . + _StackSize; } > ram .stab . (NOLOAD) : { -- cgit v1.2.3