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

Author: Philippe Gerum <r...@xenomai.org>
Date:   Thu Aug 14 12:40:44 2014 +0200

cobalt/arch: unify namespace for core parameters

As we never had more than a couple of arch-specific parameters, there
is no point in dissociating "xenomai." vs "xeno_machine." namespaces,
which only ends up confusing the end-user.

This patch moves the former "xeno_machine." parameters to the
"xenomai."  namespace (x86-specific basically).

---

 kernel/cobalt/arch/arm/Makefile      |    4 ++--
 kernel/cobalt/arch/blackfin/Makefile |    4 ++--
 kernel/cobalt/arch/nios2/Makefile    |    4 ++--
 kernel/cobalt/arch/powerpc/Makefile  |    6 +++---
 kernel/cobalt/arch/sh/Makefile       |    4 ++--
 kernel/cobalt/arch/x86/Makefile      |    4 ++--
 kernel/cobalt/arch/x86/smi.c         |    2 +-
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/kernel/cobalt/arch/arm/Makefile b/kernel/cobalt/arch/arm/Makefile
index 25d33a5..f2e4e20 100644
--- a/kernel/cobalt/arch/arm/Makefile
+++ b/kernel/cobalt/arch/arm/Makefile
@@ -1,5 +1,5 @@
-obj-$(CONFIG_XENOMAI) += arm_hal.o
+obj-$(CONFIG_XENOMAI) += xenomai.o
 
-arm_hal-y := machine.o mayday.o thread.o switch.o syscall.o
+xenomai-y := machine.o mayday.o thread.o switch.o syscall.o
 
 ccflags-y := -Iarch/arm/xenomai/include -Iinclude/xenomai
diff --git a/kernel/cobalt/arch/blackfin/Makefile 
b/kernel/cobalt/arch/blackfin/Makefile
index 3f66ac2..8ef7e23 100644
--- a/kernel/cobalt/arch/blackfin/Makefile
+++ b/kernel/cobalt/arch/blackfin/Makefile
@@ -1,5 +1,5 @@
-obj-$(CONFIG_XENOMAI) += bfin_hal.o
+obj-$(CONFIG_XENOMAI) += xenomai.o
 
-bfin_hal-y := machine.o mayday.o thread.o switch.o syscall.o
+xenomai-y := machine.o mayday.o thread.o switch.o syscall.o
 
 ccflags-y := -Iarch/blackfin/xenomai/include -Iinclude/xenomai
diff --git a/kernel/cobalt/arch/nios2/Makefile 
b/kernel/cobalt/arch/nios2/Makefile
index fa3c001..ce960c8 100644
--- a/kernel/cobalt/arch/nios2/Makefile
+++ b/kernel/cobalt/arch/nios2/Makefile
@@ -1,6 +1,6 @@
 
-obj-$(CONFIG_XENOMAI) += nios2_hal.o
+obj-$(CONFIG_XENOMAI) += xenomai.o
 
-nios2_hal-y := machine.o mayday.o thread.o switch.o syscall.o
+xenomai-y := machine.o mayday.o thread.o switch.o syscall.o
 
 ccflags-y := -Iarch/nios2/xenomai/include -Iinclude/xenomai
diff --git a/kernel/cobalt/arch/powerpc/Makefile 
b/kernel/cobalt/arch/powerpc/Makefile
index dfa09ce..24ece6f 100644
--- a/kernel/cobalt/arch/powerpc/Makefile
+++ b/kernel/cobalt/arch/powerpc/Makefile
@@ -1,8 +1,8 @@
 
-obj-y += powerpc_hal.o
+obj-$(CONFIG_XENOMAI) += xenomai.o
 
-powerpc_hal-y := machine.o mayday.o thread.o switch_$(CONFIG_WORD_SIZE).o
+xenomai-y := machine.o mayday.o thread.o switch_$(CONFIG_WORD_SIZE).o
 
-powerpc_hal-$(CONFIG_XENO_HW_FPU) += fpu.o
+xenomai-$(CONFIG_XENO_HW_FPU) += fpu.o
 
 ccflags-y := -Iarch/powerpc/xenomai/include -Iinclude/xenomai
diff --git a/kernel/cobalt/arch/sh/Makefile b/kernel/cobalt/arch/sh/Makefile
index 6ae2138..82477a1 100644
--- a/kernel/cobalt/arch/sh/Makefile
+++ b/kernel/cobalt/arch/sh/Makefile
@@ -1,6 +1,6 @@
 
-obj-$(CONFIG_XENOMAI) += sh_hal.o
+obj-$(CONFIG_XENOMAI) += xenomai.o
 
-sh_hal-y := machine.o mayday.o thread.o trampoline.o
+xenomai-y := machine.o mayday.o thread.o trampoline.o
 
 ccflags-y := -Iarch/sh/xenomai/include -Iinclude/xenomai
diff --git a/kernel/cobalt/arch/x86/Makefile b/kernel/cobalt/arch/x86/Makefile
index c70d0f3..e65d25a 100644
--- a/kernel/cobalt/arch/x86/Makefile
+++ b/kernel/cobalt/arch/x86/Makefile
@@ -1,5 +1,5 @@
 
-obj-$(CONFIG_XENOMAI) += xeno_machine.o
-xeno_machine-y := machine.o mayday.o thread.o smi.o c1e.o
+obj-$(CONFIG_XENOMAI) += xenomai.o
+xenomai-y := machine.o mayday.o thread.o smi.o c1e.o
 
 ccflags-y := -Iarch/x86/xenomai/include -Iinclude/xenomai
diff --git a/kernel/cobalt/arch/x86/smi.c b/kernel/cobalt/arch/x86/smi.c
index 6c49e23..8cc5509 100644
--- a/kernel/cobalt/arch/x86/smi.c
+++ b/kernel/cobalt/arch/x86/smi.c
@@ -123,7 +123,7 @@ void mach_x86_smi_init(void)
        if (smi_state == 0) {
                printk("[Xenomai] SMI-enabled chipset found, but SMI "
                       "workaround disabled\n"
-                      "         (see xeno_machine.smi parameter). You may 
encounter\n"
+                      "         (see xenomai.smi parameter). You may 
encounter\n"
                       "         high interrupt latencies!\n");
                pci_dev_put(dev);
                return;


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

Reply via email to