Module: xenomai-forge
Branch: next
Commit: 821955169ecb3f4ccec94e333f243d999239b8f9
URL:    
http://git.xenomai.org/?p=xenomai-forge.git;a=commit;h=821955169ecb3f4ccec94e333f243d999239b8f9

Author: Philippe Gerum <r...@xenomai.org>
Date:   Mon Sep  8 13:00:42 2014 +0200

cobalt/arm: drop CONFIG_XENO_ARM_EABI, use __ARM_EABI__ instead

---

 kernel/cobalt/arch/arm/include/asm/xenomai/features.h |    4 ----
 kernel/cobalt/arch/arm/include/asm/xenomai/thread.h   |    2 +-
 kernel/cobalt/arch/arm/mayday.c                       |    6 +++---
 lib/cobalt/arch/arm/include/asm/xenomai/features.h    |    4 ----
 lib/cobalt/arch/arm/include/asm/xenomai/syscall.h     |    3 +--
 5 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/kernel/cobalt/arch/arm/include/asm/xenomai/features.h 
b/kernel/cobalt/arch/arm/include/asm/xenomai/features.h
index b0415c0..d485286 100644
--- a/kernel/cobalt/arch/arm/include/asm/xenomai/features.h
+++ b/kernel/cobalt/arch/arm/include/asm/xenomai/features.h
@@ -22,10 +22,6 @@
 #ifndef _COBALT_ARM_ASM_FEATURES_H
 #define _COBALT_ARM_ASM_FEATURES_H
 
-#ifdef CONFIG_AEABI
-#define CONFIG_XENO_ARM_EABI 1
-#endif
-
 struct cobalt_featinfo;
 static inline void collect_arch_features(struct cobalt_featinfo *p) { }
 
diff --git a/kernel/cobalt/arch/arm/include/asm/xenomai/thread.h 
b/kernel/cobalt/arch/arm/include/asm/xenomai/thread.h
index c2efa2b..d2dda29 100644
--- a/kernel/cobalt/arch/arm/include/asm/xenomai/thread.h
+++ b/kernel/cobalt/arch/arm/include/asm/xenomai/thread.h
@@ -40,7 +40,7 @@ struct xnarchtcb {
        struct {
                unsigned long pc;
                unsigned long r0;
-#ifdef CONFIG_XENO_ARM_EABI
+#ifdef __ARM_EABI__
                unsigned long r7;
 #endif
 #ifdef CONFIG_ARM_THUMB
diff --git a/kernel/cobalt/arch/arm/mayday.c b/kernel/cobalt/arch/arm/mayday.c
index cf87330..d6b7924 100644
--- a/kernel/cobalt/arch/arm/mayday.c
+++ b/kernel/cobalt/arch/arm/mayday.c
@@ -54,7 +54,7 @@ void xnarch_setup_mayday_page(void *page)
         * We don't mess with CPSR here, so no need to save/restore it
         * in handle/fixup code.
         */
-#ifdef CONFIG_XENO_ARM_EABI
+#ifdef __ARM_EABI__
        static const struct {
                u32 ldr_r0;
                u32 ldr_r7;
@@ -98,7 +98,7 @@ void xnarch_handle_mayday(struct xnarchtcb *tcb, struct 
pt_regs *regs,
 {
        tcb->mayday.pc = regs->ARM_pc;
        tcb->mayday.r0 = regs->ARM_r0;
-#ifdef CONFIG_XENO_ARM_EABI
+#ifdef __ARM_EABI__
        tcb->mayday.r7 = regs->ARM_r7;
 #endif
 #ifdef CONFIG_ARM_THUMB
@@ -113,7 +113,7 @@ void xnarch_fixup_mayday(struct xnarchtcb *tcb, struct 
pt_regs *regs)
 {
        regs->ARM_pc = tcb->mayday.pc;
        regs->ARM_r0 = tcb->mayday.r0;
-#ifdef CONFIG_XENO_ARM_EABI
+#ifdef __ARM_EABI__
        regs->ARM_r7 = tcb->mayday.r7;
 #endif
 #ifdef CONFIG_ARM_THUMB
diff --git a/lib/cobalt/arch/arm/include/asm/xenomai/features.h 
b/lib/cobalt/arch/arm/include/asm/xenomai/features.h
index 44c6b3f..10bd0c7 100644
--- a/lib/cobalt/arch/arm/include/asm/xenomai/features.h
+++ b/lib/cobalt/arch/arm/include/asm/xenomai/features.h
@@ -21,10 +21,6 @@
 #include_next <features.h>
 #include <xeno_config.h>
 
-#ifdef __ARM_EABI__
-#define CONFIG_XENO_ARM_EABI 1
-#endif
-
 #if defined(__ARM_ARCH_2__)
 #define __LINUX_ARM_ARCH__ 2
 #endif /* armv2 */
diff --git a/lib/cobalt/arch/arm/include/asm/xenomai/syscall.h 
b/lib/cobalt/arch/arm/include/asm/xenomai/syscall.h
index b08b593..8f48eb1 100644
--- a/lib/cobalt/arch/arm/include/asm/xenomai/syscall.h
+++ b/lib/cobalt/arch/arm/include/asm/xenomai/syscall.h
@@ -24,7 +24,6 @@
 #include <xeno_config.h>
 #include <errno.h>
 #include <cobalt/uapi/syscall.h>
-#include <asm/xenomai/features.h> /* for CONFIG_XENO_ARM_EABI */
 
 /*
  * Some of the following macros have been adapted from Linux's
@@ -89,7 +88,7 @@
 #define __sys2(x)      #x
 #define __sys1(x)      __sys2(x)
 
-#ifdef CONFIG_XENO_ARM_EABI
+#ifdef __ARM_EABI__
 #define __SYS_REG , "r7"
 #define __SYS_REG_DECL register unsigned long __r7 __asm__ ("r7")
 #define __SYS_REG_SET __r7 = XENO_ARM_SYSCALL


_______________________________________________
Xenomai-git mailing list
Xenomai-git@xenomai.org
http://www.xenomai.org/mailman/listinfo/xenomai-git

Reply via email to