diff --git a/c/src/lib/libbsp/m68k/csb360/ChangeLog b/c/src/lib/libbsp/m68k/csb360/ChangeLog index 55a6f32679..8e0f0c29dd 100644 --- a/c/src/lib/libbsp/m68k/csb360/ChangeLog +++ b/c/src/lib/libbsp/m68k/csb360/ChangeLog @@ -1,3 +1,11 @@ +2008-09-16 Joel Sherrill + + * Makefile.am, configure.ac, 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/csb360/Makefile.am b/c/src/lib/libbsp/m68k/csb360/Makefile.am index 428a8d00c0..7a684e46fe 100644 --- a/c/src/lib/libbsp/m68k/csb360/Makefile.am +++ b/c/src/lib/libbsp/m68k/csb360/Makefile.am @@ -29,9 +29,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 ../../m68k/shared/m68kpretaskinghook.c \ - startup/bspstart.c startup/init5272.c ../../shared/bootcard.c \ + ../../shared/bsppredriverhook.c ../../shared/bsppretaskinghook.c \ + ../../shared/bsppost.c ../../m68k/shared/m68kbspgetworkarea.c \ + ../../shared/bspstart.c startup/init5272.c ../../shared/bootcard.c \ ../../shared/sbrk.c ../../m68k/shared/setvec.c \ ../../shared/gnatinstallhandler.c console_SOURCES = console/console-io.c ../../shared/console-polled.c diff --git a/c/src/lib/libbsp/m68k/csb360/configure.ac b/c/src/lib/libbsp/m68k/csb360/configure.ac index 229233eded..e5bd6cec32 100644 --- a/c/src/lib/libbsp/m68k/csb360/configure.ac +++ b/c/src/lib/libbsp/m68k/csb360/configure.ac @@ -17,6 +17,8 @@ RTEMS_PROG_CCAS RTEMS_CHECK_NETWORKING +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/csb360/startup/bspstart.c b/c/src/lib/libbsp/m68k/csb360/startup/bspstart.c deleted file mode 100644 index 5135ffb41f..0000000000 --- a/c/src/lib/libbsp/m68k/csb360/startup/bspstart.c +++ /dev/null @@ -1,59 +0,0 @@ -/* - * BSP startup - * - * 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) 2000 OKTET Ltd., St.-Petersburg, Russia - * Author: Victor V. Vengerov - * - * Based on work: - * Author: - * David Fiddes, D.J@fiddes.surfaid.org - * http://www.calm.hw.ac.uk/davidf/coldfire/ - * - * COPYRIGHT (c) 1989-1998. - * 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 - -extern unsigned int _RamSize; - -/* - * 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 initialisation. - */ -void bsp_start( void ) -{ - extern void *_WorkspaceBase; - extern unsigned long _M68k_Ramsize; - _M68k_Ramsize = (unsigned long)&_RamSize; /* 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/csb360/startup/linkcmds b/c/src/lib/libbsp/m68k/csb360/startup/linkcmds index 8d4a70be1f..ca07568914 100644 --- a/c/src/lib/libbsp/m68k/csb360/startup/linkcmds +++ b/c/src/lib/libbsp/m68k/csb360/startup/linkcmds @@ -14,6 +14,7 @@ * Initial stack located in on-chip SRAM and not declared there. */ _HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x0; +_RamBase = DEFINED(_RamBase) ? _RamBase : 0x00100000; _RamSize = DEFINED(_RamSize) ? _RamSize : 31M; /* This is needed for _CPU_ISR_install_vector -