RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2008-09-16 Joel Sherrill <joel.sherrill@oarcorp.com>

Browse Source 
* 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.
This commit is contained in:
Joel Sherrill
2008-09-16 19:03:28 +00:00
parent 7b18d2f797
commit b1ded2405d
14 changed files with 43 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
c/src/lib/libbsp/m68k/av5282/ChangeLog
View File

@@ -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

2
c/src/lib/libbsp/m68k/av5282/Makefile.am
View File

@@ -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 \

2
c/src/lib/libbsp/m68k/av5282/configure.ac
View File

@@ -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

33
c/src/lib/libbsp/m68k/av5282/startup/bspstart.c
View File

@@ -22,16 +22,8 @@
*/
#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
*/
@@ -141,13 +133,6 @@ void _CPU_cache_invalidate_1_data_line(const void *addr)
asm volatile ("cpushl %%bc,(%0)" :: "a" (addr));
}
/*
* These are used by bsp_start
*/
extern char _WorkspaceBase[];
extern char _RamSize[];
extern unsigned long _M68k_Ramsize;
/*
* bsp_start
*
@@ -155,24 +140,6 @@ extern unsigned long _M68k_Ramsize;
*/
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
*/

6
c/src/lib/libbsp/m68k/av5282/startup/linkcmds
View File

@@ -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;
/*

6
c/src/lib/libbsp/m68k/av5282/startup/linkcmdsflash
View File

@@ -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;
/*

6
c/src/lib/libbsp/m68k/av5282/startup/linkcmdsram
View File

@@ -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;
/*

8
c/src/lib/libbsp/m68k/mcf5235/ChangeLog
View File

@@ -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

6
c/src/lib/libbsp/m68k/mcf5235/Makefile.am
View File

@@ -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

2
c/src/lib/libbsp/m68k/mcf5235/configure.ac
View File

@@ -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

6
c/src/lib/libbsp/m68k/mcf5235/startup/bspstart.c
View File

@@ -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);
}

6
c/src/lib/libbsp/m68k/mcf5235/startup/linkcmds
View File

@@ -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;
/*

6
c/src/lib/libbsp/m68k/mcf5235/startup/linkcmdsflash
View File

@@ -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;
/*

6
c/src/lib/libbsp/m68k/mcf5235/startup/linkcmdsram
View File

@@ -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;
/*