Changeset d9bd5cd6 in rtems

Timestamp:

May 22, 2013, 7:54:34 AM (8 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

4.11, 5, master

Children:

cab410f

Parents:

18e1e5b

git-author:

Sebastian Huber <sebastian.huber@…> (05/22/13 07:54:34)

git-committer:

Sebastian Huber <sebastian.huber@…> (05/27/13 10:49:13)

Message:

arm: Add CPU specific idle thread for ARMv7

Location:

cpukit/score/cpu/arm

Files:

• Makefile.am (modified) (2 diffs)
• armv7-thread-idle.c (moved) (moved from cpukit/score/cpu/arm/armv7m-thread-idle.c) (2 diffs)
• rtems/score/arm.h (modified) (1 diff)
• rtems/score/cpu.h (modified) (1 diff)

cpukit/score/cpu/arm/Makefile.am

@@ -26 +26 @@
 libscorecpu_a_SOURCES += arm-exception-default.c
 libscorecpu_a_SOURCES += armv4-exception-default.S
+libscorecpu_a_SOURCES += armv7-thread-idle.c
 libscorecpu_a_SOURCES += armv7m-context-initialize.c
 libscorecpu_a_SOURCES += armv7m-context-restore.c
@@ -42 +43 @@
 libscorecpu_a_SOURCES += armv7m-isr-vector-install.c
 libscorecpu_a_SOURCES += armv7m-multitasking-start-stop.c
-libscorecpu_a_SOURCES += armv7m-thread-idle.c
 
 include $(srcdir)/preinstall.am

cpukit/score/cpu/arm/armv7-thread-idle.c

@@ -25 +25 @@
 #include <rtems/score/cpu.h>
 
-#ifdef ARM_MULTILIB_ARCH_V7M
+#ifdef ARM_MULTILIB_HAS_WFI
 
 void *_CPU_Thread_Idle_body( uintptr_t ignored )
@@ -34 +34 @@
 }
 
-#endif /* ARM_MULTILIB_ARCH_V7M */
+#endif /* ARM_MULTILIB_HAS_WFI */

cpukit/score/cpu/arm/rtems/score/arm.h

@@ -38 +38 @@
 #endif
 
+#if defined(__ARM_ARCH_7A__) \
+  || defined(__ARM_ARCH_7R__) \
+  || defined(__ARM_ARCH_7M__)
+  #define ARM_MULTILIB_HAS_WFI
+#endif
+
 #if defined(__ARM_NEON__)
   #define ARM_MULTILIB_VFP_D32

cpukit/score/cpu/arm/rtems/score/cpu.h

@@ -139 +139 @@
 #define CPU_USE_DEFERRED_FP_SWITCH FALSE
 
-#if defined(ARM_MULTILIB_ARCH_V7M)
+#if defined(ARM_MULTILIB_HAS_WFI)
   #define CPU_PROVIDES_IDLE_THREAD_BODY TRUE
 #else