Merge with 6c0406457e55f82d7a30afd3b7cec1c458993ef4

[arc.git] / boards / board_common.mk

diff --git a/boards/board_common.mk b/boards/board_common.mk
index d8defd9b4cd5eefc177dbce0a33261bcb6c0c146..f52e4e793d708b77874967b6041c576e47330339 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
@@ -179,6 +187,7 @@ obj-$(USE_LIN) += Lin_PBcfg.o
 obj-$(USE_LIN) += Lin_Lcfg.o\r
 obj-$(USE_LIN)-$(CFG_MPC560X) += LinFlex.o\r
 obj-$(USE_LIN)-$(CFG_MPC5516) += Lin.o\r
+obj-$(USE_LIN)-$(CFG_MPC5567) += Lin.o\r
 \r
 # LinIf\r
 obj-$(USE_LINIF) += LinIf_Lcfg.o\r
@@ -248,10 +257,11 @@ inc-$(USE_COM) += $(ROOTDIR)/communication/PduR
 vpath-$(USE_PDUR) += $(ROOTDIR)/communication/PduR\r
 \r
 # IO Hardware Abstraction\r
+vpath-$(USE_IOHWAB) += $(ROOTDIR)/system/IoHwAb\r
 obj-$(USE_IOHWAB) += IoHwAb_Digital.o\r
 obj-$(USE_IOHWAB) += IoHwAb_Analog.o\r
 obj-$(USE_IOHWAB) += IoHwAb_Pwm.o\r
-\r
+obj-$(USE_IOHWAB)-$(CFG_IOHWAB_USE_SERVICE_COMPONENT) += IoHwAb_ServiceComponent.o\r
 \r
 #Dem\r
 obj-$(USE_DEM) += Dem.o\r
@@ -265,6 +275,7 @@ obj-$(USE_DCM) += Dcm_Dsp.o
 obj-$(USE_DCM) += Dcm_Dsd.o\r
 obj-$(USE_DCM) += Dcm_Dsl.o\r
 obj-$(USE_DCM) += Dcm_LCfg.o\r
+obj-$(USE_DCM) += Dcm_Callout_Stubs.o\r
 inc-$(USE_DCM) += $(ROOTDIR)/diagnostic/Dcm\r
 vpath-$(USE_DCM) += $(ROOTDIR)/diagnostic/Dcm\r
 \r