diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-08-31 07:44:53 +0200 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-09-03 07:03:09 +0200 |
commit | fad3f79b883100394a5a7e51e93f95eaaafd50f8 (patch) | |
tree | d325463fbefc3c19839d7cca89dac7a9e2b2b211 /bsps/powerpc | |
parent | bootstrap: Correct help message (diff) | |
download | rtems-fad3f79b883100394a5a7e51e93f95eaaafd50f8.tar.bz2 |
bsps: BSP_INTERRUPT_STACK_AT_WORK_AREA_BEGIN
Remove the BSP_INTERRUPT_STACK_AT_WORK_AREA_BEGIN hack. The interrupt
stacks are now allocated by the linker.
Update #3459.
Diffstat (limited to 'bsps/powerpc')
-rw-r--r-- | bsps/powerpc/gen83xx/start/bspstart.c | 2 | ||||
-rw-r--r-- | bsps/powerpc/mpc55xxevb/include/bsp.h | 2 | ||||
-rw-r--r-- | bsps/powerpc/mpc55xxevb/start/bspgetworkarea.c | 9 | ||||
-rw-r--r-- | bsps/powerpc/mpc55xxevb/start/bspstart.c | 2 | ||||
-rw-r--r-- | bsps/powerpc/psim/start/bspstart.c | 2 | ||||
-rw-r--r-- | bsps/powerpc/qoriq/start/bspstart.c | 4 | ||||
-rw-r--r-- | bsps/powerpc/qoriq/start/mmu-config.c | 4 | ||||
-rw-r--r-- | bsps/powerpc/t32mppc/start/bspstart.c | 6 | ||||
-rw-r--r-- | bsps/powerpc/virtex/include/bsp.h | 2 | ||||
-rw-r--r-- | bsps/powerpc/virtex/start/bspstart.c | 2 |
10 files changed, 10 insertions, 25 deletions
diff --git a/bsps/powerpc/gen83xx/start/bspstart.c b/bsps/powerpc/gen83xx/start/bspstart.c index 4070c56347..70fcbea36e 100644 --- a/bsps/powerpc/gen83xx/start/bspstart.c +++ b/bsps/powerpc/gen83xx/start/bspstart.c @@ -114,7 +114,7 @@ void bsp_start( void) ppc_exc_cache_wb_check = 0; #endif ppc_exc_initialize( - (uintptr_t) bsp_section_work_begin, + (uintptr_t) _Configuration_Interrupt_stack_area_begin, rtems_configuration_get_interrupt_stack_size() ); diff --git a/bsps/powerpc/mpc55xxevb/include/bsp.h b/bsps/powerpc/mpc55xxevb/include/bsp.h index eee5d208c1..9379356f96 100644 --- a/bsps/powerpc/mpc55xxevb/include/bsp.h +++ b/bsps/powerpc/mpc55xxevb/include/bsp.h @@ -25,8 +25,6 @@ #include <bspopts.h> -#define BSP_INTERRUPT_STACK_AT_WORK_AREA_BEGIN - #define BSP_FEATURE_IRQ_EXTENSION #define MPC55XX_PERIPHERAL_CLOCK \ diff --git a/bsps/powerpc/mpc55xxevb/start/bspgetworkarea.c b/bsps/powerpc/mpc55xxevb/start/bspgetworkarea.c index e7d988cf87..c7267eddd3 100644 --- a/bsps/powerpc/mpc55xxevb/start/bspgetworkarea.c +++ b/bsps/powerpc/mpc55xxevb/start/bspgetworkarea.c @@ -37,15 +37,6 @@ void bsp_work_area_initialize(void) } }; - #ifdef BSP_INTERRUPT_STACK_AT_WORK_AREA_BEGIN - { - uint32_t stack_size = rtems_configuration_get_interrupt_stack_size(); - - areas [0].begin = (char *) areas [0].begin + stack_size; - areas [0].size -= stack_size; - } - #endif - bsp_work_area_initialize_with_table( areas, sizeof(areas) / sizeof(areas [0]) diff --git a/bsps/powerpc/mpc55xxevb/start/bspstart.c b/bsps/powerpc/mpc55xxevb/start/bspstart.c index 34d59a9ac2..b7c1d4b036 100644 --- a/bsps/powerpc/mpc55xxevb/start/bspstart.c +++ b/bsps/powerpc/mpc55xxevb/start/bspstart.c @@ -90,7 +90,7 @@ void bsp_start(void) /* Initialize exceptions */ ppc_exc_initialize_with_vector_base( - (uintptr_t) bsp_section_work_begin, + (uintptr_t) _Configuration_Interrupt_stack_area_begin, rtems_configuration_get_interrupt_stack_size(), mpc55xx_exc_vector_base ); diff --git a/bsps/powerpc/psim/start/bspstart.c b/bsps/powerpc/psim/start/bspstart.c index 1250715275..e684097788 100644 --- a/bsps/powerpc/psim/start/bspstart.c +++ b/bsps/powerpc/psim/start/bspstart.c @@ -91,7 +91,7 @@ void bsp_start( void ) * Initialize default raw exception handlers. */ ppc_exc_initialize_with_vector_base( - (uintptr_t) bsp_section_work_begin, + (uintptr_t) _Configuration_Interrupt_stack_area_begin, rtems_configuration_get_interrupt_stack_size(), (void *) 0xfff00000 ); diff --git a/bsps/powerpc/qoriq/start/bspstart.c b/bsps/powerpc/qoriq/start/bspstart.c index cc7902428b..76af17919e 100644 --- a/bsps/powerpc/qoriq/start/bspstart.c +++ b/bsps/powerpc/qoriq/start/bspstart.c @@ -169,7 +169,9 @@ void bsp_start(void) initialize_frequency_parameters(); - qoriq_initialize_exceptions(bsp_section_work_begin); + qoriq_initialize_exceptions( + (uintptr_t) _Configuration_Interrupt_stack_area_begin + ); bsp_interrupt_initialize(); rtems_cache_coherent_add_area( diff --git a/bsps/powerpc/qoriq/start/mmu-config.c b/bsps/powerpc/qoriq/start/mmu-config.c index 3c5a8538c8..8a047a83bd 100644 --- a/bsps/powerpc/qoriq/start/mmu-config.c +++ b/bsps/powerpc/qoriq/start/mmu-config.c @@ -344,9 +344,5 @@ void TEXT bsp_work_area_initialize(void) uintptr_t begin = we->begin; uintptr_t end = begin + we->size; -#ifdef BSP_INTERRUPT_STACK_AT_WORK_AREA_BEGIN - begin += rtems_configuration_get_interrupt_stack_size(); -#endif - bsp_work_area_initialize_default((void *) begin, end - begin); } diff --git a/bsps/powerpc/t32mppc/start/bspstart.c b/bsps/powerpc/t32mppc/start/bspstart.c index e8f288df59..5a42ae1bbf 100644 --- a/bsps/powerpc/t32mppc/start/bspstart.c +++ b/bsps/powerpc/t32mppc/start/bspstart.c @@ -44,12 +44,12 @@ uint32_t bsp_time_base_frequency = 10000000; offset += VECTOR_TABLE_ENTRY_SIZE; \ } while (0) -static void t32mppc_initialize_exceptions(void *interrupt_stack_begin) +static void t32mppc_initialize_exceptions(void) { uintptr_t addr; ppc_exc_initialize_interrupt_stack( - (uintptr_t) interrupt_stack_begin, + (uintptr_t) _Configuration_Interrupt_stack_area_begin, rtems_configuration_get_interrupt_stack_size() ); @@ -86,6 +86,6 @@ void bsp_start(void) { get_ppc_cpu_type(); get_ppc_cpu_revision(); - t32mppc_initialize_exceptions(bsp_section_work_begin); + t32mppc_initialize_exceptions(); bsp_interrupt_initialize(); } diff --git a/bsps/powerpc/virtex/include/bsp.h b/bsps/powerpc/virtex/include/bsp.h index faea72e25e..17af5214c2 100644 --- a/bsps/powerpc/virtex/include/bsp.h +++ b/bsps/powerpc/virtex/include/bsp.h @@ -59,8 +59,6 @@ extern "C" { #define BSP_FEATURE_IRQ_EXTENSION -#define BSP_INTERRUPT_STACK_AT_WORK_AREA_BEGIN - /* Network Defines */ #if 1 /* EB/doe changes */ #define RTEMS_BSP_NETWORK_DRIVER_NAME "eth0" diff --git a/bsps/powerpc/virtex/start/bspstart.c b/bsps/powerpc/virtex/start/bspstart.c index be7f00437a..5c0547aa24 100644 --- a/bsps/powerpc/virtex/start/bspstart.c +++ b/bsps/powerpc/virtex/start/bspstart.c @@ -98,7 +98,7 @@ void bsp_start( void ) * Initialize default raw exception handlers. */ ppc_exc_initialize_with_vector_base( - (uintptr_t) bsp_section_work_begin, + (uintptr_t) _Configuration_Interrupt_stack_area_begin, rtems_configuration_get_interrupt_stack_size(), virtex_exc_vector_base ); |