[PATCH V2] score: Define _CPU_Start_multitasking only for LEON SPARC, not SPARC in general

Daniel Cederman cederman at gaisler.com
Mon Aug 25 10:59:34 UTC 2014


Rename _BSP_Start_multitasking to _LEON3_Start_multitasking to show that
it is LEON specific
---
 c/src/lib/libbsp/sparc/leon3/startup/bspsmp.c |    2 +-
 cpukit/score/cpu/sparc/rtems/score/cpu.h      |    6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/c/src/lib/libbsp/sparc/leon3/startup/bspsmp.c b/c/src/lib/libbsp/sparc/leon3/startup/bspsmp.c
index 9166ad5..b7c347e 100644
--- a/c/src/lib/libbsp/sparc/leon3/startup/bspsmp.c
+++ b/c/src/lib/libbsp/sparc/leon3/startup/bspsmp.c
@@ -82,7 +82,7 @@ void _CPU_SMP_Send_interrupt(uint32_t target_processor_index)
   LEON3_IrqCtrl_Regs->force[target_processor_index] = 1 << LEON3_MP_IRQ;
 }
 
-void _BSP_Start_multitasking(
+void _LEON3_Start_multitasking(
   Context_Control *heir
 )
 {
diff --git a/cpukit/score/cpu/sparc/rtems/score/cpu.h b/cpukit/score/cpu/sparc/rtems/score/cpu.h
index 9c38b55..e44ab71 100644
--- a/cpukit/score/cpu/sparc/rtems/score/cpu.h
+++ b/cpukit/score/cpu/sparc/rtems/score/cpu.h
@@ -1203,9 +1203,11 @@ register struct Per_CPU_Control *_SPARC_Per_CPU_current __asm__( "g6" );
 
   void _CPU_SMP_Send_interrupt( uint32_t target_processor_index );
 
-  void _BSP_Start_multitasking( Context_Control *heir )
+  #if defined(__leon__)
+  void _LEON3_Start_multitasking( Context_Control *heir )
     RTEMS_COMPILER_NO_RETURN_ATTRIBUTE;
-  #define _CPU_Start_multitasking _BSP_Start_multitasking
+  #define _CPU_Start_multitasking _LEON3_Start_multitasking
+  #endif
 
   static inline void _CPU_SMP_Processor_event_broadcast( void )
   {
-- 
1.7.9.5



More information about the devel mailing list