From c6fb8ed4e0877438afb73aaa1ef4e315a4cecd26 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 16 Sep 2008 19:03:44 +0000 Subject: 2008-09-16 Joel Sherrill * 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 rtems/libio.h and rtems/libcsupport.h. * startup/bspstart.c: Removed. --- c/src/lib/libbsp/m68k/gen68302/ChangeLog | 8 +++ c/src/lib/libbsp/m68k/gen68302/Makefile.am | 9 ++-- c/src/lib/libbsp/m68k/gen68302/clock/ckinit.c | 2 - c/src/lib/libbsp/m68k/gen68302/configure.ac | 2 + c/src/lib/libbsp/m68k/gen68302/startup/bspstart.c | 61 --------------------- c/src/lib/libbsp/m68k/gen68302/startup/linkcmds | 2 +- c/src/lib/libbsp/m68k/gen68340/ChangeLog | 8 +++ c/src/lib/libbsp/m68k/gen68340/Makefile.am | 6 +-- c/src/lib/libbsp/m68k/gen68340/clock/ckinit.c | 1 - c/src/lib/libbsp/m68k/gen68340/configure.ac | 2 + c/src/lib/libbsp/m68k/gen68340/startup/bspstart.c | 64 ----------------------- c/src/lib/libbsp/m68k/gen68340/startup/linkcmds | 2 +- c/src/lib/libbsp/m68k/ods68302/ChangeLog | 8 +++ c/src/lib/libbsp/m68k/ods68302/Makefile.am | 5 +- c/src/lib/libbsp/m68k/ods68302/clock/ckinit.c | 2 - c/src/lib/libbsp/m68k/ods68302/configure.ac | 2 + c/src/lib/libbsp/m68k/ods68302/startup/bspstart.c | 51 ------------------ c/src/lib/libbsp/m68k/ods68302/startup/linkcmds | 2 +- 18 files changed, 43 insertions(+), 194 deletions(-) delete mode 100644 c/src/lib/libbsp/m68k/gen68302/startup/bspstart.c delete mode 100644 c/src/lib/libbsp/m68k/gen68340/startup/bspstart.c delete mode 100644 c/src/lib/libbsp/m68k/ods68302/startup/bspstart.c (limited to 'c/src') diff --git a/c/src/lib/libbsp/m68k/gen68302/ChangeLog b/c/src/lib/libbsp/m68k/gen68302/ChangeLog index 4e89af9d85..09b8db27f1 100644 --- a/c/src/lib/libbsp/m68k/gen68302/ChangeLog +++ b/c/src/lib/libbsp/m68k/gen68302/ChangeLog @@ -1,3 +1,11 @@ +2008-09-16 Joel Sherrill + + * 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 + rtems/libio.h and rtems/libcsupport.h. + * startup/bspstart.c: Removed. + 2008-09-10 Joel Sherrill * Makefile.am, include/bsp.h: Review of all bsp_cleanup() diff --git a/c/src/lib/libbsp/m68k/gen68302/Makefile.am b/c/src/lib/libbsp/m68k/gen68302/Makefile.am index d7d7880451..16ffab8c9d 100644 --- a/c/src/lib/libbsp/m68k/gen68302/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68302/Makefile.am @@ -29,11 +29,10 @@ project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds startup_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \ - ../../shared/bsppredriverhook.c \ - ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \ - ../../m68k/shared/m68kpretaskinghook.c \ - ../../shared/sbrk.c ../../m68k/shared/setvec.c \ - ../../shared/gnatinstallhandler.c + ../../shared/bsppredriverhook.c ../../shared/bsppretaskinghook.c \ + ../../shared/bsppost.c ../../shared/bspstart.c ../../shared/bootcard.c \ + ../../m68k/shared/m68kbspgetworkarea.c ../../shared/sbrk.c \ + ../../m68k/shared/setvec.c ../../shared/gnatinstallhandler.c clock_SOURCES = clock/ckinit.c console_SOURCES = console/console.c ../../shared/dummy_printk_support.c timer_SOURCES = timer/timer.c timer/timerisr.S diff --git a/c/src/lib/libbsp/m68k/gen68302/clock/ckinit.c b/c/src/lib/libbsp/m68k/gen68302/clock/ckinit.c index 6bfe77692e..2115fd8f66 100644 --- a/c/src/lib/libbsp/m68k/gen68302/clock/ckinit.c +++ b/c/src/lib/libbsp/m68k/gen68302/clock/ckinit.c @@ -20,8 +20,6 @@ #include /* for atexit() */ #include -#include - #include #define CLOCK_VECTOR 137 diff --git a/c/src/lib/libbsp/m68k/gen68302/configure.ac b/c/src/lib/libbsp/m68k/gen68302/configure.ac index 9b9e9f8c60..d5123dde7c 100644 --- a/c/src/lib/libbsp/m68k/gen68302/configure.ac +++ b/c/src/lib/libbsp/m68k/gen68302/configure.ac @@ -19,6 +19,8 @@ RTEMS_CHECK_NETWORKING AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes") +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/gen68302/startup/bspstart.c b/c/src/lib/libbsp/m68k/gen68302/startup/bspstart.c deleted file mode 100644 index 98ff483609..0000000000 --- a/c/src/lib/libbsp/m68k/gen68302/startup/bspstart.c +++ /dev/null @@ -1,61 +0,0 @@ -/* - * 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 - -#include -#include -#include - -/* - * Use the shared implementations of the following routines - */ - -void bsp_libc_init( void *, uint32_t, int ); -void bsp_pretasking_hook(void); /* m68k version */ - -/* - * bsp_start - * - * This routine does the bulk of the system initialization. - */ - -void bsp_start( void ) -{ - extern void *_WorkspaceBase; - extern void *_RamSize; - extern void *_RamSize; - extern unsigned long _M68k_Ramsize; - - /* RAM size set in linker script */ - _M68k_Ramsize = (unsigned long)&_RamSize; - - /* - * Allocate the memory for the RTEMS Work Space. This can come from - * a variety of places: hard coded address, malloc'ed from outside - * RTEMS world (e.g. simulator or primitive memory manager), or (as - * typically done by stock BSPs) by subtracting the required amount - * of work space from the last physical address on the CPU board. - */ - - /* - * Need to "allocate" the memory for the RTEMS Workspace and - * tell the RTEMS configuration where it is. This memory is - * not malloc'ed. It is just "pulled from the air". - */ - - Configuration.work_space_start = (void *) &_WorkspaceBase; -} diff --git a/c/src/lib/libbsp/m68k/gen68302/startup/linkcmds b/c/src/lib/libbsp/m68k/gen68302/startup/linkcmds index 9cdd3cdca1..f8b19c56cd 100644 --- a/c/src/lib/libbsp/m68k/gen68302/startup/linkcmds +++ b/c/src/lib/libbsp/m68k/gen68302/startup/linkcmds @@ -25,7 +25,7 @@ _VBR = 0x000000; /* location of the VBR table (in RAM) */ */ _RamBase = DEFINED(_RamBase) ? _RamBase : 0x0; _RamSize = DEFINED(_RamSize) ? _RamSize : 16M; -_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x10000; +_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x0; _StackSize = DEFINED(_StackSize) ? _StackSize : 0x1000; SECTIONS diff --git a/c/src/lib/libbsp/m68k/gen68340/ChangeLog b/c/src/lib/libbsp/m68k/gen68340/ChangeLog index e7169a6642..6e30cea16c 100644 --- a/c/src/lib/libbsp/m68k/gen68340/ChangeLog +++ b/c/src/lib/libbsp/m68k/gen68340/ChangeLog @@ -1,3 +1,11 @@ +2008-09-16 Joel Sherrill + + * 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 + rtems/libio.h and rtems/libcsupport.h. + * startup/bspstart.c: Removed. + 2008-09-10 Joel Sherrill * Makefile.am, include/bsp.h: Review of all bsp_cleanup() diff --git a/c/src/lib/libbsp/m68k/gen68340/Makefile.am b/c/src/lib/libbsp/m68k/gen68340/Makefile.am index 9c47dcaadc..9a7d82cc2f 100644 --- a/c/src/lib/libbsp/m68k/gen68340/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68340/Makefile.am @@ -31,9 +31,9 @@ project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds startup_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \ - ../../shared/bsppredriverhook.c \ - ../../shared/bsppost.c startup/bspstart.c startup/init68340.c \ - ../../shared/bootcard.c ../../m68k/shared/m68kpretaskinghook.c \ + ../../shared/bsppredriverhook.c ../../m68k/shared/m68kbspgetworkarea.c \ + ../../shared/bsppost.c ../../shared/bspstart.c startup/init68340.c \ + ../../shared/bootcard.c ../../shared/bsppretaskinghook.c \ ../../shared/sbrk.c ../../m68k/shared/setvec.c \ startup/dumpanic.c ../../shared/gnatinstallhandler.c clock_SOURCES = clock/ckinit.c diff --git a/c/src/lib/libbsp/m68k/gen68340/clock/ckinit.c b/c/src/lib/libbsp/m68k/gen68340/clock/ckinit.c index 8dd27a0bb4..2fb4afbad9 100644 --- a/c/src/lib/libbsp/m68k/gen68340/clock/ckinit.c +++ b/c/src/lib/libbsp/m68k/gen68340/clock/ckinit.c @@ -30,7 +30,6 @@ #include /* for atexit() */ #include -#include #include #define CLOCK_VECTOR 120 /* clock isr routine vector in the vbr */ diff --git a/c/src/lib/libbsp/m68k/gen68340/configure.ac b/c/src/lib/libbsp/m68k/gen68340/configure.ac index ebccce3901..55116fc310 100644 --- a/c/src/lib/libbsp/m68k/gen68340/configure.ac +++ b/c/src/lib/libbsp/m68k/gen68340/configure.ac @@ -15,6 +15,8 @@ RTEMS_PROG_CC_FOR_TARGET([-ansi -fasm]) 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/gen68340/startup/bspstart.c b/c/src/lib/libbsp/m68k/gen68340/startup/bspstart.c deleted file mode 100644 index ad0998d897..0000000000 --- a/c/src/lib/libbsp/m68k/gen68340/startup/bspstart.c +++ /dev/null @@ -1,64 +0,0 @@ -/* bsp_start() - * - * 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. - * - * INPUT: NONE - * - * OUTPUT: NONE - * - * 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 - -#include -#include -#include - -/* - * Use the shared implementations of the following routines - */ -void bsp_libc_init( void *, uint32_t, int ); -void bsp_pretasking_hook(void); /* m68k version */ - -/* - * bsp_start - * - * This routine does the bulk of the system initialization. - */ - -void bsp_start( void ) -{ - extern void *_WorkspaceBase; - extern void *_RamSize; - extern unsigned long _M68k_Ramsize; - - /* RAM size set in linker script */ - _M68k_Ramsize = (unsigned long)&_RamSize; - - /* - * Allocate the memory for the RTEMS Work Space. This can come from - * a variety of places: hard coded address, malloc'ed from outside - * RTEMS world (e.g. simulator or primitive memory manager), or (as - * typically done by stock BSPs) by subtracting the required amount - * of work space from the last physical address on the CPU board. - */ - - /* - * Need to "allocate" the memory for the RTEMS Workspace and - * tell the RTEMS configuration where it is. This memory is - * not malloc'ed. It is just "pulled from the air". - */ - - Configuration.work_space_start = (void *)&_WorkspaceBase; -} diff --git a/c/src/lib/libbsp/m68k/gen68340/startup/linkcmds b/c/src/lib/libbsp/m68k/gen68340/startup/linkcmds index 7999eade79..8541a58e83 100644 --- a/c/src/lib/libbsp/m68k/gen68340/startup/linkcmds +++ b/c/src/lib/libbsp/m68k/gen68340/startup/linkcmds @@ -22,7 +22,7 @@ */ _RamBase = DEFINED(_RamBase) ? _RamBase : 0x10000000; _RamSize = DEFINED(_RamSize) ? _RamSize : 4M; -_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x10000; +_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x0; _StackSize = DEFINED(_StackSize) ? _StackSize : 0x1000; /* diff --git a/c/src/lib/libbsp/m68k/ods68302/ChangeLog b/c/src/lib/libbsp/m68k/ods68302/ChangeLog index bb69253934..5826b0aaf8 100644 --- a/c/src/lib/libbsp/m68k/ods68302/ChangeLog +++ b/c/src/lib/libbsp/m68k/ods68302/ChangeLog @@ -1,3 +1,11 @@ +2008-09-16 Joel Sherrill + + * 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 + rtems/libio.h and rtems/libcsupport.h. + * startup/bspstart.c: Removed. + 2008-09-10 Joel Sherrill * Makefile.am, include/bsp.h: Review of all bsp_cleanup() diff --git a/c/src/lib/libbsp/m68k/ods68302/Makefile.am b/c/src/lib/libbsp/m68k/ods68302/Makefile.am index 70c416aa2c..ad252fbd14 100644 --- a/c/src/lib/libbsp/m68k/ods68302/Makefile.am +++ b/c/src/lib/libbsp/m68k/ods68302/Makefile.am @@ -42,10 +42,11 @@ dist_project_lib_DATA += startup/linkcmds startup/rom startup/debugger startup_SOURCES = startup/cpuboot.c startup/crc.c startup/debugport.c \ startup/gdb-hooks.c ../../shared/bootcard.c \ startup/m68302scc.c startup/m68k-stub.c \ - ../../m68k/shared/m68kpretaskinghook.c startup/memcheck.c \ + ../../shared/bsppretaskinghook.c startup/memcheck.c \ + ../../m68k/shared/m68kbspgetworkarea.c startup/memcheck.c \ startup/trace.c ../../shared/gnatinstallhandler.c ../../shared/bsplibc.c \ ../../shared/bsppredriverhook.c ../../shared/bsppost.c \ - startup/bspstart.c ../../shared/bspclean.c ../../shared/sbrk.c \ + ../../shared/bspstart.c ../../shared/bspclean.c ../../shared/sbrk.c \ ../../m68k/shared/setvec.c clock_SOURCES = clock/ckinit.c console_SOURCES = console/console.c ../../shared/dummy_printk_support.c diff --git a/c/src/lib/libbsp/m68k/ods68302/clock/ckinit.c b/c/src/lib/libbsp/m68k/ods68302/clock/ckinit.c index 890dc1005d..1f759ae7bc 100644 --- a/c/src/lib/libbsp/m68k/ods68302/clock/ckinit.c +++ b/c/src/lib/libbsp/m68k/ods68302/clock/ckinit.c @@ -20,8 +20,6 @@ #include /* for atexit() */ #include -#include - #include #define CLOCK_VECTOR 137 diff --git a/c/src/lib/libbsp/m68k/ods68302/configure.ac b/c/src/lib/libbsp/m68k/ods68302/configure.ac index f0cadb59be..2fd98dd323 100644 --- a/c/src/lib/libbsp/m68k/ods68302/configure.ac +++ b/c/src/lib/libbsp/m68k/ods68302/configure.ac @@ -31,6 +31,8 @@ AM_CONDITIONAL(ODS68302_DEBUG,[test "$ODS68302_DEBUG" = "yes"]) # BSP_VARIANT=${BSP_VARIANT-bare} # AC_DEFINE_UNQUOTED([VARIANT],[${BSP_VARIANT}],[missing explanation]) +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/ods68302/startup/bspstart.c b/c/src/lib/libbsp/m68k/ods68302/startup/bspstart.c deleted file mode 100644 index a8ed36daa6..0000000000 --- a/c/src/lib/libbsp/m68k/ods68302/startup/bspstart.c +++ /dev/null @@ -1,51 +0,0 @@ -/* - * 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 - -#include -#include -#include - -/* - * Use the shared implementations of the following routines - */ - -void bsp_libc_init( void *, uint32_t, int ); -void bsp_pretasking_hook(void); /* m68k version */ - -/* - * bsp_start - * - * This routine does the bulk of the system initialization. - */ - -void bsp_start( void ) -{ - extern void *_WorkspaceBase; - extern void *_RamSize; - extern unsigned long _M68k_Ramsize; - - _M68k_Ramsize = (unsigned long)&_RamSize; /* RAM size set in linker script */ - - /* - * Need to "allocate" the memory for the RTEMS Workspace and - * tell the RTEMS configuration where it is. This memory is - * not malloc'ed. It is just "pulled from the air". - */ - - Configuration.work_space_start = (void *) &_WorkspaceBase; -} diff --git a/c/src/lib/libbsp/m68k/ods68302/startup/linkcmds b/c/src/lib/libbsp/m68k/ods68302/startup/linkcmds index 584a7038d8..5535563077 100644 --- a/c/src/lib/libbsp/m68k/ods68302/startup/linkcmds +++ b/c/src/lib/libbsp/m68k/ods68302/startup/linkcmds @@ -10,7 +10,7 @@ */ _RamBase = DEFINED(_RamBase) ? _RamBase : 0x0; _RamSize = DEFINED(_RamSize) ? _RamSize : 1M; -_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x10000; +_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x0; _StackSize = DEFINED(_StackSize) ? _StackSize : 0x1000; /* -- cgit v1.2.3