diff options
Diffstat (limited to 'bsps/sh/gensh4/start')
-rw-r--r-- | bsps/sh/gensh4/start/cpu_asm.c | 9 | ||||
-rw-r--r-- | bsps/sh/gensh4/start/linkcmds | 8 | ||||
-rw-r--r-- | bsps/sh/gensh4/start/linkcmds.rom | 12 | ||||
-rw-r--r-- | bsps/sh/gensh4/start/linkcmds.rom2ram | 12 | ||||
-rw-r--r-- | bsps/sh/gensh4/start/start.S | 10 |
5 files changed, 2 insertions, 49 deletions
diff --git a/bsps/sh/gensh4/start/cpu_asm.c b/bsps/sh/gensh4/start/cpu_asm.c index 52a033bb75..7618db3e27 100644 --- a/bsps/sh/gensh4/start/cpu_asm.c +++ b/bsps/sh/gensh4/start/cpu_asm.c @@ -42,9 +42,7 @@ /* from cpu_isps.c */ extern proc_ptr _Hardware_isr_Table[]; -#if (CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE) - unsigned long *_old_stack_ptr; -#endif +unsigned long *_old_stack_ptr; register unsigned long *stack_ptr __asm__ ("r15"); @@ -60,7 +58,6 @@ void __ISR_Handler( uint32_t vector) _Thread_Dispatch_disable(); -#if (CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE) if ( _ISR_Nest_level == 0 ) { /* Install irq stack */ @@ -68,8 +65,6 @@ void __ISR_Handler( uint32_t vector) stack_ptr = _CPU_Interrupt_stack_high; } -#endif - _ISR_Nest_level++; _ISR_Local_enable( level ); @@ -84,11 +79,9 @@ void __ISR_Handler( uint32_t vector) _ISR_Nest_level--; -#if (CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE) if ( _ISR_Nest_level == 0 ) /* restore old stack pointer */ stack_ptr = _old_stack_ptr; -#endif _ISR_Local_enable( level ); diff --git a/bsps/sh/gensh4/start/linkcmds b/bsps/sh/gensh4/start/linkcmds index 21e0fdc5c9..df1c157865 100644 --- a/bsps/sh/gensh4/start/linkcmds +++ b/bsps/sh/gensh4/start/linkcmds @@ -144,20 +144,12 @@ SECTIONS __bss_end = .; } > ram - .stack : { - . = . + 4096; - } > ram - .rtemsstack (NOLOAD) : { *(SORT(.rtemsstack.*)) } > ram _WorkAreaBase = . ; - . = ALIGN(16); - _CPU_Interrupt_stack_low = . ; - _CPU_Interrupt_stack_high = _CPU_Interrupt_stack_low + 4096 ; - /* Stabs debugging sections. */ .stab 0 : { *(.stab) } .stabstr 0 : { *(.stabstr) } diff --git a/bsps/sh/gensh4/start/linkcmds.rom b/bsps/sh/gensh4/start/linkcmds.rom index 5e37f06941..49b5b08884 100644 --- a/bsps/sh/gensh4/start/linkcmds.rom +++ b/bsps/sh/gensh4/start/linkcmds.rom @@ -193,17 +193,6 @@ SECTIONS _WorkAreaBase = . ; - . = ALIGN(16); - .stack . : { - stack_start = .; - . = . + 4096; - stack_end = .; - } - - . = ALIGN(16); - _CPU_Interrupt_stack_low = . ; - _CPU_Interrupt_stack_high = _CPU_Interrupt_stack_low + 4096 ; - /* Stabs debugging sections. */ .stab 0 : { *(.stab) } .stabstr 0 : { *(.stabstr) } @@ -237,6 +226,5 @@ SECTIONS .debug_funcnames 0 : { *(.debug_funcnames) } .debug_typenames 0 : { *(.debug_typenames) } .debug_varnames 0 : { *(.debug_varnames) } - .stack : { _stack = .; *(.stack) } /* These must appear regardless of . */ } diff --git a/bsps/sh/gensh4/start/linkcmds.rom2ram b/bsps/sh/gensh4/start/linkcmds.rom2ram index 2fff0d1f98..99a4a89147 100644 --- a/bsps/sh/gensh4/start/linkcmds.rom2ram +++ b/bsps/sh/gensh4/start/linkcmds.rom2ram @@ -197,17 +197,6 @@ SECTIONS _WorkAreaBase = . ; - . = ALIGN(16); - .stack . : { - stack_start = .; - . = . + 4096; - stack_end = .; - } - - . = ALIGN(16); - _CPU_Interrupt_stack_low = . ; - _CPU_Interrupt_stack_high = _CPU_Interrupt_stack_low + 4096 ; - /* Stabs debugging sections. */ .stab 0 : { *(.stab) } .stabstr 0 : { *(.stabstr) } @@ -241,6 +230,5 @@ SECTIONS .debug_funcnames 0 : { *(.debug_funcnames) } .debug_typenames 0 : { *(.debug_typenames) } .debug_varnames 0 : { *(.debug_varnames) } - .stack : { _stack = .; *(.stack) } /* These must appear regardless of . */ } diff --git a/bsps/sh/gensh4/start/start.S b/bsps/sh/gensh4/start/start.S index a695daaf8a..711583ed6d 100644 --- a/bsps/sh/gensh4/start/start.S +++ b/bsps/sh/gensh4/start/start.S @@ -215,7 +215,7 @@ _vbr_base_k: __VBR_Saved_k: .long SYM(_VBR_Saved) stack_k: - .long SYM(stack) + .long SYM(_Configuration_Interrupt_stack_area_end) __bss_start_k: .long __bss_start __bss_end_k: @@ -255,14 +255,6 @@ boot_mode_k: .long _boot_mode #ifdef __ELF__ - .section .stack,"aw" -#else - .section .stack -#endif -SYM(stack): - .long 0xdeaddead - -#ifdef __ELF__ .section .bss,"aw" #else .section .bss |