Module: xenomai-jki
Branch: for-upstream
Commit: 296e838de11a70bfd453a13c0540316f3f3ea029
URL:
http://git.xenomai.org/?p=xenomai-jki.git;a=commit;h=296e838de11a70bfd453a13c0540316f3f3ea029
Author: Jan Kiszka <jan.kis...@siemens.com>
Date: Wed Feb 6 13:53:08 2013 +0100
Replace configure-time check on INPUT_PCSPKR with build-time check
The Kconfig dependency on !INPUT_PCSPKR creates a complex cyclic
dependency and triggers latest Kconfig detection of such. Avoid this.
Signed-off-by: Jan Kiszka <jan.kis...@siemens.com>
---
ksrc/arch/x86/hal_32.c | 4 ++++
scripts/Kconfig.frag | 2 +-
2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/ksrc/arch/x86/hal_32.c b/ksrc/arch/x86/hal_32.c
index 28bd0fe..68cb5b6 100644
--- a/ksrc/arch/x86/hal_32.c
+++ b/ksrc/arch/x86/hal_32.c
@@ -280,6 +280,10 @@ void rthal_timer_release(int cpu)
#if !defined(CONFIG_X86_TSC) && IPIPE_CORE_APIREV < 2
+#if defined(CONFIG_INPUT_PCSPKR) || defined(CONFIG_INPUT_PCSPKR_MODULE)
+#error Disable PC Speaker (CONFIG_INPUT_PCSPKR) in your configuration
+#endif
+
static rthal_time_t rthal_tsc_8254;
static int rthal_last_8254_counter2;
diff --git a/scripts/Kconfig.frag b/scripts/Kconfig.frag
index c72f24c..31c765b 100644
--- a/scripts/Kconfig.frag
+++ b/scripts/Kconfig.frag
@@ -19,7 +19,7 @@ comment "(menu Processor type and features)"
endif
config XENOMAI
- depends on ((X86_TSC || !X86 || !INPUT_PCSPKR) && (IPIPE_CORE ||
!HPET_TIMER || !X86 || (X86_LOCAL_APIC && X86_TSC)))
+ depends on IPIPE_CORE || !HPET_TIMER || !X86 || (X86_LOCAL_APIC &&
X86_TSC)
bool "Xenomai"
default y
select IPIPE
_______________________________________________
Xenomai-git mailing list
Xenomai-git@xenomai.org
http://www.xenomai.org/mailman/listinfo/xenomai-git
