From 1b0dfdd5a8e159014ff074ebeabc9ca08517c0e2 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 16 Sep 2008 19:03:32 +0000 Subject: 2008-09-16 Joel Sherrill * Makefile.am, configure.ac, clock/ckinit.c, startup/linkcmds, startup/linkcmds_ROM: Add use of bsp_get_work_area() in its own file and rely on BSP Framework to perform more initialization. Remove unnecessary includes of rtems/libio.h and rtems/libcsupport.h. * startup/bsppredriverhook.c: New file. --- c/src/lib/libbsp/m68k/mrm332/ChangeLog | 8 +++++++ c/src/lib/libbsp/m68k/mrm332/Makefile.am | 9 +++---- c/src/lib/libbsp/m68k/mrm332/clock/ckinit.c | 1 - c/src/lib/libbsp/m68k/mrm332/configure.ac | 2 ++ .../libbsp/m68k/mrm332/startup/bsppredriverhook.c | 28 ++++++++++++++++++++++ c/src/lib/libbsp/m68k/mrm332/startup/linkcmds | 2 +- c/src/lib/libbsp/m68k/mrm332/startup/linkcmds_ROM | 2 +- 7 files changed, 45 insertions(+), 7 deletions(-) create mode 100644 c/src/lib/libbsp/m68k/mrm332/startup/bsppredriverhook.c (limited to 'c/src/lib') diff --git a/c/src/lib/libbsp/m68k/mrm332/ChangeLog b/c/src/lib/libbsp/m68k/mrm332/ChangeLog index e9268b69d4..0cfc1a5dd2 100644 --- a/c/src/lib/libbsp/m68k/mrm332/ChangeLog +++ b/c/src/lib/libbsp/m68k/mrm332/ChangeLog @@ -1,3 +1,11 @@ +2008-09-16 Joel Sherrill + + * Makefile.am, configure.ac, clock/ckinit.c, startup/linkcmds, + startup/linkcmds_ROM: Add use of bsp_get_work_area() in its own file + and rely on BSP Framework to perform more initialization. Remove + unnecessary includes of rtems/libio.h and rtems/libcsupport.h. + * startup/bsppredriverhook.c: New file. + 2008-09-10 Joel Sherrill * include/bsp.h: Review of all bsp_cleanup() implementations. In this diff --git a/c/src/lib/libbsp/m68k/mrm332/Makefile.am b/c/src/lib/libbsp/m68k/mrm332/Makefile.am index dbff8a48d7..f831418c2f 100644 --- a/c/src/lib/libbsp/m68k/mrm332/Makefile.am +++ b/c/src/lib/libbsp/m68k/mrm332/Makefile.am @@ -30,10 +30,11 @@ project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds startup/linkcmds_ROM startup_SOURCES = startup/start_c.c ../../shared/bsplibc.c \ - ../../shared/bsppost.c startup/bspstart.c startup/bspclean.c \ - ../../shared/bootcard.c ../../m68k/shared/m68kpretaskinghook.c \ - ../../shared/sbrk.c ../../m68k/shared/setvec.c \ - ../../shared/gnatinstallhandler.c startup/except_vect_332_ROM.S + ../../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 \ + startup/except_vect_332_ROM.S clock_SOURCES = clock/ckinit.c console_SOURCES = console/console.c console/sci.c console/sci.h spurious_SOURCES = spurious/spinit.c diff --git a/c/src/lib/libbsp/m68k/mrm332/clock/ckinit.c b/c/src/lib/libbsp/m68k/mrm332/clock/ckinit.c index 9ed5a39c2f..59b2259820 100644 --- a/c/src/lib/libbsp/m68k/mrm332/clock/ckinit.c +++ b/c/src/lib/libbsp/m68k/mrm332/clock/ckinit.c @@ -19,7 +19,6 @@ #include #include -#include #include #define CLOCK_VECTOR MRM_PIV diff --git a/c/src/lib/libbsp/m68k/mrm332/configure.ac b/c/src/lib/libbsp/m68k/mrm332/configure.ac index b44e8999e8..da4afe39a5 100644 --- a/c/src/lib/libbsp/m68k/mrm332/configure.ac +++ b/c/src/lib/libbsp/m68k/mrm332/configure.ac @@ -15,6 +15,8 @@ RTEMS_PROG_CC_FOR_TARGET RTEMS_CANONICALIZE_TOOLS RTEMS_PROG_CCAS +RTEMS_BSP_BOOTCARD_HANDLES_RAM_ALLOCATION + # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/c/src/lib/libbsp/m68k/mrm332/startup/bsppredriverhook.c b/c/src/lib/libbsp/m68k/mrm332/startup/bsppredriverhook.c new file mode 100644 index 0000000000..267c01e00c --- /dev/null +++ b/c/src/lib/libbsp/m68k/mrm332/startup/bsppredriverhook.c @@ -0,0 +1,28 @@ +/* + * This routine starts the application. It includes application, + * board, and monitor specific initialization and configuration. + * The generic CPU dependent initialization has been performed + * before this routine is invoked. + * + * COPYRIGHT (c) 1989-1999. + * On-Line Applications Research Corporation (OAR). + * + * The license and distribution terms for this file may be + * found in the file LICENSE in this distribution or at + * http://www.rtems.com/license/LICENSE. + * + * $Id$ + */ + +#include + + +/* + * Call Spurious_Initialize in bsp_predriver_hook because + * bsp_predriver_hook is call after the _ISR_Vector_Table allocation + */ +void bsp_predriver_hook(void) +{ + extern void Spurious_Initialize(void); + Spurious_Initialize(); +} diff --git a/c/src/lib/libbsp/m68k/mrm332/startup/linkcmds b/c/src/lib/libbsp/m68k/mrm332/startup/linkcmds index a5c01a97d0..3a7a78108e 100644 --- a/c/src/lib/libbsp/m68k/mrm332/startup/linkcmds +++ b/c/src/lib/libbsp/m68k/mrm332/startup/linkcmds @@ -36,7 +36,7 @@ __DYNAMIC = 0; _RamBase = DEFINED(_RamBase) ? _RamBase : 0x10000; _RamSize = DEFINED(_RamSize) ? _RamSize : 0x70000; _RamEnd = _RamBase + _RamSize; -_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x10000; +_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x0; _StackSize = DEFINED(_StackSize) ? _StackSize : 0x2000; MEMORY diff --git a/c/src/lib/libbsp/m68k/mrm332/startup/linkcmds_ROM b/c/src/lib/libbsp/m68k/mrm332/startup/linkcmds_ROM index 3936164efa..7fc5902adc 100644 --- a/c/src/lib/libbsp/m68k/mrm332/startup/linkcmds_ROM +++ b/c/src/lib/libbsp/m68k/mrm332/startup/linkcmds_ROM @@ -49,7 +49,7 @@ _RamEnd = _RamBase + _RamSize; __end_of_ram = 0x080000; _copy_data_from_rom = 1; -_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x10000; +_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x0; _StackSize = DEFINED(_StackSize) ? _StackSize : 0x2000; /* -- cgit v1.2.3