From 11a6c974621241c2d556112fe62700b7dd355b5b Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 15 Sep 2008 19:18:29 +0000 Subject: 2008-09-15 Joel Sherrill * 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. --- c/src/lib/libbsp/sh/gensh1/ChangeLog | 9 ++ c/src/lib/libbsp/sh/gensh1/Makefile.am | 5 +- c/src/lib/libbsp/sh/gensh1/configure.ac | 7 ++ c/src/lib/libbsp/sh/gensh1/include/bsp.h | 5 -- c/src/lib/libbsp/sh/gensh1/startup/bspstart.c | 103 ----------------------- c/src/lib/libbsp/sh/gensh1/startup/linkcmds | 10 +-- c/src/lib/libbsp/sh/gensh2/ChangeLog | 9 ++ c/src/lib/libbsp/sh/gensh2/Makefile.am | 6 +- c/src/lib/libbsp/sh/gensh2/configure.ac | 2 + c/src/lib/libbsp/sh/gensh2/include/bsp.h | 19 ----- c/src/lib/libbsp/sh/gensh2/startup/bspstart.c | 113 ------------------------- c/src/lib/libbsp/sh/gensh2/startup/linkcmds | 10 +-- c/src/lib/libbsp/sh/gensh4/ChangeLog | 9 ++ c/src/lib/libbsp/sh/gensh4/Makefile.am | 5 +- c/src/lib/libbsp/sh/gensh4/configure.ac | 2 + c/src/lib/libbsp/sh/gensh4/include/bsp.h | 5 -- c/src/lib/libbsp/sh/gensh4/startup/bspstart.c | 115 -------------------------- c/src/lib/libbsp/sh/gensh4/startup/linkcmds | 19 ++--- 18 files changed, 63 insertions(+), 390 deletions(-) delete mode 100644 c/src/lib/libbsp/sh/gensh1/startup/bspstart.c delete mode 100644 c/src/lib/libbsp/sh/gensh2/startup/bspstart.c delete mode 100644 c/src/lib/libbsp/sh/gensh4/startup/bspstart.c (limited to 'c/src/lib') diff --git a/c/src/lib/libbsp/sh/gensh1/ChangeLog b/c/src/lib/libbsp/sh/gensh1/ChangeLog index c7840d1a45..b8ae164eb4 100644 --- a/c/src/lib/libbsp/sh/gensh1/ChangeLog +++ b/c/src/lib/libbsp/sh/gensh1/ChangeLog @@ -1,3 +1,12 @@ +2008-09-15 Joel Sherrill + + * 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 * include/bsp.h: Review of all bsp_cleanup() implementations. In this diff --git a/c/src/lib/libbsp/sh/gensh1/Makefile.am b/c/src/lib/libbsp/sh/gensh1/Makefile.am index b9916f5cc4..81f6c0c732 100644 --- a/c/src/lib/libbsp/sh/gensh1/Makefile.am +++ b/c/src/lib/libbsp/sh/gensh1/Makefile.am @@ -35,8 +35,9 @@ BUILT_SOURCES = scitab.c CLEANFILES = scitab.c startup_SOURCES = ../../shared/bsplibc.c ../../shared/bsppost.c \ - ../../shared/bsppredriverhook.c startup/bspstart.c startup/bspclean.c \ - ../../shared/sbrk.c ../../shared/bootcard.c \ + ../../shared/bsppredriverhook.c ../shared/bspstart.c startup/bspclean.c \ + ../shared/bspgetworkarea.c ../../shared/bsppretaskinghook.c \ + ../../shared/sbrk.c ../../shared/bootcard.c ../shared/bsphwinit.c \ ../../shared/gnatinstallhandler.c scitab_SOURCES = scitab.c console_SOURCES = ../../sh/shared/console.c diff --git a/c/src/lib/libbsp/sh/gensh1/configure.ac b/c/src/lib/libbsp/sh/gensh1/configure.ac index 57dcf3d401..a95cb775d2 100644 --- a/c/src/lib/libbsp/sh/gensh1/configure.ac +++ b/c/src/lib/libbsp/sh/gensh1/configure.ac @@ -19,9 +19,16 @@ RTEMS_PROG_CCAS RTEMS_BSPOPTS_SET([CPU_CLOCK_RATE_HZ],[*],[20000000]) RTEMS_BSPOPTS_HELP([CPU_CLOCK_RATE_HZ],[cpu clock rate in HZ]) +RTEMS_BSPOPTS_SET([START_HW_INIT],[*],[]) +RTEMS_BSPOPTS_HELP([START_HW_INIT], +[If defined, selects whether 'early_hw_init()' is called from 'start.S'; + 'bsp_hw_init()' is always called from 'bspstart.c']) + ## Used in scitab/Makefile.am AC_SUBST(CPU_CLOCK_RATE_HZ) +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/gensh1/include/bsp.h b/c/src/lib/libbsp/sh/gensh1/include/bsp.h index 2bb932c286..1c9f2b627f 100644 --- a/c/src/lib/libbsp/sh/gensh1/include/bsp.h +++ b/c/src/lib/libbsp/sh/gensh1/include/bsp.h @@ -60,11 +60,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/gensh1/startup/bspstart.c b/c/src/lib/libbsp/sh/gensh1/startup/bspstart.c deleted file mode 100644 index 8dcc05c176..0000000000 --- a/c/src/lib/libbsp/sh/gensh1/startup/bspstart.c +++ /dev/null @@ -1,103 +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. - * 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 - -#include -#include -#include - -uint32_t bsp_clicks_per_second; - -/* - * 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 either be done from inside the rom - startup code, rtems startup code or here. - */ - - /* - * 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 - bsp_clicks_per_second = CPU_CLOCK_RATE_HZ; -} diff --git a/c/src/lib/libbsp/sh/gensh1/startup/linkcmds b/c/src/lib/libbsp/sh/gensh1/startup/linkcmds index 0218a8dd58..c31b982343 100644 --- a/c/src/lib/libbsp/sh/gensh1/startup/linkcmds +++ b/c/src/lib/libbsp/sh/gensh1/startup/linkcmds @@ -31,6 +31,9 @@ OUTPUT_ARCH(sh) ENTRY(_start) +_RamBase = DEFINED(_RamBase) ? _RamBase : 0x0a040000; +_RamSize = DEFINED(_RamSize) ? _RamSize : 512K; + MEMORY { rom : o = 0x00000000, l = 128k @@ -104,6 +107,7 @@ SECTIONS .plt : { *(.plt) } .text . : { + _start = .; *(.text*) *(.stub) @@ -175,13 +179,7 @@ SECTIONS _end = . ; PROVIDE (end = .); - _HeapStart = . ; - . = . + 1024 * 20 ; - PROVIDE( _HeapEnd = . ); - _WorkSpaceStart = . ; - . = 0x0a080000 ; - PROVIDE(_WorkSpaceEnd = .); _CPU_Interrupt_stack_low = 0x0f000000 ; _CPU_Interrupt_stack_high = _CPU_Interrupt_stack_low + 4096 ; diff --git a/c/src/lib/libbsp/sh/gensh2/ChangeLog b/c/src/lib/libbsp/sh/gensh2/ChangeLog index 87261422d3..3f8e11a3a7 100644 --- a/c/src/lib/libbsp/sh/gensh2/ChangeLog +++ b/c/src/lib/libbsp/sh/gensh2/ChangeLog @@ -1,3 +1,12 @@ +2008-09-15 Joel Sherrill + + * 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 * Makefile.am, include/bsp.h: Review of all bsp_cleanup() diff --git a/c/src/lib/libbsp/sh/gensh2/Makefile.am b/c/src/lib/libbsp/sh/gensh2/Makefile.am index 24fa8ef713..beb9d4ae2e 100644 --- a/c/src/lib/libbsp/sh/gensh2/Makefile.am +++ b/c/src/lib/libbsp/sh/gensh2/Makefile.am @@ -36,8 +36,10 @@ CLEANFILES = scitab.c startup_SOURCES = startup/hw_init.c ../../shared/bsplibc.c \ ../../shared/bsppost.c ../../shared/bsppredriverhook.c \ - startup/bspstart.c ../../shared/sbrk.c ../../shared/bootcard.c \ - ../../shared/gnatinstallhandler.c ../../shared/bspclean.c + ../shared/bspstart.c ../../shared/bsppretaskinghook.c \ + ../shared/bspgetworkarea.c ../../shared/sbrk.c ../../shared/bootcard.c \ + ../../shared/gnatinstallhandler.c ../../shared/bspclean.c \ + ../shared/bsphwinit.c scitab_SOURCES = scitab.c console_SOURCES = ../../sh/shared/console.c console/config.c debugio_SOURCES = ../../shared/dummy_printk_support.c diff --git a/c/src/lib/libbsp/sh/gensh2/configure.ac b/c/src/lib/libbsp/sh/gensh2/configure.ac index 6829d6f3fa..c6282118d6 100644 --- a/c/src/lib/libbsp/sh/gensh2/configure.ac +++ b/c/src/lib/libbsp/sh/gensh2/configure.ac @@ -31,6 +31,8 @@ RTEMS_BSPOPTS_SET([STANDALONE_EVB],[*],[]) RTEMS_BSPOPTS_HELP([STANDALONE_EVB], [If defined, compiles code to jump-start from FLASH, without a monitor]) +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/gensh2/include/bsp.h b/c/src/lib/libbsp/sh/gensh2/include/bsp.h index 0d42747e93..bf2239e9e6 100644 --- a/c/src/lib/libbsp/sh/gensh2/include/bsp.h +++ b/c/src/lib/libbsp/sh/gensh2/include/bsp.h @@ -76,11 +76,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 ; @@ -88,20 +83,6 @@ extern void *CPU_Interrupt_stack_high ; * Device Driver Table Entries */ -/* - * We redefine CONSOLE_DRIVER_TABLE_ENTRY to redirect /dev/console - * - * FIXME: Since console driver works properly this is not - * necessary. When enabled - causes error in console_initialize. - */ -#if 0 -#undef CONSOLE_DRIVER_TABLE_ENTRY -#define CONSOLE_DRIVER_TABLE_ENTRY \ - BSP_CONSOLE_DRIVER_TABLE_ENTRY, \ - { console_initialize, console_open, console_close, \ - console_read, console_write, console_control } -#endif - /* * NOTE: Use the standard Clock driver entry */ diff --git a/c/src/lib/libbsp/sh/gensh2/startup/bspstart.c b/c/src/lib/libbsp/sh/gensh2/startup/bspstart.c deleted file mode 100644 index 52e047836f..0000000000 --- a/c/src/lib/libbsp/sh/gensh2/startup/bspstart.c +++ /dev/null @@ -1,113 +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. - * 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 - -#include -#include -#include - -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() = - &WorkSpaceEnd - &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/gensh2/startup/linkcmds b/c/src/lib/libbsp/sh/gensh2/startup/linkcmds index 2f695f55a6..ab6e975368 100644 --- a/c/src/lib/libbsp/sh/gensh2/startup/linkcmds +++ b/c/src/lib/libbsp/sh/gensh2/startup/linkcmds @@ -44,6 +44,9 @@ ENTRY(_start) /* These assignments load code into SH7045F EVB SRAM for monitor debugging */ +_RamBase = DEFINED(_RamBase) ? _RamBase : 0x00440000; +_RamSize = DEFINED(_RamSize) ? _RamSize : 512K; + MEMORY { rom : o = 0x00400000, l = 0x00040000 @@ -117,6 +120,7 @@ SECTIONS .plt : { *(.plt) } .text . : { + _start = .; *(.text*) *(.stub) @@ -186,13 +190,7 @@ SECTIONS _end = . ; PROVIDE (end = .); - _HeapStart = . ; - . = . + 1024 * 20 ; - PROVIDE( _HeapEnd = . ); - _WorkSpaceStart = . ; - . = 0x00480000 ; - PROVIDE(_WorkSpaceEnd = .); _CPU_Interrupt_stack_low = 0xFFFFF000; _CPU_Interrupt_stack_high = 0xFFFFFFFF; 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 + + * 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 * 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 -#include - -#include - -#include - -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 = . ; -- cgit v1.2.3