Merge with 3ecb6845e742978827406b7da6f77dc350e6b55b

[arc.git] / boards / board_common.mk

diff --git a/boards/board_common.mk b/boards/board_common.mk
index eac469a444a8b94dbf44737a276913dbc810746c..ac1d8399b38be7b3013b63d77221d02d2dd05e37 100644 (file)
--- a/boards/board_common.mk
+++ b/boards/board_common.mk
@@ -37,7 +37,9 @@ endif
 obj-$(USE_ECUM) += EcuM.o\r
 obj-$(USE_ECUM) += EcuM_Main.o\r
 obj-$(USE_ECUM) += EcuM_PBcfg.o\r
+ifneq ($(filter EcuM_Callout_Stubs.o,$(obj-y)),)\r
 obj-$(USE_ECUM) += EcuM_Callout_Stubs.o\r
+endif\r
 obj-$(USE_ECUM)-$(CFG_ECUM_USE_SERVICE_COMPONENT) += EcuM_ServiceComponent.o\r
 inc-$(USE_ECUM) += $(ROOTDIR)/system/EcuM\r
 vpath-$(USE_ECUM) += $(ROOTDIR)/system/EcuM\r
@@ -59,6 +61,7 @@ inc-$(USE_DMA) += $(ROOTDIR)/$(ARCH_PATH-y)/drivers
 # Mcu\r
 obj-$(USE_MCU) += Mcu.o\r
 obj-$(USE_MCU) += Mcu_Cfg.o\r
+obj-$(USE_MCU) += Mcu_Sleep.o\r
 #obj-$(CFG_MPC55XX)-$(USE_MCU) += Mcu_Exceptions.o\r
 \r
 # Flash\r
@@ -113,6 +116,11 @@ vpath-$(USE_NVM) += $(ROOTDIR)/system/Crc
 obj-$(USE_NVM) += Crc_32.o\r
 obj-$(USE_NVM) += Crc_16.o\r
 \r
+# SchM, always find the include files.\r
+inc-y += $(ROOTDIR)/system/SchM\r
+vpath-$(USE_SCHM) += $(ROOTDIR)/system/SchM\r
+obj-$(USE_SCHM) += SchM.o\r
+\r
 # J1939Tp\r
 obj-$(USE_J1939TP) += J1939Tp.o\r
 obj-$(USE_J1939TP) += J1939Tp_LCfg.o\r