diff options
| author | Chris Johns <chrisj@rtems.org> | 2008-06-11 08:06:30 +0000 |
|---|---|---|
| committer | Chris Johns <chrisj@rtems.org> | 2008-06-11 08:06:30 +0000 |
| commit | 56e8ee4ebd4388832558b71d044584ee2b2b5ee0 (patch) | |
| tree | 304612e0bde84de70d92371a06a8235e550c2962 /c/src | |
| parent | 2008-06-10 Matthew Riek <matthew.riek@ibiscomputer.com.au> (diff) | |
| download | rtems-56e8ee4ebd4388832558b71d044584ee2b2b5ee0.tar.bz2 | |
2008-06-10 Matthew Riek <matthew.riek@ibiscomputer.com.au>
* shared/m68kbspgetworkarea.c: Fix extern type to RamSize.
* shared/m68kpretaskinghook.c: Do not handle the RAM allocation if
the BSP is handling it.
* acinclude.m4: Add the mcf52235 BSP.
Diffstat (limited to 'c/src')
| -rw-r--r-- | c/src/lib/libbsp/m68k/ChangeLog | 7 | ||||
| -rw-r--r-- | c/src/lib/libbsp/m68k/acinclude.m4 | 2 | ||||
| -rw-r--r-- | c/src/lib/libbsp/m68k/shared/m68kbspgetworkarea.c | 2 | ||||
| -rw-r--r-- | c/src/lib/libbsp/m68k/shared/m68kpretaskinghook.c | 4 |
4 files changed, 14 insertions, 1 deletions
diff --git a/c/src/lib/libbsp/m68k/ChangeLog b/c/src/lib/libbsp/m68k/ChangeLog index 2fa27436d2..93468587f1 100644 --- a/c/src/lib/libbsp/m68k/ChangeLog +++ b/c/src/lib/libbsp/m68k/ChangeLog @@ -1,3 +1,10 @@ +2008-06-10 Matthew Riek <matthew.riek@ibiscomputer.com.au> + + * shared/m68kbspgetworkarea.c: Fix extern type to RamSize. + * shared/m68kpretaskinghook.c: Do not handle the RAM allocation if + the BSP is handling it. + * acinclude.m4: Add the mcf52235 BSP. + 2008-05-15 Joel Sherrill <joel.sherrill@OARcorp.com> * shared/m68kpretaskinghook.c: Add capability for bootcard.c BSP diff --git a/c/src/lib/libbsp/m68k/acinclude.m4 b/c/src/lib/libbsp/m68k/acinclude.m4 index d171d30047..bf3d80728e 100644 --- a/c/src/lib/libbsp/m68k/acinclude.m4 +++ b/c/src/lib/libbsp/m68k/acinclude.m4 @@ -16,6 +16,8 @@ AC_DEFUN([RTEMS_CHECK_BSPDIR], AC_CONFIG_SUBDIRS([idp]);; mcf5206elite ) AC_CONFIG_SUBDIRS([mcf5206elite]);; + mcf52235 ) + AC_CONFIG_SUBDIRS([mcf52235]);; mcf5235 ) AC_CONFIG_SUBDIRS([mcf5235]);; mrm332 ) diff --git a/c/src/lib/libbsp/m68k/shared/m68kbspgetworkarea.c b/c/src/lib/libbsp/m68k/shared/m68kbspgetworkarea.c index fbcd7c557d..8457399590 100644 --- a/c/src/lib/libbsp/m68k/shared/m68kbspgetworkarea.c +++ b/c/src/lib/libbsp/m68k/shared/m68kbspgetworkarea.c @@ -29,7 +29,7 @@ void bsp_get_workarea( extern char _RamBase[]; extern char _WorkspaceBase[]; extern char _HeapSize[]; - extern void *_RamSize; + extern char _RamSize[]; *workarea_base = _WorkspaceBase; *workarea_size = (unsigned long)_RamBase + (unsigned long) _RamSize - diff --git a/c/src/lib/libbsp/m68k/shared/m68kpretaskinghook.c b/c/src/lib/libbsp/m68k/shared/m68kpretaskinghook.c index 6bfdbb59eb..20865bfff0 100644 --- a/c/src/lib/libbsp/m68k/shared/m68kpretaskinghook.c +++ b/c/src/lib/libbsp/m68k/shared/m68kpretaskinghook.c @@ -31,6 +31,7 @@ * */ +#if !defined(BSP_BOOTCARD_HANDLES_RAM_ALLOCATION) extern void bsp_libc_init( void *, unsigned long, int ); extern char _RamBase[]; @@ -38,9 +39,11 @@ extern char _WorkspaceBase[]; extern char _HeapSize[]; unsigned long _M68k_Ramsize; +#endif void bsp_pretasking_hook(void) { +#if !defined(BSP_BOOTCARD_HANDLES_RAM_ALLOCATION) void *heapStart; unsigned long heapSize = (unsigned long)_HeapSize; unsigned long ramSpace; @@ -59,4 +62,5 @@ void bsp_pretasking_hook(void) rtems_fatal_error_occurred (('H'<<24) | ('E'<<16) | ('A'<<8) | 'P'); bsp_libc_init(heapStart, heapSize, 0); +#endif } |