diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-09-15 19:18:29 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-09-15 19:18:29 +0000 |
commit | 11a6c974621241c2d556112fe62700b7dd355b5b (patch) | |
tree | 9a794ce5e1eae9bb0fd93e995922057b6748f8a5 /c/src/lib/libbsp/sh/gensh4 | |
parent | 2008-09-15 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
download | rtems-11a6c974621241c2d556112fe62700b7dd355b5b.tar.bz2 |
2008-09-15 Joel Sherrill <joel.sherrill@oarcorp.com>
* Makefile.am, configure.ac, include/bsp.h, startup/linkcmds: Use
shared bsp_get_work_area() in its own file and rely on BSP Framework
to perform more initialization. After factoring this out, it turned
out that all SuperH BSPs has the same bsp_start() implementation so
this was made shared.
* startup/bspstart.c: Removed.
Diffstat (limited to 'c/src/lib/libbsp/sh/gensh4')
-rw-r--r-- | c/src/lib/libbsp/sh/gensh4/ChangeLog | 9 | ||||
-rw-r--r-- | c/src/lib/libbsp/sh/gensh4/Makefile.am | 5 | ||||
-rw-r--r-- | c/src/lib/libbsp/sh/gensh4/configure.ac | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/sh/gensh4/include/bsp.h | 5 | ||||
-rw-r--r-- | c/src/lib/libbsp/sh/gensh4/startup/bspstart.c | 115 | ||||
-rw-r--r-- | c/src/lib/libbsp/sh/gensh4/startup/linkcmds | 19 |
6 files changed, 21 insertions, 134 deletions
diff --git a/c/src/lib/libbsp/sh/gensh4/ChangeLog b/c/src/lib/libbsp/sh/gensh4/ChangeLog index ffd2a5c8b2..f2f614baf1 100644 --- a/c/src/lib/libbsp/sh/gensh4/ChangeLog +++ b/c/src/lib/libbsp/sh/gensh4/ChangeLog @@ -1,3 +1,12 @@ +2008-09-15 Joel Sherrill <joel.sherrill@oarcorp.com> + + * Makefile.am, configure.ac, include/bsp.h, startup/linkcmds: Use + shared bsp_get_work_area() in its own file and rely on BSP Framework + to perform more initialization. After factoring this out, it turned + out that all SuperH BSPs has the same bsp_start() implementation so + this was made shared. + * startup/bspstart.c: Removed. + 2008-09-10 Joel Sherrill <joel.sherrill@oarcorp.com> * include/bsp.h: Review of all bsp_cleanup() implementations. In this diff --git a/c/src/lib/libbsp/sh/gensh4/Makefile.am b/c/src/lib/libbsp/sh/gensh4/Makefile.am index ebe7d882cc..08201be6d6 100644 --- a/c/src/lib/libbsp/sh/gensh4/Makefile.am +++ b/c/src/lib/libbsp/sh/gensh4/Makefile.am @@ -29,9 +29,10 @@ dist_project_lib_DATA += startup/linkcmds startup/linkcmds.rom \ startup/linkcmds.rom2ram startup_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \ - ../../shared/bsppredriverhook.c startup/bspstart.c \ + ../../shared/bsppredriverhook.c ../shared/bspstart.c \ + ../../shared/bsppretaskinghook.c ../shared/bspgetworkarea.c \ ../../shared/bspclean.c ../../shared/sbrk.c ../../shared/bootcard.c \ - ../../shared/gnatinstallhandler.c + ../../shared/gnatinstallhandler.c ../shared/bsphwinit.c console_SOURCES = console/console.c ../../shared/dummy_printk_support.c hw_init_SOURCES = hw_init/hw_init.c diff --git a/c/src/lib/libbsp/sh/gensh4/configure.ac b/c/src/lib/libbsp/sh/gensh4/configure.ac index 3fd26888b8..153f65b3b0 100644 --- a/c/src/lib/libbsp/sh/gensh4/configure.ac +++ b/c/src/lib/libbsp/sh/gensh4/configure.ac @@ -32,6 +32,8 @@ AC_DEFINE_UNQUOTED( [$START_HW_INIT], [Whether to call early_hw_init from start.S]) +RTEMS_BSP_BOOTCARD_HANDLES_RAM_ALLOCATION + # Explicitly list all Makefiles here AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/c/src/lib/libbsp/sh/gensh4/include/bsp.h b/c/src/lib/libbsp/sh/gensh4/include/bsp.h index b2ab4a865f..1c1a52dd6f 100644 --- a/c/src/lib/libbsp/sh/gensh4/include/bsp.h +++ b/c/src/lib/libbsp/sh/gensh4/include/bsp.h @@ -65,11 +65,6 @@ extern "C" { * Defined in the linker script 'linkcmds' */ -extern uint32_t HeapStart ; -extern uint32_t HeapEnd ; -extern uint32_t WorkSpaceStart ; -extern uint32_t WorkSpaceEnd ; - extern void *CPU_Interrupt_stack_low ; extern void *CPU_Interrupt_stack_high ; diff --git a/c/src/lib/libbsp/sh/gensh4/startup/bspstart.c b/c/src/lib/libbsp/sh/gensh4/startup/bspstart.c deleted file mode 100644 index 52114d60ac..0000000000 --- a/c/src/lib/libbsp/sh/gensh4/startup/bspstart.c +++ /dev/null @@ -1,115 +0,0 @@ -/* - * This routine starts the application. It includes application, - * board, and monitor specific initialization and configuration. - * The generic CPU dependent initialization has been performed - * before this routine is invoked. - * - * Authors: Ralf Corsepius (corsepiu@faw.uni-ulm.de) and - * Bernd Becker (becker@faw.uni-ulm.de) - * - * COPYRIGHT (c) 1997-1998, FAW Ulm, Germany - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * - * - * COPYRIGHT (c) 1998-2001. - * On-Line Applications Research Corporation (OAR). - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.com/license/LICENSE. - * - * $Id$ - */ - -#include <bsp.h> -#include <rtems/libio.h> - -#include <rtems/libcsupport.h> - -#include <string.h> - -uint32_t bsp_clicks_per_second; - -extern void bsp_hw_init(void); - -/* - * Use the shared implementations of the following routines - */ - -void bsp_libc_init( void *, uint32_t, int ); - -/* - * Function: bsp_pretasking_hook - * - * Description: - * BSP pretasking hook. Called just before drivers are initialized. - * Used to setup libc and install any BSP extensions. - * - * NOTES: - * Must not use libc (to do io) from here, since drivers are - * not yet initialized. - * - */ - -void bsp_pretasking_hook(void) -{ - bsp_libc_init(&HeapStart, (char *)&HeapEnd - (char *)&HeapStart, 0); -} - -/* - * bsp_start - * - * This routine does the bulk of the system initialization. - */ - -void bsp_start(void) -{ - /* - For real boards you need to setup the hardware - and need to copy the vector table from rom to ram. - - Depending on the board this can ether be done from inside the rom - startup code, rtems startup code or here. - */ - -#ifndef START_HW_INIT - /* board hardware setup here, or from 'start.S' */ - bsp_hw_init(); -#endif - - /* - * 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 *) &WorkSpaceStart ; - rtems_configuration_get_work_space_size() = - (uint32_t) &WorkSpaceEnd - - (uint32_t) &WorkSpaceStart ; - - /* - * initialize the CPU table for this BSP - */ - -#if ( CPU_ALLOCATE_INTERRUPT_STACK == FALSE ) - _CPU_Interrupt_stack_low = &CPU_Interrupt_stack_low ; - _CPU_Interrupt_stack_high = &CPU_Interrupt_stack_high ; -#endif - - /* - * initialize the device driver parameters - */ - bsp_clicks_per_second = CPU_CLOCK_RATE_HZ; -} diff --git a/c/src/lib/libbsp/sh/gensh4/startup/linkcmds b/c/src/lib/libbsp/sh/gensh4/startup/linkcmds index a95a2be2b4..d4bb3fad62 100644 --- a/c/src/lib/libbsp/sh/gensh4/startup/linkcmds +++ b/c/src/lib/libbsp/sh/gensh4/startup/linkcmds @@ -22,8 +22,9 @@ ENTRY(_start) /* Do we need any of these for elf? __DYNAMIC = 0; */ -_HeapSize = DEFINED(_HeapSize) ? _HeapSize : (2 * 1024 * 1024); -_WorkspaceSize = DEFINED(_WorkspaceSize) ? _WorkspaceSize : (1024 * 1024); +_RamBase = DEFINED(_RamBase) ? _RamBase : 0x80000000; +_RamSize = DEFINED(_RamSize) ? _RamSize : 4M; + /* * Area assignments: @@ -47,6 +48,7 @@ SECTIONS } =0 .text : { + _start = .; *(.text*) /* @@ -160,20 +162,13 @@ SECTIONS __bss_end = .; } > ram + .stack . : { + . = . + 4096; + } . = ALIGN(16); - _HeapStart = . ; - . = . + _HeapSize ; - PROVIDE( _HeapEnd = . ); . = ALIGN(16); _WorkSpaceStart = . ; - . = . + _WorkspaceSize ; - PROVIDE(_WorkSpaceEnd = .); - - . = ALIGN(16); - .stack . : { - . = . + 4096; - } . = ALIGN(16); _CPU_Interrupt_stack_low = . ; |