Changeset 4c927c79 in rtems

Timestamp:

06/21/16 07:10:28 (7 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

5, master

Children:

9460333e

Parents:

7222a65

git-author:

Sebastian Huber <sebastian.huber@…> (06/21/16 07:10:28)

git-committer:

Sebastian Huber <sebastian.huber@…> (06/21/16 13:54:18)

Message:

bsp/leon3: Fix LEON3_Cpu_Index initialization

Location:

c/src/lib/libbsp/sparc/leon3

Files:

• amba/amba.c (modified) (1 diff)
• console/printk_support.c (modified) (1 diff)
• startup/bspstart.c (modified) (3 diffs)

c/src/lib/libbsp/sparc/leon3/amba/amba.c

@@ -163 +163 @@
   amba_initialize,
   RTEMS_SYSINIT_BSP_START,
-  RTEMS_SYSINIT_ORDER_FIRST
+  RTEMS_SYSINIT_ORDER_SECOND
 );

c/src/lib/libbsp/sparc/leon3/console/printk_support.c

@@ -81 +81 @@
   bsp_debug_uart_init,
   RTEMS_SYSINIT_BSP_START,
-  RTEMS_SYSINIT_ORDER_THIRD
+  RTEMS_SYSINIT_ORDER_FOURTH
 );
 

c/src/lib/libbsp/sparc/leon3/startup/bspstart.c

@@ -20 +20 @@
 #include <leon.h>
 #include <bsp/bootcard.h>
+#include <rtems/sysinit.h>
 
 #if defined(RTEMS_SMP) || defined(RTEMS_MULTIPROCESSING)
@@ -59 +60 @@
   CPU_SPARC_HAS_SNOOPING = set_snooping();
 
+  leon3_cpu_counter_initialize();
+}
+
+static void leon3_cpu_index_init(void)
+{
   /* Get the LEON3 CPU index, normally 0, but for MP systems we do
    * _not_ assume that this is CPU0. One may run another OS on CPU0
@@ -65 +71 @@
    */
   LEON3_Cpu_Index = _LEON3_Get_current_processor();
+}
 
-  leon3_cpu_counter_initialize();
-}
+RTEMS_SYSINIT_ITEM(
+  leon3_cpu_index_init,
+  RTEMS_SYSINIT_BSP_START,
+  RTEMS_SYSINIT_ORDER_FIRST
+);