diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-09-16 22:16:01 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-09-16 22:16:01 +0000 |
commit | 939439d3a999f65cea84c84e2afd86854b4aaec0 (patch) | |
tree | 2d154534f664b1bd680394dc59e56a0dac7ee246 /c/src/lib/libbsp | |
parent | 2008-09-16 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
download | rtems-939439d3a999f65cea84c84e2afd86854b4aaec0.tar.bz2 |
2008-09-16 Joel Sherrill <joel.sherrill@oarcorp.com>
* Makefile.am, startup/bspstart.c, startup/init548x.c,
startup/linkcmds, startup/linkcmds.m5484FireEngine.flash: Use top
level shared bsp_get_work_area() implementation.
Diffstat (limited to 'c/src/lib/libbsp')
6 files changed, 20 insertions, 14 deletions
diff --git a/c/src/lib/libbsp/m68k/genmcf548x/ChangeLog b/c/src/lib/libbsp/m68k/genmcf548x/ChangeLog index 7eaf08adb2..be05f90935 100644 --- a/c/src/lib/libbsp/m68k/genmcf548x/ChangeLog +++ b/c/src/lib/libbsp/m68k/genmcf548x/ChangeLog @@ -1,5 +1,11 @@ 2008-09-16 Joel Sherrill <joel.sherrill@oarcorp.com> + * Makefile.am, startup/bspstart.c, startup/init548x.c, + startup/linkcmds, startup/linkcmds.m5484FireEngine.flash: Use top + level shared bsp_get_work_area() implementation. + +2008-09-16 Joel Sherrill <joel.sherrill@oarcorp.com> + * Makefile.am, configure.ac, include/bspopts.h.in, startup/bspstart.c, startup/linkcmds, startup/linkcmds.m5484FireEngine.flash: Add use of bsp_get_work_area() in its own file and rely on BSP Framework to diff --git a/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am b/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am index cefa490745..69b9e69d8c 100644 --- a/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am +++ b/c/src/lib/libbsp/m68k/genmcf548x/Makefile.am @@ -26,7 +26,7 @@ project_lib_DATA = start.$(OBJEXT) dist_project_lib_DATA += startup/linkcmds startup_SOURCES = startup/bspclean.c ../../shared/bsplibc.c \ - ../../shared/bsppost.c ../../m68k/shared/m68kbspgetworkarea.c \ + ../../shared/bsppost.c ../../shared/bspgetworkarea.c \ ../../shared/bsppretaskinghook.c ../../shared/bsppredriverhook.c \ startup/init548x.c startup/bspstart.c ../../shared/bootcard.c \ ../../shared/sbrk.c ../../m68k/shared/setvec.c \ diff --git a/c/src/lib/libbsp/m68k/genmcf548x/startup/bspstart.c b/c/src/lib/libbsp/m68k/genmcf548x/startup/bspstart.c index 545c6f6be8..7497ce1427 100644 --- a/c/src/lib/libbsp/m68k/genmcf548x/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/genmcf548x/startup/bspstart.c @@ -61,7 +61,7 @@ extern char _SdramSize[]; extern char _BootFlashSize[]; extern char _CodeFlashSize[]; extern char _TopRamReserved []; -extern char _WorkspaceBase []; +extern char WorkAreaBase []; /* * CPU-space access diff --git a/c/src/lib/libbsp/m68k/genmcf548x/startup/init548x.c b/c/src/lib/libbsp/m68k/genmcf548x/startup/init548x.c index 7319fa45f1..faaec01c66 100644 --- a/c/src/lib/libbsp/m68k/genmcf548x/startup/init548x.c +++ b/c/src/lib/libbsp/m68k/genmcf548x/startup/init548x.c @@ -63,7 +63,7 @@ extern uint8_t _BssStart[]; extern uint8_t _BssEnd[]; extern uint8_t _BootFlashBase[]; extern uint8_t _CodeFlashBase[]; -extern uint8_t _RamBase[]; +extern uint8_t RamBase[]; extern uint32_t InterruptVectorTable[]; extern uint32_t _VectorRam[]; @@ -207,7 +207,7 @@ sdramc_init (void) | MCF548X_SDRAMC_SDRAMDS_SB_D(MCF548X_SDRAMC_SDRAMDS_DRIVE_8MA) ); MCF548X_SDRAMC_CS0CFG = (0 - | MCF548X_SDRAMC_CSnCFG_CSBA((uint32_t)(_RamBase)) + | MCF548X_SDRAMC_CSnCFG_CSBA((uint32_t)(RamBase)) | MCF548X_SDRAMC_CSnCFG_CSSZ(MCF548X_SDRAMC_CSnCFG_CSSZ_64MBYTE) ); MCF548X_SDRAMC_SDCFG1 = (0 diff --git a/c/src/lib/libbsp/m68k/genmcf548x/startup/linkcmds b/c/src/lib/libbsp/m68k/genmcf548x/startup/linkcmds index 1281cd5656..0fe1616550 100644 --- a/c/src/lib/libbsp/m68k/genmcf548x/startup/linkcmds +++ b/c/src/lib/libbsp/m68k/genmcf548x/startup/linkcmds @@ -75,10 +75,10 @@ _InitPc = DEFINED(_InitPc) ? _InitPc : _SdramBase + 0x400; _InitStackSize = DEFINED(StackSize) ? StackSize : 0x800; /* 2 kB */ _TopRamReserved = DEFINED(_TopRamReserved) ? _TopRamReserved : 0; -_RamBase = DEFINED(_SdramBase) ? _SdramBase : _SdramBase; -_RamSize = DEFINED(_SdramSize) ? _SdramSize : _SdramSize; -_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x0; -_VBR = DEFINED(_VBR) ? _VBR : _RamBase; +RamBase = DEFINED(_SdramBase) ? _SdramBase : _SdramBase; +RamSize = DEFINED(_SdramSize) ? _SdramSize : _SdramSize; +HeapSize = DEFINED(HeapSize) ? HeapSize : 0x0; +_VBR = DEFINED(_VBR) ? _VBR : RamBase; __MBAR = DEFINED(__MBAR) ? __MBAR : 0x10000000; @@ -218,7 +218,7 @@ SECTIONS /*. = _StartInitStackSpace + _InitStackSize;*/ . += _InitStackSize; PROVIDE (_EndInitStackSpace = .); - PROVIDE (_WorkspaceBase = .); + PROVIDE (WorkAreaBase = .); } >sdram /* Stabs debugging sections. */ .stab 0 : { *(.stab) } diff --git a/c/src/lib/libbsp/m68k/genmcf548x/startup/linkcmds.m5484FireEngine.flash b/c/src/lib/libbsp/m68k/genmcf548x/startup/linkcmds.m5484FireEngine.flash index b177fd67eb..a0ee240c75 100644 --- a/c/src/lib/libbsp/m68k/genmcf548x/startup/linkcmds.m5484FireEngine.flash +++ b/c/src/lib/libbsp/m68k/genmcf548x/startup/linkcmds.m5484FireEngine.flash @@ -74,10 +74,10 @@ _InitPc = DEFINED(_InitPc) ? _InitPc : _SdramBase + 0x400; _InitStackSize = DEFINED(StackSize) ? StackSize : 0x2000; /* 8 kB */ _TopRamReserved= DEFINED(_TopRamReserved) ? _TopRamReserved : 0; -_RamBase = DEFINED(_SdramBase) ? _SdramBase : _SdramBase; -_RamSize = DEFINED(_SdramSize) ? _SdramSize : _SdramSize; -_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x0; -_VBR = DEFINED(_VBR) ? _VBR : _RamBase; +RamBase = DEFINED(_SdramBase) ? _SdramBase : _SdramBase; +RamSize = DEFINED(_SdramSize) ? _SdramSize : _SdramSize; +HeapSize = DEFINED(HeapSize) ? HeapSize : 0x0; +_VBR = DEFINED(_VBR) ? _VBR : RamBase; __MBAR = DEFINED(__MBAR) ? __MBAR : 0x10000000; @@ -217,7 +217,7 @@ SECTIONS /*. = _StartInitStackSpace + _InitStackSize;*/ . += _InitStackSize; PROVIDE (_EndInitStackSpace = .); - PROVIDE (_WorkspaceBase = .); + PROVIDE (WorkAreaBase = .); } >sdram /* Stabs debugging sections. */ .stab 0 : { *(.stab) } |