Module: xenomai-jki
Branch: for-upstream
Commit: b02bfafdcf6b5402f7a4596031348b30fe623cc6
URL:
http://git.xenomai.org/?p=xenomai-jki.git;a=commit;h=b02bfafdcf6b5402f7a4596031348b30fe623cc6
Author: Jan Kiszka <jan.kis...@siemens.com>
Date: Wed Feb 6 13:53:08 2013 +0100
Replace configure-time checks on PC Speaker and HPET with build-time checks
The Kconfig dependency on !INPUT_PCSPKR creates a complex cyclic
dependency and triggers latest Kconfig detection of such. We will get
another once we let IPIPE_CORE properly depend on IPIPE.
Avoid this by converting all those legacy Kconfig checks to simple
build-time validations.
Signed-off-by: Jan Kiszka <jan.kis...@siemens.com>
---
ksrc/arch/x86/hal_32.c | 9 +++++++++
scripts/Kconfig.frag | 3 +--
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/ksrc/arch/x86/hal_32.c b/ksrc/arch/x86/hal_32.c
index 28bd0fe..66aa823 100644
--- a/ksrc/arch/x86/hal_32.c
+++ b/ksrc/arch/x86/hal_32.c
@@ -280,6 +280,15 @@ 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
+
+#if defined(HPET_TIMER) && !(X86_LOCAL_APIC && X86_TSC)
+#error Disable HPET (CONFIG_HPET_TIMER) or enable LAPIC \
+ (CONFIG_X86_LOCAL_APIC) 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..c118d64 100644
--- a/scripts/Kconfig.frag
+++ b/scripts/Kconfig.frag
@@ -6,12 +6,12 @@ comment "or Intel cpuidle option. These options are known to
cause troubles"
comment "with Xenomai, disable them."
endif
+if !IPIPE_CORE
comment "NOTE: Xenomai conflicts with PC speaker support."
depends on !X86_TSC && X86 && INPUT_PCSPKR
comment "(menu Device Drivers/Input device support/Miscellaneous devices)"
depends on !X86_TSC && X86 && INPUT_PCSPKR
-if !IPIPE_CORE
comment "NOTE: Xenomai needs either X86_LOCAL_APIC enabled or HPET_TIMER
disabled."
depends on (!X86_LOCAL_APIC || !X86_TSC) && X86 && HPET_TIMER
comment "(menu Processor type and features)"
@@ -19,7 +19,6 @@ 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)))
bool "Xenomai"
default y
select IPIPE
_______________________________________________
Xenomai-git mailing list
Xenomai-git@xenomai.org
http://www.xenomai.org/mailman/listinfo/xenomai-git
