Module: xenomai-head Branch: master Commit: f171b19e2934b6c126e9552aabf6382a44181992 URL: http://git.xenomai.org/?p=xenomai-head.git;a=commit;h=f171b19e2934b6c126e9552aabf6382a44181992
Author: Gilles Chanteperdrix <gilles.chanteperd...@xenomai.org> Date: Thu Oct 27 22:56:01 2011 +0200 arm: allow multi-omap configuration --- include/asm-arm/hal.h | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/include/asm-arm/hal.h b/include/asm-arm/hal.h index ef7a8bb..dafbaae 100644 --- a/include/asm-arm/hal.h +++ b/include/asm-arm/hal.h @@ -58,11 +58,13 @@ #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_OMAP2) || defined(CONFIG_ARCH_OMAP3) \ + || defined(CONFIG_ARCH_OMAP4)) && !defined(CONFIG_SMP) #define RTHAL_TIMER_DEVICE "gp timer" #define RTHAL_CLOCK_DEVICE "gp timer" -/* omap4 SMP uses TWD */ +#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_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
