From 47733692fbbf2991c852e68cecb4b289728a3b6f Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 16 Sep 2008 19:03:40 +0000 Subject: 2008-09-16 Joel Sherrill * Makefile.am, configure.ac, clock/ckinit.c, startup/bspstart.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. --- c/src/lib/libbsp/m68k/idp/ChangeLog | 7 +++++++ c/src/lib/libbsp/m68k/idp/Makefile.am | 2 +- c/src/lib/libbsp/m68k/idp/clock/ckinit.c | 3 +-- c/src/lib/libbsp/m68k/idp/configure.ac | 2 ++ c/src/lib/libbsp/m68k/idp/startup/bspstart.c | 28 ++++------------------------ c/src/lib/libbsp/m68k/idp/startup/linkcmds | 2 +- 6 files changed, 16 insertions(+), 28 deletions(-) (limited to 'c/src/lib/libbsp/m68k/idp') diff --git a/c/src/lib/libbsp/m68k/idp/ChangeLog b/c/src/lib/libbsp/m68k/idp/ChangeLog index 3f8c461268..381acd1945 100644 --- a/c/src/lib/libbsp/m68k/idp/ChangeLog +++ b/c/src/lib/libbsp/m68k/idp/ChangeLog @@ -1,3 +1,10 @@ +2008-09-16 Joel Sherrill + + * Makefile.am, configure.ac, clock/ckinit.c, startup/bspstart.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. + 2008-09-10 Joel Sherrill * include/bsp.h: Review of all bsp_cleanup() implementations. In this diff --git a/c/src/lib/libbsp/m68k/idp/Makefile.am b/c/src/lib/libbsp/m68k/idp/Makefile.am index f1b9bf7969..eb09efe171 100644 --- a/c/src/lib/libbsp/m68k/idp/Makefile.am +++ b/c/src/lib/libbsp/m68k/idp/Makefile.am @@ -29,7 +29,7 @@ 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/bsppretaskinghook.c ../../m68k/shared/m68kbspgetworkarea.c \ ../../shared/sbrk.c ../../m68k/shared/setvec.c \ ../../shared/gnatinstallhandler.c clock_SOURCES = clock/ckinit.c diff --git a/c/src/lib/libbsp/m68k/idp/clock/ckinit.c b/c/src/lib/libbsp/m68k/idp/clock/ckinit.c index 932c541eb5..9eec08b673 100644 --- a/c/src/lib/libbsp/m68k/idp/clock/ckinit.c +++ b/c/src/lib/libbsp/m68k/idp/clock/ckinit.c @@ -26,9 +26,8 @@ #include #include -#include -uint32_t Clock_isrs; /* ISRs until next tick */ +uint32_t Clock_isrs; /* ISRs until next tick */ volatile uint32_t Clock_driver_ticks; /* ticks since initialization */ rtems_isr_entry Old_ticker; diff --git a/c/src/lib/libbsp/m68k/idp/configure.ac b/c/src/lib/libbsp/m68k/idp/configure.ac index 2dc9b68ff1..ff402e2188 100644 --- a/c/src/lib/libbsp/m68k/idp/configure.ac +++ b/c/src/lib/libbsp/m68k/idp/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/idp/startup/bspstart.c b/c/src/lib/libbsp/m68k/idp/startup/bspstart.c index a3bf1d82ce..ef8d8dc5de 100644 --- a/c/src/lib/libbsp/m68k/idp/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/idp/startup/bspstart.c @@ -14,11 +14,7 @@ * $Id$ */ -#include - #include -#include -#include unsigned char *duart_base; extern struct duart_regs duart_info; @@ -27,41 +23,29 @@ extern struct duart_regs duart_info; void led_putnum(void); -/* - * 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 ) { - m68k_isr_entry *monitors_vector_table; - int index; - extern void *_WorkspaceBase; - extern void *_RamSize; - extern unsigned long _M68k_Ramsize; + m68k_isr_entry *monitors_vector_table; + int index; /* RAM size set in linker script */ - _M68k_Ramsize = (unsigned long)&_RamSize; duart_base = (unsigned char *)DUART_ADDR; /* * Set the VBR here to the monitor's default. */ - monitors_vector_table = (m68k_isr_entry *)0; /* This is where you set vector base register = 0 */ m68k_set_vbr( monitors_vector_table ); /* The vector interrupt table for the 680x0 is in appendix B-2 - of the M68000 Family Programmer's reference table */ + * of the M68000 Family Programmer's reference table + */ for ( index=2 ; index<=255 ; index++ ) M68Kvec[ index ] = monitors_vector_table[ 32 ]; @@ -78,9 +62,5 @@ void bsp_start( void ) rtems_cache_enable_instruction(); rtems_cache_enable_data(); - Configuration.work_space_start = (void *) &_WorkspaceBase; - /* led_putnum('e'); * for debugging purposes only */ - - /* Clock_exit is done as an atexit() function */ } diff --git a/c/src/lib/libbsp/m68k/idp/startup/linkcmds b/c/src/lib/libbsp/m68k/idp/startup/linkcmds index 91b2bb4dbd..07ae9b0af0 100644 --- a/c/src/lib/libbsp/m68k/idp/startup/linkcmds +++ b/c/src/lib/libbsp/m68k/idp/startup/linkcmds @@ -22,7 +22,7 @@ MEMORY */ _RamBase = DEFINED(_RamBase) ? _RamBase : 0x0; _RamSize = DEFINED(_RamSize) ? _RamSize : 2M; -_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x10000; +_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x0; _StackSize = DEFINED(_StackSize) ? _StackSize : 0x1000; SECTIONS -- cgit v1.2.3