* [Buildroot] [PATCH v4 1/2] xenomai: Add choice for enabling/disabling Cobalt/Mercury core
@ 2017-04-10 17:26 Pawel Sikora
2017-04-10 17:26 ` [Buildroot] [PATCH v4 2/2] xenomai: Add config for enabling/disabling SMP Pawel Sikora
2017-04-12 20:53 ` [Buildroot] [PATCH v4 1/2] xenomai: Add choice for enabling/disabling Cobalt/Mercury core Thomas Petazzoni
0 siblings, 2 replies; 5+ messages in thread
From: Pawel Sikora @ 2017-04-10 17:26 UTC (permalink / raw)
To: buildroot
Add an option choice for Cobalt or Mercury core
depending on option BR2_LINUX_KERNEL_EXT_XENOMAI.
Signed-off-by: Pawel Sikora <sikor6@gmail.com>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
Changes v3 -> v4:
- No changes, just merging in series with SMP patch.
package/xenomai/Config.in | 27 +++++++++++++++++++++++++++
package/xenomai/xenomai.mk | 6 ++++++
2 files changed, 33 insertions(+)
diff --git a/package/xenomai/Config.in b/package/xenomai/Config.in
index b548ee810..324f5025a 100644
--- a/package/xenomai/Config.in
+++ b/package/xenomai/Config.in
@@ -51,6 +51,33 @@ config BR2_PACKAGE_XENOMAI_VERSION
BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH, in the Linux
Kernel -> Linux Kernel Extensions menu.
+choice
+ prompt "Xenomai core"
+ default BR2_PACKAGE_XENOMAI_MERCURY
+ help
+ Select the Xenomai core: dual kernel (Cobalt)
+ or native Linux Kernel (Mercury).
+
+config BR2_PACKAGE_XENOMAI_MERCURY
+ bool "Mercury"
+ depends on !BR2_LINUX_KERNEL_EXT_XENOMAI
+ help
+ Select Mercury core for the Xenomai userspace.
+ You want to use it if you have the native Linux Kernel.
+
+config BR2_PACKAGE_XENOMAI_COBALT
+ bool "Cobalt"
+ help
+ Select Cobalt core (dual kernel) for the Xenomai
+ userspace. Use this if you use a Xenomai-patched
+ Linux kernel.
+
+ If you want to use Cobalt core, your kernel must have
+ the Adeos and Xenomai patches applied to it. You can
+ add these through the BR2_LINUX_KERNEL_EXT_XENOMAI option
+ in the Linux Kernel Extensions menu.
+endchoice
+
config BR2_PACKAGE_XENOMAI_TESTSUITE
bool "Install testsuite"
help
diff --git a/package/xenomai/xenomai.mk b/package/xenomai/xenomai.mk
index c9e810e05..73d9617b1 100644
--- a/package/xenomai/xenomai.mk
+++ b/package/xenomai/xenomai.mk
@@ -23,6 +23,12 @@ XENOMAI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) install-user
XENOMAI_CONF_OPTS += --includedir=/usr/include/xenomai/ --disable-doc-install
+ifeq ($(BR2_PACKAGE_XENOMAI_MERCURY),y)
+XENOMAI_CONF_OPTS += --with-core=mercury
+else
+XENOMAI_CONF_OPTS += --with-core=cobalt
+endif
+
define XENOMAI_REMOVE_DEVFILES
for i in xeno-config xeno-info wrap-link.sh ; do \
rm -f $(TARGET_DIR)/usr/bin/$$i ; \
--
2.12.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH v4 2/2] xenomai: Add config for enabling/disabling SMP
2017-04-10 17:26 [Buildroot] [PATCH v4 1/2] xenomai: Add choice for enabling/disabling Cobalt/Mercury core Pawel Sikora
@ 2017-04-10 17:26 ` Pawel Sikora
2017-04-11 14:23 ` Thomas De Schampheleire
2017-04-12 20:59 ` Thomas Petazzoni
2017-04-12 20:53 ` [Buildroot] [PATCH v4 1/2] xenomai: Add choice for enabling/disabling Cobalt/Mercury core Thomas Petazzoni
1 sibling, 2 replies; 5+ messages in thread
From: Pawel Sikora @ 2017-04-10 17:26 UTC (permalink / raw)
To: buildroot
Add a config option for enabling/disabling SMP
in Xenomai userspace in version 3.x
Enabled by default.
Signed-off-by: Pawel Sikora <sikor6@gmail.com>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
Changes v3 -> v4:
- No changes, just merging in series with 'core Cobalt/Mercury' patch
package/xenomai/Config.in | 17 +++++++++++++++++
package/xenomai/xenomai.mk | 6 ++++++
2 files changed, 23 insertions(+)
diff --git a/package/xenomai/Config.in b/package/xenomai/Config.in
index 324f5025a..efb504b35 100644
--- a/package/xenomai/Config.in
+++ b/package/xenomai/Config.in
@@ -78,6 +78,23 @@ config BR2_PACKAGE_XENOMAI_COBALT
in the Linux Kernel Extensions menu.
endchoice
+config BR2_PACKAGE_XENOMAI_ENABLE_SMP
+ bool "Enable SMP"
+ default y
+ help
+ This option enables SMP support in Xenomai userspace.
+
+ If this option is turned on while no SMP support is enabled
+ in the kernel, things will still work. However, if SMP is
+ enabled in the kernel but this option is not turned on,
+ Xenomai applications will complain with 'feature mismatch:
+ missing="smp/nosmp'.
+
+ Please refer to this troubleshooting guide for more
+ information:
+
+ http://xenomai.org/troubleshooting-a-dual-kernel-configuration/#feature_mismatch_missing8221smpnosmp8221
+
config BR2_PACKAGE_XENOMAI_TESTSUITE
bool "Install testsuite"
help
diff --git a/package/xenomai/xenomai.mk b/package/xenomai/xenomai.mk
index 73d9617b1..bd147a9ec 100644
--- a/package/xenomai/xenomai.mk
+++ b/package/xenomai/xenomai.mk
@@ -29,6 +29,12 @@ else
XENOMAI_CONF_OPTS += --with-core=cobalt
endif
+ifeq ($(BR2_PACKAGE_XENOMAI_ENABLE_SMP),y)
+XENOMAI_CONF_OPTS += --enable-smp
+else
+XENOMAI_CONF_OPTS += --disable-smp
+endif
+
define XENOMAI_REMOVE_DEVFILES
for i in xeno-config xeno-info wrap-link.sh ; do \
rm -f $(TARGET_DIR)/usr/bin/$$i ; \
--
2.12.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH v4 2/2] xenomai: Add config for enabling/disabling SMP
2017-04-10 17:26 ` [Buildroot] [PATCH v4 2/2] xenomai: Add config for enabling/disabling SMP Pawel Sikora
@ 2017-04-11 14:23 ` Thomas De Schampheleire
2017-04-12 20:59 ` Thomas Petazzoni
1 sibling, 0 replies; 5+ messages in thread
From: Thomas De Schampheleire @ 2017-04-11 14:23 UTC (permalink / raw)
To: buildroot
On Mon, Apr 10, 2017 at 7:26 PM, Pawel Sikora <sikor6@gmail.com> wrote:
> Add a config option for enabling/disabling SMP
> in Xenomai userspace in version 3.x
>
> Enabled by default.
>
> Signed-off-by: Pawel Sikora <sikor6@gmail.com>
> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
> ---
> Changes v3 -> v4:
> - No changes, just merging in series with 'core Cobalt/Mercury' patch
>
> package/xenomai/Config.in | 17 +++++++++++++++++
> package/xenomai/xenomai.mk | 6 ++++++
> 2 files changed, 23 insertions(+)
>
> diff --git a/package/xenomai/Config.in b/package/xenomai/Config.in
> index 324f5025a..efb504b35 100644
> --- a/package/xenomai/Config.in
> +++ b/package/xenomai/Config.in
> @@ -78,6 +78,23 @@ config BR2_PACKAGE_XENOMAI_COBALT
> in the Linux Kernel Extensions menu.
> endchoice
>
> +config BR2_PACKAGE_XENOMAI_ENABLE_SMP
> + bool "Enable SMP"
nit: I would make it "Enable SMP support"
> + default y
> + help
> + This option enables SMP support in Xenomai userspace.
> +
> + If this option is turned on while no SMP support is enabled
> + in the kernel, things will still work. However, if SMP is
> + enabled in the kernel but this option is not turned on,
> + Xenomai applications will complain with 'feature mismatch:
> + missing="smp/nosmp'.
and here I would put the error message on a separate line to increase
readability.
Obviously both of these are real nits, that perhaps could be fixed up
when applying.
Reviewed-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH v4 2/2] xenomai: Add config for enabling/disabling SMP
2017-04-10 17:26 ` [Buildroot] [PATCH v4 2/2] xenomai: Add config for enabling/disabling SMP Pawel Sikora
2017-04-11 14:23 ` Thomas De Schampheleire
@ 2017-04-12 20:59 ` Thomas Petazzoni
1 sibling, 0 replies; 5+ messages in thread
From: Thomas Petazzoni @ 2017-04-12 20:59 UTC (permalink / raw)
To: buildroot
Hello,
On Mon, 10 Apr 2017 19:26:03 +0200, Pawel Sikora wrote:
> Add a config option for enabling/disabling SMP
> in Xenomai userspace in version 3.x
>
> Enabled by default.
>
> Signed-off-by: Pawel Sikora <sikor6@gmail.com>
> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
> ---
> Changes v3 -> v4:
> - No changes, just merging in series with 'core Cobalt/Mercury' patch
Applied to master after taking into account the comments made by Thomas
De Schampheleire.
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH v4 1/2] xenomai: Add choice for enabling/disabling Cobalt/Mercury core
2017-04-10 17:26 [Buildroot] [PATCH v4 1/2] xenomai: Add choice for enabling/disabling Cobalt/Mercury core Pawel Sikora
2017-04-10 17:26 ` [Buildroot] [PATCH v4 2/2] xenomai: Add config for enabling/disabling SMP Pawel Sikora
@ 2017-04-12 20:53 ` Thomas Petazzoni
1 sibling, 0 replies; 5+ messages in thread
From: Thomas Petazzoni @ 2017-04-12 20:53 UTC (permalink / raw)
To: buildroot
Hello,
On Mon, 10 Apr 2017 19:26:02 +0200, Pawel Sikora wrote:
> Add an option choice for Cobalt or Mercury core
> depending on option BR2_LINUX_KERNEL_EXT_XENOMAI.
>
> Signed-off-by: Pawel Sikora <sikor6@gmail.com>
> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
> ---
> Changes v3 -> v4:
> - No changes, just merging in series with SMP patch.
Applied to master, thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-04-12 20:59 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-04-10 17:26 [Buildroot] [PATCH v4 1/2] xenomai: Add choice for enabling/disabling Cobalt/Mercury core Pawel Sikora
2017-04-10 17:26 ` [Buildroot] [PATCH v4 2/2] xenomai: Add config for enabling/disabling SMP Pawel Sikora
2017-04-11 14:23 ` Thomas De Schampheleire
2017-04-12 20:59 ` Thomas Petazzoni
2017-04-12 20:53 ` [Buildroot] [PATCH v4 1/2] xenomai: Add choice for enabling/disabling Cobalt/Mercury core Thomas Petazzoni
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.