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

Author: Philippe Gerum <r...@xenomai.org>
Date:   Mon May 19 11:34:02 2014 +0200

cobalt/arch: align FPU support switch with kernel

There is no point in keeping the FPU support as a user-level option,
we should follow the kernel settings instead. This change translates
to:

x86: assume FPU is always present
blackfin, nios2: assume FPU is always absent
powerpc, sh, arm(*): enable FPU support if the kernel does so

(*) Since we only support VFP units on this architecture,
CONFIG_XENO_HW_FPU now directly depends on CONFIG_VFP.

---

 kernel/cobalt/arch/arm/Kconfig      |   23 +++++++----------------
 kernel/cobalt/arch/blackfin/Kconfig |    3 +++
 kernel/cobalt/arch/nios2/Kconfig    |    3 +++
 kernel/cobalt/arch/powerpc/Kconfig  |   16 +++-------------
 kernel/cobalt/arch/sh/Kconfig       |   20 +++++---------------
 kernel/cobalt/arch/x86/Kconfig      |   17 +----------------
 6 files changed, 22 insertions(+), 60 deletions(-)

diff --git a/kernel/cobalt/arch/arm/Kconfig b/kernel/cobalt/arch/arm/Kconfig
index f8c2223..8cceb31 100644
--- a/kernel/cobalt/arch/arm/Kconfig
+++ b/kernel/cobalt/arch/arm/Kconfig
@@ -1,5 +1,3 @@
-menu "Hardware options"
-
 config IPIPE_WANT_PREEMPTIBLE_SWITCH
        bool
        default y if XENO_HW_UNLOCKED_SWITCH
@@ -12,16 +10,13 @@ config XENO_HW_WANT_TIP
        def_bool y
 
 config XENO_HW_FPU
-       bool "FPU support"
-       default y
-       help
-       The FPU executes instructions from the processor's normal
-       instruction stream. It can handle the types of high-precision
-       floating-point processing operations commonly found in
-       scientific, engineering, and business applications.
-       If your target system has no FPU, say NO here; otherwise,
-       enabling FPU support when the hardware is available may
-       greatly improve performance.
+       def_bool VFP
+
+config XENO_HW_OUTOFLINE_XNLOCK
+       bool
+       default y
+
+menu "Hardware options"
 
 config XENO_HW_UNLOCKED_SWITCH
        bool "Unlocked context switch"
@@ -38,10 +33,6 @@ config XENO_HW_UNLOCKED_SWITCH
        You definitely want to enable that option on low-end ARM
        platforms.
 
-config XENO_HW_OUTOFLINE_XNLOCK
-       bool
-       default y
-
 endmenu
 
 source "kernel/xenomai/Kconfig"
diff --git a/kernel/cobalt/arch/blackfin/Kconfig 
b/kernel/cobalt/arch/blackfin/Kconfig
index 89d731f..d01dc9d 100644
--- a/kernel/cobalt/arch/blackfin/Kconfig
+++ b/kernel/cobalt/arch/blackfin/Kconfig
@@ -1,2 +1,5 @@
+config XENO_HW_FPU
+       def_bool n
+
 source "kernel/xenomai/Kconfig"
 source "drivers/xenomai/Kconfig"
diff --git a/kernel/cobalt/arch/nios2/Kconfig b/kernel/cobalt/arch/nios2/Kconfig
index 89d731f..d01dc9d 100644
--- a/kernel/cobalt/arch/nios2/Kconfig
+++ b/kernel/cobalt/arch/nios2/Kconfig
@@ -1,2 +1,5 @@
+config XENO_HW_FPU
+       def_bool n
+
 source "kernel/xenomai/Kconfig"
 source "drivers/xenomai/Kconfig"
diff --git a/kernel/cobalt/arch/powerpc/Kconfig 
b/kernel/cobalt/arch/powerpc/Kconfig
index 433751b..91e6f7e 100644
--- a/kernel/cobalt/arch/powerpc/Kconfig
+++ b/kernel/cobalt/arch/powerpc/Kconfig
@@ -2,8 +2,6 @@ config XENO_HW_MATH_EMU
         bool
        default y if MATH_EMU || MATH_EMULATION
 
-menu "Hardware options"
-
 config IPIPE_WANT_ACTIVE_MM
         bool
 
@@ -17,17 +15,9 @@ config XENO_HW_WANT_TIP
        bool
 
 config XENO_HW_FPU
-       bool "FPU support"
-       depends on PPC_FPU
-       default y
-       help
-       The FPU executes instructions from the processor's normal
-       instruction stream. It can handle the types of high-precision
-       floating-point processing operations commonly found in
-       scientific, engineering, and business applications.
-       If your target system has no FPU, say NO here; otherwise,
-       enabling FPU support when the hardware is available may
-       greatly improve performance.
+       def_bool PPC_FPU
+
+menu "Hardware options"
 
 config XENO_HW_UNLOCKED_SWITCH
        bool "Unlocked context switch"
diff --git a/kernel/cobalt/arch/sh/Kconfig b/kernel/cobalt/arch/sh/Kconfig
index 1d7a2e7..f4ff6b6 100644
--- a/kernel/cobalt/arch/sh/Kconfig
+++ b/kernel/cobalt/arch/sh/Kconfig
@@ -1,27 +1,17 @@
-menu "Hardware options"
-
 config IPIPE_WANT_ACTIVE_MM
         bool
 
+config XENO_HW_FPU
+       def_bool SH_FPU
+
+menu "Hardware options"
+
 config IPIPE_WANT_PREEMPTIBLE_SWITCH
         bool
        select IPIPE_WANT_ACTIVE_MM
        default y if XENO_HW_UNLOCKED_SWITCH
        default n if !XENO_HW_UNLOCKED_SWITCH
 
-config XENO_HW_FPU
-       bool "FPU support"
-       depends on SH_FPU
-       default y
-       help
-       The FPU executes instructions from the processor's normal
-       instruction stream. It can handle the types of high-precision
-       floating-point processing operations commonly found in
-       scientific, engineering, and business applications.
-       If your target system has no FPU, say NO here; otherwise,
-       enabling FPU support when the hardware is available may
-       greatly improve performance.
-
 endmenu
 
 source "kernel/xenomai/Kconfig"
diff --git a/kernel/cobalt/arch/x86/Kconfig b/kernel/cobalt/arch/x86/Kconfig
index f68f494..729d137 100644
--- a/kernel/cobalt/arch/x86/Kconfig
+++ b/kernel/cobalt/arch/x86/Kconfig
@@ -1,20 +1,5 @@
-menu "Hardware options"
-
 config XENO_HW_FPU
-       bool "FPU support"
-       default y
-       help
-       The FPU executes instructions from the processor's normal
-       instruction stream. It can handle the types of high-precision
-       floating-point processing operations commonly found in
-       scientific, engineering, and business applications.
-       If your target system has no FPU, say NO here; otherwise,
-       enabling FPU support when available may greatly improve
-       performance. You can obtain more information about the
-       Float-Point Unit on the x86 platform at the following URL:
-       http://www.intel.com/design/intarch/techinfo/Pentium/fpu.htm
-
-endmenu
+       def_bool y
 
 source "kernel/xenomai/Kconfig"
 source "drivers/xenomai/Kconfig"


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

Reply via email to