diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-08-19 15:45:01 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-08-19 15:45:01 +0000 |
| commit | d80c921dbc1e3efd130917da3d45222718454bbb (patch) | |
| tree | c5905023f134da0b2591dbcf5d33c2e886ce2496 /c/src/lib/libbsp/m68k | |
| parent | 2008-08-19 Joel Sherrill <joel.sherrill@OARcorp.com> (diff) | |
| download | rtems-d80c921dbc1e3efd130917da3d45222718454bbb.tar.bz2 | |
2008-08-19 Sebastian Huber <sebastian.huber@embedded-brains.de>
* startup/bspstart.c: Fixed nested extern declarations.
Diffstat (limited to 'c/src/lib/libbsp/m68k')
| -rw-r--r-- | c/src/lib/libbsp/m68k/genmcf548x/ChangeLog | 4 | ||||
| -rw-r--r-- | c/src/lib/libbsp/m68k/genmcf548x/startup/bspstart.c | 24 |
2 files changed, 16 insertions, 12 deletions
diff --git a/c/src/lib/libbsp/m68k/genmcf548x/ChangeLog b/c/src/lib/libbsp/m68k/genmcf548x/ChangeLog index c1b9c16441..9d8a6be6d4 100644 --- a/c/src/lib/libbsp/m68k/genmcf548x/ChangeLog +++ b/c/src/lib/libbsp/m68k/genmcf548x/ChangeLog @@ -1,3 +1,7 @@ +2008-08-19 Sebastian Huber <sebastian.huber@embedded-brains.de> + + * startup/bspstart.c: Fixed nested extern declarations. + 2008-08-19 Ralf Corsépius <ralf.corsepius@rtems.org> * startup/bspstart.c: Add missing prototypes. diff --git a/c/src/lib/libbsp/m68k/genmcf548x/startup/bspstart.c b/c/src/lib/libbsp/m68k/genmcf548x/startup/bspstart.c index abc6daa113..9149a21862 100644 --- a/c/src/lib/libbsp/m68k/genmcf548x/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/genmcf548x/startup/bspstart.c @@ -53,12 +53,24 @@ unsigned long _HeapSize; extern uint32_t _CPU_cacr_shadow; +extern unsigned long _M68k_Ramsize; + +/* +* These labels (!) are defined in the linker command file or when the linker is +* invoked. +* NOTE: The information (size) is the address of the object, not the object +* itself. +*/ + extern char _SdramBase[]; extern char _BootFlashBase[]; extern char _CodeFlashBase[]; extern char _SdramSize[]; extern char _BootFlashSize[]; extern char _CodeFlashSize[]; +extern char _TopRamReserved []; +extern char _WorkspaceBase []; +extern char _RamSize[]; /* * CPU-space access @@ -200,15 +212,6 @@ void bsp_pretasking_hook(void); /* m68k version */ void bsp_calc_mem_layout(void) { /* - * these labels (!) are defined in the linker command file - * or when the linker is invoked - * NOTE: the information(size) is the address of the object, - * not the object otself - */ - extern char _TopRamReserved []; - extern char _WorkspaceBase []; - - /* * compute the memory layout: * - first unused address is Workspace start * - Heap starts at end of workspace @@ -285,9 +288,6 @@ void bsp_calc_mem_layout(void) */ void bsp_start( void ) { - extern char _RamSize[]; - extern unsigned long _M68k_Ramsize; - _M68k_Ramsize = (unsigned long)_RamSize; /* RAM size set in linker script */ /* |