Merge in from default

[arc.git] / boards / board_common.mk

diff --git a/boards/board_common.mk b/boards/board_common.mk
index d2c18ec93f93bd797d8df0274af8f94f804452bd..483d00fd2586c839f861361ec4e44e5fa941d1a4 100644 (file)
--- a/boards/board_common.mk
+++ b/boards/board_common.mk
@@ -13,11 +13,12 @@ endif
 \r
 #Ecu\r
 #obj-y += EcuM_$(BOARDDIR).o\r
-obj-$(USE_ECUM) += EcuM.o\r
-obj-$(USE_ECUM) += EcuM_Cfg.o\r
-obj-$(USE_ECUM) += EcuM_Callout_template.o\r
-inc-$(USE_ECUM) += $(ROOTDIR)/system/EcuM\r
-vpath-$(USE_ECUM) += $(ROOTDIR)/system/EcuM\r
+obj-y += EcuM.o\r
+obj-y += EcuM_Main.o\r
+obj-y += EcuM_Cfg.o\r
+obj-y += EcuM_Callout_template.o\r
+inc-y += $(ROOTDIR)/system/EcuM\r
+vpath-y += $(ROOTDIR)/system/EcuM\r
 \r
 # Gpt\r
 obj-$(USE_GPT) += Gpt.o\r
@@ -76,6 +77,18 @@ endif
 obj-$(USE_SPI) += Spi.o\r
 obj-$(USE_SPI) += Spi_Lcfg.o\r
 \r
+# NvM\r
+obj-$(USE_NVM) += NvM.o\r
+obj-$(USE_NVM) += NvM_Cfg.o\r
+inc-$(USE_NVM) += $(ROOTDIR)/memory/Nvm\r
+vpath-$(USE_NVM) += $(ROOTDIR)/memory/Nvm\r
+\r
+# Fee\r
+obj-$(USE_FEE) += Fee.o\r
+obj-$(USE_FEE) += Fee_Cfg.o\r
+inc-$(USE_FEE) += $(ROOTDIR)/memory/Fee\r
+vpath-$(USE_FEE) += $(ROOTDIR)/memory/Fee\r
+\r
 #Eep\r
 obj-$(USE_EEP) += Eep.o\r
 obj-$(USE_EEP) += Eep_Lcfg.o\r
@@ -189,14 +202,30 @@ obj-$(USE_RAMLOG) += ramlog.o
 # Common stuff, if speciied\r
 VPATH += $(ROOTDIR)/common\r
 \r
-\r
-#TCF\r
-obj-$(USE_TCF) += tcf.o\r
-obj-$(USE_TCF) += Tcf_Cfg.o\r
-obj-$(USE_TCF) += sys_monitor.o\r
-obj-$(USE_TCF) += streams.o\r
-inc-$(USE_TCF) += $(ROOTDIR)/common/tcf\r
-vpath-$(USE_TCF) += $(ROOTDIR)/common/tcf\r
+#tests\r
+#obj-y += RunTests.o\r
+#obj-$(USE_CAN) += can_test.o\r
+#obj-$(USE_DIO) += dio_test.o\r
+#obj-$(USE_PORT) += port_test.o\r
+#obj-$(USE_CANIF) += canif_test.o\r
+#obj-$(USE_FLS) += fls_test.o\r
+#obj-y += mahi_test.o\r
+#obj-$(USE_GPT) += gpt_test.o\r
+#obj-$(USE_SPI) += spi_test.o\r
+#obj-$(USE_EEP) += eep_test.o\r
+#obj-y += det_test.o\r
+#obj-$(USE_MCU) += mcu_test.o\r
+#obj-$(USE_FLS_SST25XX) += xfls_test.o\r
+#obj-y += lin_test.o\r
+#obj-$(USE_PDUR) += pdur_test.o\r
+#obj-$(USE_COM) += com_test.o\r
+\r
+#inc-$(USE_TESTS) += $(ROOTDIR)/embunit/embUnit\r
+#inc-$(USE_TESTS) += $(ROOTDIR)/embunit/textui\r
+#inc-$(USE_TESTS) += $(ROOTDIR)/embunit\r
+\r
+#libitem-$(USE_TESTS) += $(ROOTDIR)/embunit/embUnit/obj_$(ARCH)/libembunit.a\r
+#libitem-$(USE_TESTS) += $(ROOTDIR)/embunit/textui/obj_$(ARCH)/libtextui.a\r
 \r
 # Newlib overrides (overridden by default)\r
 ifneq ($(CFG_STANDARD_NEWLIB),y)\r