update

[l4.git] / kernel / fiasco / src / kern / arm / bsp / realview / Modules

diff --git a/kernel/fiasco/src/kern/arm/bsp/realview/Modules b/kernel/fiasco/src/kern/arm/bsp/realview/Modules
index 0c6eb0b1f86f56d5f1312cf00521d484a744c695..68848b341ceb6b82f07f75294fb4843b4f432d6d 100644 (file)
--- a/kernel/fiasco/src/kern/arm/bsp/realview/Modules
+++ b/kernel/fiasco/src/kern/arm/bsp/realview/Modules
@@ -3,13 +3,20 @@
 SUBSYSTEMS              += LIBUART
 OBJECTS_LIBUART         += uart_pl011.o
 PREPROCESS_PARTS        += realview libuart pic_gic
-PREPROCESS_PARTS        += $(if $(CONFIG_ARM_MPCORE)$(CONFIG_ARM_CORTEX_A9),mptimer,sp804)
 PREPROCESS_PARTS        += $(if $(CONFIG_PF_REALVIEW_L2CACHE),outer_cache)
 PREPROCESS_PARTS        += $(if $(CONFIG_PF_REALVIEW_EB),realview_eb)
 PREPROCESS_PARTS        += $(if $(CONFIG_PF_REALVIEW_PB11MP),realview_pb11mp)
 PREPROCESS_PARTS        += $(if $(CONFIG_PF_REALVIEW_PBX),realview_pbx)
 CONFIG_KERNEL_LOAD_ADDR := $(CONFIG_PF_REALVIEW_RAM_PHYS_BASE)
 
+ifeq ($(CONFIG_ARM_MPCORE)$(CONFIG_ARM_CORTEX_A9),)
+  PREPROCESS_PARTS    += sp804
+  timer_IMPL          += timer-arm-realview
+else
+  PREPROCESS_PARTS    += mptimer
+  timer_IMPL          += timer-arm-mptimer timer-arm-mptimer-realview
+endif
+
 INTERFACES_KERNEL     += gic boot_mp platform board_check-arm-realview
 
 uart_IMPL             += uart-arm-realview
@@ -17,7 +24,6 @@ config_IMPL           += config-arm-realview
 mem_layout_IMPL       += mem_layout-arm-realview
 pic_IMPL              += pic-arm-realview
 bootstrap_IMPL        += bootstrap-arm-realview
-timer_IMPL            += timer-arm-realview timer-arm-mptimer
 kernel_uart_IMPL      += kernel_uart-arm-realview
 reset_IMPL            += reset-arm-realview
 clock_IMPL            += clock-arm-realview