diff --git a/c/src/lib/libbsp/powerpc/ChangeLog b/c/src/lib/libbsp/powerpc/ChangeLog index 7d4cb6854d..15d9f3646a 100644 --- a/c/src/lib/libbsp/powerpc/ChangeLog +++ b/c/src/lib/libbsp/powerpc/ChangeLog @@ -1,3 +1,9 @@ +2007-12-11 Joel Sherrill + + * shared/startup/bspstart.c, shared/startup/pretaskinghook.c: Eliminate + copies of the Configuration Table. Use the RTEMS provided accessor + macros to obtain configuration fields. + 2007-12-10 Till Straumann * Makefile.am, start/preload.S: moved preload.S diff --git a/c/src/lib/libbsp/powerpc/shared/startup/bspstart.c b/c/src/lib/libbsp/powerpc/shared/startup/bspstart.c index 8109ea5acc..f8756a4448 100644 --- a/c/src/lib/libbsp/powerpc/shared/startup/bspstart.c +++ b/c/src/lib/libbsp/powerpc/shared/startup/bspstart.c @@ -109,15 +109,6 @@ void _BSP_Fatal_error(unsigned int v) __asm__ __volatile ("sc"); } -/* - * The original table from the application and our copy of it with - * some changes. - */ - -extern rtems_configuration_table Configuration; -rtems_configuration_table BSP_Configuration; -char *rtems_progname; - /* * Use the shared implementations of the following routines */ @@ -382,12 +373,12 @@ void bsp_start( void ) bsp_clicks_per_usec = BSP_bus_frequency/(BSP_time_base_divisor * 1000); #ifdef SHOW_MORE_INIT_SETTINGS - printk("BSP_Configuration.work_space_size = %x\n", - BSP_Configuration.work_space_size); + printk("rtems_configuration_get_work_space_size() = %x\n", + rtems_configuration_get_work_space_size()); #endif work_space_start = - (unsigned char *)BSP_mem_size - BSP_Configuration.work_space_size; + (unsigned char *)BSP_mem_size - rtems_configuration_get_work_space_size(); if ( work_space_start <= ((unsigned char *)__rtems_end) + INIT_STACK_SIZE + rtems_configuration_get_interrupt_stack_size()) { @@ -395,7 +386,7 @@ void bsp_start( void ) bsp_cleanup(); } - BSP_Configuration.work_space_start = work_space_start; + Configuration.work_space_start = work_space_start; /* * Initalize RTEMS IRQ system diff --git a/c/src/lib/libbsp/powerpc/shared/startup/pretaskinghook.c b/c/src/lib/libbsp/powerpc/shared/startup/pretaskinghook.c index 3bba799ff6..9bdc5707bd 100644 --- a/c/src/lib/libbsp/powerpc/shared/startup/pretaskinghook.c +++ b/c/src/lib/libbsp/powerpc/shared/startup/pretaskinghook.c @@ -52,7 +52,7 @@ void bsp_pretasking_hook(void) /* make sure it's properly aligned */ BSP_heap_start = (BSP_heap_start + CPU_ALIGNMENT - 1) & ~(CPU_ALIGNMENT-1); - heap_size = (BSP_mem_size - BSP_heap_start) - BSP_Configuration.work_space_size; + heap_size = (BSP_mem_size - BSP_heap_start) - rtems_configuration_get_work_space_size(); heap_sbrk_spared=_bsp_sbrk_init(BSP_heap_start, &heap_size); #ifdef SHOW_MORE_INIT_SETTINGS