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

Author: Philippe Gerum <r...@xenomai.org>
Date:   Mon May 19 17:09:18 2014 +0200

cobalt/arch: clean up help text and menu labels

---

 kernel/cobalt/arch/arm/Kconfig     |   42 +++++++++++++++++-------------------
 kernel/cobalt/arch/powerpc/Kconfig |   14 ++++++------
 scripts/Kconfig.frag               |   15 ++++++++-----
 3 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/kernel/cobalt/arch/arm/Kconfig b/kernel/cobalt/arch/arm/Kconfig
index 8cceb31..b225368 100644
--- a/kernel/cobalt/arch/arm/Kconfig
+++ b/kernel/cobalt/arch/arm/Kconfig
@@ -1,3 +1,23 @@
+source "kernel/xenomai/Kconfig"
+source "drivers/xenomai/Kconfig"
+
+menu "Platform-specific options"
+
+config XENO_HW_UNLOCKED_SWITCH
+       bool "Unlocked context switch"
+       default y
+       help
+       The Cobalt core may allow non-atomic execution of the
+       machine-dependent context switching code, so that other CPUs
+       and/or local interrupts may execute concurrently.
+
+       This option reduces interrupt latency when costly cache and
+       TLB flushes are required to switch context.
+
+       You definitely want to enable that option on low-end ARM
+       platforms.
+endmenu
+
 config IPIPE_WANT_PREEMPTIBLE_SWITCH
        bool
        default y if XENO_HW_UNLOCKED_SWITCH
@@ -15,25 +35,3 @@ config XENO_HW_FPU
 config XENO_HW_OUTOFLINE_XNLOCK
        bool
        default y
-
-menu "Hardware options"
-
-config XENO_HW_UNLOCKED_SWITCH
-       bool "Unlocked context switch"
-       default y
-       help
-       The nucleus may allow non-atomic execution of the
-       machine-dependent context switching code, so that other CPUs
-       and/or local interrupts may execute concurrently.
-
-       This option reduces interrupt latency when costly cache and
-       TLB flushes are required to switch context, and is mandatory
-       on SMP/multi-core ARM platforms prior to kernel 3.8.0.
-
-       You definitely want to enable that option on low-end ARM
-       platforms.
-
-endmenu
-
-source "kernel/xenomai/Kconfig"
-source "drivers/xenomai/Kconfig"
diff --git a/kernel/cobalt/arch/powerpc/Kconfig 
b/kernel/cobalt/arch/powerpc/Kconfig
index 91e6f7e..6e8f68f 100644
--- a/kernel/cobalt/arch/powerpc/Kconfig
+++ b/kernel/cobalt/arch/powerpc/Kconfig
@@ -1,3 +1,6 @@
+source "kernel/xenomai/Kconfig"
+source "drivers/xenomai/Kconfig"
+
 config XENO_HW_MATH_EMU
         bool
        default y if MATH_EMU || MATH_EMULATION
@@ -17,7 +20,7 @@ config XENO_HW_WANT_TIP
 config XENO_HW_FPU
        def_bool PPC_FPU
 
-menu "Hardware options"
+menu "Platform-specific options"
 
 config XENO_HW_UNLOCKED_SWITCH
        bool "Unlocked context switch"
@@ -26,15 +29,10 @@ config XENO_HW_UNLOCKED_SWITCH
        default y
        help
 
-       The nucleus may allow non-atomic execution of the
+       The Cobalt core may allow non-atomic execution of the
        machine-dependent context switching code, so that other CPUs
        and/or local interrupts may execute concurrently.
 
        This option reduces interrupt latency when costly cache and
-       TLB flushes are required to switch context, and may improve
-       concurrency on some SMP/multi-core systems as well.
-
+       TLB flushes are required to switch context.
 endmenu
-
-source "kernel/xenomai/Kconfig"
-source "drivers/xenomai/Kconfig"
diff --git a/scripts/Kconfig.frag b/scripts/Kconfig.frag
index e905a9f..86954d8 100644
--- a/scripts/Kconfig.frag
+++ b/scripts/Kconfig.frag
@@ -1,13 +1,18 @@
 menuconfig XENOMAI
        depends on X86_TSC || !X86
-       bool "Xenomai"
+       bool "Xenomai/cobalt"
        select IPIPE
        default y
        help
-         Xenomai is a real-time extension to the Linux kernel. Note
-         that Xenomai relies on Adeos interrupt pipeline (CONFIG_IPIPE
-         option) to be enabled, so enabling this option selects the
-         CONFIG_IPIPE option.
+         Xenomai's Cobalt core is a real-time extension to the Linux
+         kernel, which exhibits very short interrupt and scheduling
+         latency, without affecting the regular kernel services.
+
+         This option enables the set of extended kernel services
+         required to run the real-time applications in user-space,
+         over the Xenomai libraries.
+
+         Please visit http://xenomai.org for more information.
 
 if XENOMAI
 source "arch/@LINUX_ARCH@/xenomai/Kconfig"


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

Reply via email to