diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-09-16 19:03:28 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-09-16 19:03:28 +0000 |
commit | b1ded2405d3da9f9c53e670d9ba42460e289eec6 (patch) | |
tree | 3ae0441806d98e8895a27997d463cfaee92965f2 /c/src | |
parent | 2008-09-16 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
download | rtems-b1ded2405d3da9f9c53e670d9ba42460e289eec6.tar.bz2 |
2008-09-16 Joel Sherrill <joel.sherrill@oarcorp.com>
* Makefile.am, configure.ac, startup/bspstart.c, startup/linkcmds,
startup/linkcmdsflash, startup/linkcmdsram: 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.
Diffstat (limited to 'c/src')
-rw-r--r-- | c/src/lib/libbsp/m68k/av5282/ChangeLog | 8 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/av5282/Makefile.am | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/av5282/configure.ac | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/av5282/startup/bspstart.c | 33 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/av5282/startup/linkcmds | 6 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/av5282/startup/linkcmdsflash | 6 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/av5282/startup/linkcmdsram | 6 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mcf5235/ChangeLog | 8 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mcf5235/Makefile.am | 6 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mcf5235/configure.ac | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mcf5235/startup/bspstart.c | 6 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mcf5235/startup/linkcmds | 6 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mcf5235/startup/linkcmdsflash | 6 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/mcf5235/startup/linkcmdsram | 6 |
14 files changed, 43 insertions, 60 deletions
diff --git a/c/src/lib/libbsp/m68k/av5282/ChangeLog b/c/src/lib/libbsp/m68k/av5282/ChangeLog index 84ef00de15..17a927ce20 100644 --- a/c/src/lib/libbsp/m68k/av5282/ChangeLog +++ b/c/src/lib/libbsp/m68k/av5282/ChangeLog @@ -1,3 +1,11 @@ +2008-09-16 Joel Sherrill <joel.sherrill@oarcorp.com> + + * Makefile.am, configure.ac, startup/bspstart.c, startup/linkcmds, + startup/linkcmdsflash, startup/linkcmdsram: 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 <joel.sherrill@oarcorp.com> * include/bsp.h: Review of all bsp_cleanup() implementations. In this diff --git a/c/src/lib/libbsp/m68k/av5282/Makefile.am b/c/src/lib/libbsp/m68k/av5282/Makefile.am index 966455b217..29999bc614 100644 --- a/c/src/lib/libbsp/m68k/av5282/Makefile.am +++ b/c/src/lib/libbsp/m68k/av5282/Makefile.am @@ -27,7 +27,7 @@ dist_project_lib_DATA += startup/linkcmds startup_SOURCES = startup/bspclean.c ../../shared/bsppredriverhook.c \ ../../shared/bsplibc.c ../../shared/bsppost.c \ - ../../m68k/shared/m68kpretaskinghook.c \ + ../../shared/bsppretaskinghook.c ../../m68k/shared/m68kbspgetworkarea.c \ startup/init5282.c startup/bspstart.c \ ../../shared/bootcard.c \ ../../shared/sbrk.c ../../m68k/shared/setvec.c \ diff --git a/c/src/lib/libbsp/m68k/av5282/configure.ac b/c/src/lib/libbsp/m68k/av5282/configure.ac index eeaf687a4a..d11df33e42 100644 --- a/c/src/lib/libbsp/m68k/av5282/configure.ac +++ b/c/src/lib/libbsp/m68k/av5282/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/av5282/startup/bspstart.c b/c/src/lib/libbsp/m68k/av5282/startup/bspstart.c index 2478d5ee72..1edcf42b63 100644 --- a/c/src/lib/libbsp/m68k/av5282/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/av5282/startup/bspstart.c @@ -22,17 +22,9 @@ */ #include <bsp.h> -#include <rtems/libio.h> -#include <rtems/libcsupport.h> #include <string.h> /* - * Location of 'VME' access - */ -#define VME_ONE_BASE 0x30000000 -#define VME_TWO_BASE 0x31000000 - -/* * Cacheable areas */ #define SDRAM_BASE 0 @@ -142,37 +134,12 @@ void _CPU_cache_invalidate_1_data_line(const void *addr) } /* - * These are used by bsp_start - */ -extern char _WorkspaceBase[]; -extern char _RamSize[]; -extern unsigned long _M68k_Ramsize; - -/* * bsp_start * * This routine does the bulk of the system initialisation. */ void bsp_start( void ) { - _M68k_Ramsize = (unsigned long)_RamSize; /* RAM size set in linker script */ - - /* - * 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; - /* * Invalidate the cache and disable it */ diff --git a/c/src/lib/libbsp/m68k/av5282/startup/linkcmds b/c/src/lib/libbsp/m68k/av5282/startup/linkcmds index df1546f480..4d759a2713 100644 --- a/c/src/lib/libbsp/m68k/av5282/startup/linkcmds +++ b/c/src/lib/libbsp/m68k/av5282/startup/linkcmds @@ -15,9 +15,9 @@ /* * Declare some sizes. */ -_RamBase = DEFINED(_RamBase) ? _RamBase : 0x0 ; -_RamSize = DEFINED(_RamSize) ? _RamSize : 16M ; -_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0 ; +_RamBase = DEFINED(_RamBase) ? _RamBase : 0x0; +_RamSize = DEFINED(_RamSize) ? _RamSize : 16M; +_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0; _VBR = 0x0; /* diff --git a/c/src/lib/libbsp/m68k/av5282/startup/linkcmdsflash b/c/src/lib/libbsp/m68k/av5282/startup/linkcmdsflash index f446c34c7d..09eb5b9f4f 100644 --- a/c/src/lib/libbsp/m68k/av5282/startup/linkcmdsflash +++ b/c/src/lib/libbsp/m68k/av5282/startup/linkcmdsflash @@ -15,9 +15,9 @@ /* * Declare some sizes. */ -_RamBase = DEFINED(_RamBase) ? _RamBase : 0x0 ; -_RamSize = DEFINED(_RamSize) ? _RamSize : 16M ; -_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0 ; +_RamBase = DEFINED(_RamBase) ? _RamBase : 0x0; +_RamSize = DEFINED(_RamSize) ? _RamSize : 16M; +_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0; _VBR = 0x0; /* diff --git a/c/src/lib/libbsp/m68k/av5282/startup/linkcmdsram b/c/src/lib/libbsp/m68k/av5282/startup/linkcmdsram index c0f9e77a9c..1dfa1f6f33 100644 --- a/c/src/lib/libbsp/m68k/av5282/startup/linkcmdsram +++ b/c/src/lib/libbsp/m68k/av5282/startup/linkcmdsram @@ -15,9 +15,9 @@ /* * Declare some sizes. */ -_RamBase = DEFINED(_RamBase) ? _RamBase : 0x0 ; -_RamSize = DEFINED(_RamSize) ? _RamSize : 16M ; -_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0 ; +_RamBase = DEFINED(_RamBase) ? _RamBase : 0x0; +_RamSize = DEFINED(_RamSize) ? _RamSize : 16M; +_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0; _VBR = 0x0; /* diff --git a/c/src/lib/libbsp/m68k/mcf5235/ChangeLog b/c/src/lib/libbsp/m68k/mcf5235/ChangeLog index 2c28a0fba2..768546e47e 100644 --- a/c/src/lib/libbsp/m68k/mcf5235/ChangeLog +++ b/c/src/lib/libbsp/m68k/mcf5235/ChangeLog @@ -1,3 +1,11 @@ +2008-09-16 Joel Sherrill <joel.sherrill@oarcorp.com> + + * Makefile.am, configure.ac, startup/bspstart.c, startup/linkcmds, + startup/linkcmdsflash, startup/linkcmdsram: 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 <joel.sherrill@oarcorp.com> * include/bsp.h: Review of all bsp_cleanup() implementations. In this diff --git a/c/src/lib/libbsp/m68k/mcf5235/Makefile.am b/c/src/lib/libbsp/m68k/mcf5235/Makefile.am index 1ec2bee944..df84513339 100644 --- a/c/src/lib/libbsp/m68k/mcf5235/Makefile.am +++ b/c/src/lib/libbsp/m68k/mcf5235/Makefile.am @@ -28,10 +28,8 @@ dist_project_lib_DATA += startup/linkcmds startup/linkcmdsflash \ startup_SOURCES = startup/bspclean.c ../../shared/bsppredriverhook.c \ ../../shared/bsplibc.c ../../shared/bsppost.c \ - ../../m68k/shared/m68kpretaskinghook.c \ - ../../m68k/shared/m68kbspgetworkarea.c \ - startup/init5235.c startup/bspstart.c \ - ../../shared/bootcard.c \ + ../../shared/bsppretaskinghook.c ../../m68k/shared/m68kbspgetworkarea.c \ + startup/init5235.c startup/bspstart.c ../../shared/bootcard.c \ ../../shared/sbrk.c ../../m68k/shared/setvec.c \ ../../shared/gnatinstallhandler.c clock_SOURCES = clock/clock.c diff --git a/c/src/lib/libbsp/m68k/mcf5235/configure.ac b/c/src/lib/libbsp/m68k/mcf5235/configure.ac index d98be75c45..b89e18b355 100644 --- a/c/src/lib/libbsp/m68k/mcf5235/configure.ac +++ b/c/src/lib/libbsp/m68k/mcf5235/configure.ac @@ -21,6 +21,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/mcf5235/startup/bspstart.c b/c/src/lib/libbsp/m68k/mcf5235/startup/bspstart.c index 9643ad064a..b0193d6a62 100644 --- a/c/src/lib/libbsp/m68k/mcf5235/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/mcf5235/startup/bspstart.c @@ -22,9 +22,6 @@ */ #include <bsp.h> -#include <rtems/libio.h> -#include <rtems/libcsupport.h> -#include <string.h> /* * Cacheable areas @@ -161,8 +158,9 @@ void bsp_start( void ) m68k_set_cacr(cacr_mode); } +extern char _CPUClockSpeed[]; + uint32_t get_CPU_clock_speed(void) { - extern char _CPUClockSpeed[]; return( (uint32_t)_CPUClockSpeed); } diff --git a/c/src/lib/libbsp/m68k/mcf5235/startup/linkcmds b/c/src/lib/libbsp/m68k/mcf5235/startup/linkcmds index fccd6ccc29..40a30bfe86 100644 --- a/c/src/lib/libbsp/m68k/mcf5235/startup/linkcmds +++ b/c/src/lib/libbsp/m68k/mcf5235/startup/linkcmds @@ -22,9 +22,9 @@ MCF5235_BSP_START_FROM_FLASH = 0; /* * Declare some sizes. */ -_RamBase = DEFINED(_RamBase) ? _RamBase : 0x0 ; -_RamSize = DEFINED(_RamSize) ? _RamSize : 16M ; -_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0 ; +_RamBase = DEFINED(_RamBase) ? _RamBase : 0x0; +_RamSize = DEFINED(_RamSize) ? _RamSize : 16M; +_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0; /* diff --git a/c/src/lib/libbsp/m68k/mcf5235/startup/linkcmdsflash b/c/src/lib/libbsp/m68k/mcf5235/startup/linkcmdsflash index b9e0a40101..48417733de 100644 --- a/c/src/lib/libbsp/m68k/mcf5235/startup/linkcmdsflash +++ b/c/src/lib/libbsp/m68k/mcf5235/startup/linkcmdsflash @@ -22,9 +22,9 @@ MCF5235_BSP_START_FROM_FLASH = 1; /* * Declare some sizes. */ -_RamBase = DEFINED(_RamBase) ? _RamBase : 0x0 ; -_RamSize = DEFINED(_RamSize) ? _RamSize : 16M ; -_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0 ; +_RamBase = DEFINED(_RamBase) ? _RamBase : 0x0; +_RamSize = DEFINED(_RamSize) ? _RamSize : 16M; +_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0; /* diff --git a/c/src/lib/libbsp/m68k/mcf5235/startup/linkcmdsram b/c/src/lib/libbsp/m68k/mcf5235/startup/linkcmdsram index 0e4099a7a1..97db926233 100644 --- a/c/src/lib/libbsp/m68k/mcf5235/startup/linkcmdsram +++ b/c/src/lib/libbsp/m68k/mcf5235/startup/linkcmdsram @@ -22,9 +22,9 @@ MCF5235_BSP_START_FROM_FLASH = 0; /* * Declare some sizes. */ -_RamBase = DEFINED(_RamBase) ? _RamBase : 0x0 ; -_RamSize = DEFINED(_RamSize) ? _RamSize : 16M ; -_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0 ; +_RamBase = DEFINED(_RamBase) ? _RamBase : 0x0; +_RamSize = DEFINED(_RamSize) ? _RamSize : 16M; +_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0; /* |