Merge with 6c0406457e55f82d7a30afd3b7cec1c458993ef4

[arc.git] / boards / board_common.mk

diff --git a/boards/board_common.mk b/boards/board_common.mk
index b715cc8b0fde354504d5cec4cbcec82dd93f8678..f52e4e793d708b77874967b6041c576e47330339 100644 (file)
--- a/boards/board_common.mk
+++ b/boards/board_common.mk
@@ -1,6 +1,7 @@
 \r
 _BOARD_COMMON_MK:=y  # Include guard for backwards compatability\r
 \r
+\r
 obj-$(CFG_PPC) += crt0.o\r
 obj-$(CFG_HC1X) += crt0.o\r
 vpath-$(CFG_ARM_CM3) += $(ROOTDIR)/$(ARCH_PATH-y)/kernel\r
@@ -35,8 +36,11 @@ endif
 #Ecu\r
 obj-$(USE_ECUM) += EcuM.o\r
 obj-$(USE_ECUM) += EcuM_Main.o\r
-obj-$(USE_ECUM) += EcuM_Cfg.o\r
-obj-$(USE_ECUM) += EcuM_Callout_template.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
 \r
@@ -57,24 +61,25 @@ 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
 obj-$(USE_FLS) += Fls.o\r
 obj-$(USE_FLS) += Fls_Cfg.o\r
-ifeq ($(CFG_MPC5606S),y)\r
-obj-$(CFG_MPC55XX)-$(USE_FLS) += Fls_C90FL.o\r
-else\r
-obj-$(CFG_MPC55XX)-$(USE_FLS) += Fls_H7F.o\r
-endif\r
+obj-$(CFG_MPC55XX)-$(USE_FLS) += flash_h7f_c90.o\r
+obj-$(CFG_MPC55XX)-$(USE_FLS) += flash_ll_h7f_c90.o\r
+\r
 \r
 # Bring in the freescale driver source  \r
 inc-$(CFG_MPC55XX) +=  $(ROOTDIR)/$(ARCH_PATH-y)/delivery/mpc5500_h7f/include\r
 \r
 # Can\r
 obj-$(USE_CAN) += Can.o\r
-#obj-$(USE_CAN) += Can_Lcfg.o\r
-obj-$(USE_CAN) += Can_PBcfg.o\r
+obj-$(USE_CAN)-$(CFG_PPC) += Can_PBcfg.o\r
+obj-$(USE_CAN)-$(CFG_ARM_CM3) += Can_Lcfg.o\r
+obj-$(USE_CAN)-$(CFG_ARM_CR4) += Can_Lcfg.o\r
+obj-$(USE_CAN)-$(CFG_HC1X) += Can_Lcfg.o\r
 \r
 # CanIf\r
 obj-$(USE_CANIF) += CanIf.o\r
@@ -95,8 +100,26 @@ obj-$(USE_DIO) += Dio_Lcfg.o
 obj-$(USE_PORT) += Port.o\r
 obj-$(USE_PORT) += Port_Cfg.o\r
 \r
-obj-$(USE_ADC) += Adc.o\r
+obj-$(USE_ADC)-$(CFG_MPC560X) += Adc_560x.o\r
+obj-$(USE_ADC)-$(CFG_MPC5668) += Adc_560x.o\r
+obj-$(USE_ADC)-$(CFG_HC1X) += Adc.o\r
+obj-$(USE_ADC)-$(CFG_ARM_CM3) += Adc.o\r
+obj-$(USE_ADC)-$(CFG_MPC5516) += Adc_eQADC.o\r
+obj-$(USE_ADC)-$(CFG_MPC5567) += Adc_eQADC.o\r
 obj-$(USE_ADC) += Adc_Cfg.o\r
+obj-$(USE_ADC) += Adc_Internal.o\r
+vpath-y += $(ROOTDIR)/drivers\r
+inc-y += $(ROOTDIR)/drivers\r
+\r
+# Crc (Include when using NvM)\r
+vpath-$(USE_NVM) += $(ROOTDIR)/system/Crc\r
+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
@@ -116,6 +139,7 @@ obj-$(USE_SPI) += Spi_Lcfg.o
 # NvM\r
 obj-$(USE_NVM) += NvM.o\r
 obj-$(USE_NVM) += NvM_Cfg.o\r
+obj-$(USE_NVM)-$(CFG_NVM_USE_SERVICE_COMPONENT) += NvM_ServiceComponent.o\r
 inc-$(USE_NVM) += $(ROOTDIR)/memory/NvM\r
 vpath-$(USE_NVM) += $(ROOTDIR)/memory/NvM\r
 \r
@@ -133,7 +157,6 @@ obj-$(USE_EEP) += Eep_Lcfg.o
 #Fls ext\r
 obj-$(USE_FLS_SST25XX) += Fls_SST25xx.o\r
 obj-$(USE_FLS_SST25XX) += Fls_SST25xx_Cfg.o\r
-vpath-y += $(ROOTDIR)/peripherals\r
 \r
 #Wdg\r
 obj-$(USE_WDG) += Wdg.o\r
@@ -142,6 +165,7 @@ obj-$(USE_WDG) += Wdg_Lcfg.o
 #WdgIf\r
 obj-$(USE_WDGIF) += WdgIf.o\r
 obj-$(USE_WDGIF) += WdgIf_Cfg.o\r
+obj-$(USE_WDGM)-$(CFG_WDGM_USE_SERVICE_COMPONENT) += WdgM_ServiceComponent.o\r
 inc-y += $(ROOTDIR)/system/WdgIf\r
 vpath-y += $(ROOTDIR)/system/WdgIf\r
 \r
@@ -161,7 +185,9 @@ obj-$(USE_DET) += Det.o
 # Lin\r
 obj-$(USE_LIN) += Lin_PBcfg.o\r
 obj-$(USE_LIN) += Lin_Lcfg.o\r
-obj-$(USE_LIN) += Lin.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
@@ -231,7 +257,11 @@ inc-$(USE_COM) += $(ROOTDIR)/communication/PduR
 vpath-$(USE_PDUR) += $(ROOTDIR)/communication/PduR\r
 \r
 # IO Hardware Abstraction\r
-obj-$(USE_IOHWAB) += IoHwAb.o\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
+obj-$(USE_IOHWAB)-$(CFG_IOHWAB_USE_SERVICE_COMPONENT) += IoHwAb_ServiceComponent.o\r
 \r
 #Dem\r
 obj-$(USE_DEM) += Dem.o\r
@@ -245,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
@@ -265,7 +296,8 @@ vpath-$(USE_TCF) += $(ROOTDIR)/common/tcf
 #SLEEP\r
 obj-$(USE_SLEEP) += sleep.o\r
 \r
-\r
+# Circular Buffer (always)\r
+obj-y += cirq_buffer.o\r
 \r
 ifeq ($(COMPILER),cw)\r
 SELECT_CLIB?=CLIB_CW\r