diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-12-04 22:22:10 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-12-04 22:22:10 +0000 |
| commit | 7321ff0df2751e1bf794ceedaed0f4dfc57f0864 (patch) | |
| tree | d987ced9abb42b2b73e53a8b44888134172c2b65 /c/src/lib/libbsp/powerpc | |
| parent | 2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com> (diff) | |
| download | rtems-7321ff0df2751e1bf794ceedaed0f4dfc57f0864.tar.bz2 | |
2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com>
* shared/startup/bspstart.c: Move interrupt_stack_size field from CPU
Table to Configuration Table. Eliminate CPU Table from all ports.
Delete references to CPU Table in all forms.
Diffstat (limited to 'c/src/lib/libbsp/powerpc')
| -rw-r--r-- | c/src/lib/libbsp/powerpc/ChangeLog | 6 | ||||
| -rw-r--r-- | c/src/lib/libbsp/powerpc/shared/startup/bspstart.c | 21 |
2 files changed, 12 insertions, 15 deletions
diff --git a/c/src/lib/libbsp/powerpc/ChangeLog b/c/src/lib/libbsp/powerpc/ChangeLog index 025ee4ff03..e9846fe455 100644 --- a/c/src/lib/libbsp/powerpc/ChangeLog +++ b/c/src/lib/libbsp/powerpc/ChangeLog @@ -1,3 +1,9 @@ +2007-12-04 Joel Sherrill <joel.sherrill@OARcorp.com> + + * shared/startup/bspstart.c: Move interrupt_stack_size field from CPU + Table to Configuration Table. Eliminate CPU Table from all ports. + Delete references to CPU Table in all forms. + 2007-12-03 Joel Sherrill <joel.sherrill@oarcorp.com> * shared/irq/irq.c: Spacing. diff --git a/c/src/lib/libbsp/powerpc/shared/startup/bspstart.c b/c/src/lib/libbsp/powerpc/shared/startup/bspstart.c index 0b13fe68a5..642fdf5826 100644 --- a/c/src/lib/libbsp/powerpc/shared/startup/bspstart.c +++ b/c/src/lib/libbsp/powerpc/shared/startup/bspstart.c @@ -91,10 +91,9 @@ unsigned int BSP_processor_frequency; */ unsigned int BSP_time_base_divisor; /* - * system init stack and soft ir stack size + * system init stack */ #define INIT_STACK_SIZE 0x1000 -#define INTR_STACK_SIZE CONFIGURE_INTERRUPT_STACK_MEMORY void BSP_panic(char *s) { @@ -114,11 +113,7 @@ void _BSP_Fatal_error(unsigned int v) */ extern rtems_configuration_table Configuration; - rtems_configuration_table BSP_Configuration; - -rtems_cpu_table Cpu_table; - char *rtems_progname; /* @@ -246,7 +241,8 @@ void bsp_start( void ) * This could be done later (e.g in IRQ_INIT) but it helps to understand * some settings below... */ - BSP_heap_start = ((uint32_t) __rtems_end) + INIT_STACK_SIZE + INTR_STACK_SIZE; + BSP_heap_start = ((uint32_t) __rtems_end) + + INIT_STACK_SIZE + rtems_configuration_get_interrupt_stack_size(); /* reserve space for the marker/tag frame */ intrStack = BSP_heap_start - PPC_MINIMUM_STACK_FRAME_SIZE; @@ -379,13 +375,8 @@ void bsp_start( void ) } /* - * Set up our hooks - * Make sure libc_init is done before drivers initialized so that - * they can use atexit() + * initialize the device driver parameters */ - - Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY; - bsp_clicks_per_usec = BSP_bus_frequency/(BSP_time_base_divisor * 1000); #ifdef SHOW_MORE_INIT_SETTINGS @@ -396,8 +387,8 @@ void bsp_start( void ) work_space_start = (unsigned char *)BSP_mem_size - BSP_Configuration.work_space_size; - if ( work_space_start <= - ((unsigned char *)__rtems_end) + INIT_STACK_SIZE + INTR_STACK_SIZE) { + if ( work_space_start <= ((unsigned char *)__rtems_end) + INIT_STACK_SIZE + + rtems_configuration_get_interrupt_stack_size()) { printk( "bspstart: Not enough RAM!!!\n" ); bsp_cleanup(); } |