diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-09-16 20:13:21 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-09-16 20:13:21 +0000 |
commit | 94bbe3a450a08d1a652559a0d744d7ab9ad09626 (patch) | |
tree | 640ac0b85eb9736736fe1eb7b0628ea482864d25 /c/src/lib/libbsp | |
parent | 2008-09-16 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
download | rtems-94bbe3a450a08d1a652559a0d744d7ab9ad09626.tar.bz2 |
2008-09-16 Joel Sherrill <joel.sherrill@oarcorp.com>
* Makefile.am, startup/linkcmds, startup/linkcmds.rom,
startup/linkcmds.rom2ram: Use top level shared bsp_get_work_area()
implementation.
Diffstat (limited to 'c/src/lib/libbsp')
-rw-r--r-- | c/src/lib/libbsp/sh/gensh4/ChangeLog | 6 | ||||
-rw-r--r-- | c/src/lib/libbsp/sh/gensh4/Makefile.am | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/sh/gensh4/startup/linkcmds | 5 | ||||
-rw-r--r-- | c/src/lib/libbsp/sh/gensh4/startup/linkcmds.rom | 12 | ||||
-rw-r--r-- | c/src/lib/libbsp/sh/gensh4/startup/linkcmds.rom2ram | 11 |
5 files changed, 15 insertions, 21 deletions
diff --git a/c/src/lib/libbsp/sh/gensh4/ChangeLog b/c/src/lib/libbsp/sh/gensh4/ChangeLog index f2f614baf1..676885d58e 100644 --- a/c/src/lib/libbsp/sh/gensh4/ChangeLog +++ b/c/src/lib/libbsp/sh/gensh4/ChangeLog @@ -1,3 +1,9 @@ +2008-09-16 Joel Sherrill <joel.sherrill@oarcorp.com> + + * Makefile.am, startup/linkcmds, startup/linkcmds.rom, + startup/linkcmds.rom2ram: Use top level shared bsp_get_work_area() + implementation. + 2008-09-15 Joel Sherrill <joel.sherrill@oarcorp.com> * Makefile.am, configure.ac, include/bsp.h, startup/linkcmds: Use diff --git a/c/src/lib/libbsp/sh/gensh4/Makefile.am b/c/src/lib/libbsp/sh/gensh4/Makefile.am index 08201be6d6..a1e90965ca 100644 --- a/c/src/lib/libbsp/sh/gensh4/Makefile.am +++ b/c/src/lib/libbsp/sh/gensh4/Makefile.am @@ -30,7 +30,7 @@ dist_project_lib_DATA += startup/linkcmds startup/linkcmds.rom \ startup_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \ ../../shared/bsppredriverhook.c ../shared/bspstart.c \ - ../../shared/bsppretaskinghook.c ../shared/bspgetworkarea.c \ + ../../shared/bsppretaskinghook.c ../../shared/bspgetworkarea.c \ ../../shared/bspclean.c ../../shared/sbrk.c ../../shared/bootcard.c \ ../../shared/gnatinstallhandler.c ../shared/bsphwinit.c console_SOURCES = console/console.c ../../shared/dummy_printk_support.c diff --git a/c/src/lib/libbsp/sh/gensh4/startup/linkcmds b/c/src/lib/libbsp/sh/gensh4/startup/linkcmds index d4bb3fad62..5c6a371648 100644 --- a/c/src/lib/libbsp/sh/gensh4/startup/linkcmds +++ b/c/src/lib/libbsp/sh/gensh4/startup/linkcmds @@ -24,7 +24,7 @@ ENTRY(_start) _RamBase = DEFINED(_RamBase) ? _RamBase : 0x80000000; _RamSize = DEFINED(_RamSize) ? _RamSize : 4M; - +_HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x0; /* * Area assignments: @@ -165,10 +165,9 @@ SECTIONS .stack . : { . = . + 4096; } - . = ALIGN(16); . = ALIGN(16); - _WorkSpaceStart = . ; + _WorkAreaBase = . ; . = ALIGN(16); _CPU_Interrupt_stack_low = . ; diff --git a/c/src/lib/libbsp/sh/gensh4/startup/linkcmds.rom b/c/src/lib/libbsp/sh/gensh4/startup/linkcmds.rom index b806b3d74b..3dcddfa3eb 100644 --- a/c/src/lib/libbsp/sh/gensh4/startup/linkcmds.rom +++ b/c/src/lib/libbsp/sh/gensh4/startup/linkcmds.rom @@ -24,8 +24,9 @@ ENTRY(_start) /* Do we need any of these for elf? __DYNAMIC = 0; */ +_RamBase = DEFINED(_RamBase) ? _RamBase : 0x88000000; +_RamSize = DEFINED(_RamSize) ? _RamSize : 8M; _HeapSize = DEFINED(_HeapSize) ? _HeapSize : (2 * 1024 * 1024); -_WorkspaceSize = DEFINED(_WorkspaceSize) ? _WorkspaceSize : (1024 * 1024); /* * Area assignments: @@ -169,14 +170,7 @@ SECTIONS } > ram . = ALIGN(16); - _HeapStart = . ; - . = . + _HeapSize ; - PROVIDE( _HeapEnd = . ); - - . = ALIGN(16); - _WorkSpaceStart = . ; - . = . + _WorkspaceSize ; - PROVIDE(_WorkSpaceEnd = .); + _WorkAreaBase = . ; . = ALIGN(16); .stack . : { diff --git a/c/src/lib/libbsp/sh/gensh4/startup/linkcmds.rom2ram b/c/src/lib/libbsp/sh/gensh4/startup/linkcmds.rom2ram index 78c5cf36e9..7a36454f10 100644 --- a/c/src/lib/libbsp/sh/gensh4/startup/linkcmds.rom2ram +++ b/c/src/lib/libbsp/sh/gensh4/startup/linkcmds.rom2ram @@ -24,8 +24,9 @@ ENTRY(_start) /* Do we need any of these for elf? __DYNAMIC = 0; */ +_RamBase = DEFINED(_RamBase) ? _RamBase : 0x88000000; +_RamSize = DEFINED(_RamSize) ? _RamSize : 8M; _HeapSize = DEFINED(_HeapSize) ? _HeapSize : (2 * 1024 * 1024); -_WorkspaceSize = DEFINED(_WorkspaceSize) ? _WorkspaceSize : (1024 * 1024); /* * Area assignments: @@ -172,14 +173,8 @@ SECTIONS *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*) } >ram . = ALIGN(16); - _HeapStart = . ; - . = . + _HeapSize ; - PROVIDE( _HeapEnd = . ); - . = ALIGN(16); - _WorkSpaceStart = . ; - . = . + _WorkspaceSize ; - PROVIDE(_WorkSpaceEnd = .); + _WorkAreaBase = . ; . = ALIGN(16); .stack . : { |