Module: xenomai-head Branch: master Commit: ae4ba3c01d562e0b0f6ce8ccfb69d6ddebab76b3 URL: http://git.xenomai.org/?p=xenomai-head.git;a=commit;h=ae4ba3c01d562e0b0f6ce8ccfb69d6ddebab76b3
Author: Gilles Chanteperdrix <gilles.chanteperd...@xenomai.org> Date: Fri Oct 28 00:04:56 2011 +0200 omap: cause a compilation error in case of multi-omap configuration --- include/asm-arm/hal.h | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/include/asm-arm/hal.h b/include/asm-arm/hal.h index dafbaae..e3ceebd 100644 --- a/include/asm-arm/hal.h +++ b/include/asm-arm/hal.h @@ -58,13 +58,20 @@ #elif defined(CONFIG_ARCH_MXC) #define RTHAL_TIMER_DEVICE "mxc_timer1" #define RTHAL_CLOCK_DEVICE "mxc_timer1" -#elif (defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) \ - || defined(CONFIG_ARCH_OMAP4)) && !defined(CONFIG_SMP) +#elif defined(CONFIG_ARCH_OMAP3) +#ifdef CONFIG_ARCH_OMAP4 +#error "xenomai does not support multi-omap configuration" +#endif /* multi-omap */ #define RTHAL_TIMER_DEVICE "gp timer" #define RTHAL_CLOCK_DEVICE "gp timer" -#elif defined(CONFIG_ARCH_OMAP4) && defined(CONFIG_SMP) -#define RTHAL_TIMER_DEVICE cpu_is_omap44xx() ? "local_timer" : "gp timer" -#define RTHAL_CLOCK_DEVICE cpu_is_omap44xx() ? "global_timer" : "gp timer" +#elif defined(CONFIG_ARCH_OMAP4) +#ifdef CONFIG_ARCH_OMAP3 +#error "xenomai does not support multi-omap configuration" +#endif /* multi-omap */ +#define RTHAL_TIMER_DEVICE \ + num_online_cpus() == 1 ? "gp timer" : "local_timer" +#define RTHAL_CLOCK_DEVICE \ + num_online_cpus() == 1 ? "gp timer" : "global_timer" #elif defined(CONFIG_PLAT_ORION) #define RTHAL_TIMER_DEVICE "orion_tick" #define RTHAL_CLOCK_DEVICE "orion_clocksource" _______________________________________________ Xenomai-git mailing list Xenomai-git@gna.org https://mail.gna.org/listinfo/xenomai-git
