Merge with mahi-application

[arc.git] / boards / board_common.mk

diff --git a/boards/board_common.mk b/boards/board_common.mk
index 092fe064d9563e35e46cecae750595d758126a1c..56093713f7c8d0accd65c76edf853ef280bc03a0 100644 (file)
--- a/boards/board_common.mk
+++ b/boards/board_common.mk
@@ -3,7 +3,6 @@ _BOARD_COMMON_MK:=y  # Include guard for backwards compatability
 \r
 obj-$(CFG_PPC) += crt0.o\r
 obj-$(CFG_HC1X) += crt0.o\r
-\r
 vpath-$(CFG_ARM_CM3) += $(ROOTDIR)/$(ARCH_PATH-y)/kernel\r
 vpath-$(CFG_ARM_CM3) += $(ROOTDIR)/$(ARCH_PATH-y)/drivers/STM32F10x_StdPeriph_Driver/src\r
 vpath-$(CFG_ARM_CM3) += $(ROOTDIR)/$(ARCH_PATH-y)/drivers/STM32_ETH_Driver/src\r
@@ -122,11 +121,11 @@ vpath-y += $(ROOTDIR)/peripherals
 \r
 #Wdg\r
 obj-$(USE_WDG) += Wdg.o\r
-obj-$(USE_WDG) += Wdg_Lcfg.o\r
+#obj-$(USE_WDG) += Wdg_Lcfg.o\r
 \r
 #WdgIf\r
-obj-$(USE_WDG) += WdgIf.o\r
-obj-$(USE_WDG) += WdgIf_Cfg.o\r
+obj-$(USE_WDGIF) += WdgIf.o\r
+obj-$(USE_WDGIF) += WdgIf_Cfg.o\r
 inc-y += $(ROOTDIR)/system/WdgIf\r
 vpath-y += $(ROOTDIR)/system/WdgIf\r
 \r
@@ -196,12 +195,14 @@ vpath-$(USE_COM) += $(ROOTDIR)/communication/Com
 \r
 # PduR\r
 obj-$(USE_PDUR) += PduR_Com.o\r
-obj-$(USE_PDUR) += PduR_If.o\r
+obj-$(USE_PDUR) += PduR_Logic.o\r
 obj-$(USE_PDUR) += PduR_LinIf.o\r
 obj-$(USE_PDUR) += PduR_PbCfg.o\r
 obj-$(USE_PDUR) += PduR_CanIf.o\r
 obj-$(USE_PDUR) += PduR_CanTp.o\r
 obj-$(USE_PDUR) += PduR_Dcm.o\r
+obj-$(USE_PDUR) += PduR_SoAd.o\r
+obj-$(USE_PDUR) += PduR_Routing.o\r
 obj-$(USE_PDUR) += PduR.o\r
 inc-$(USE_PDUR) += $(ROOTDIR)/communication/PduR\r
 inc-$(USE_COM) += $(ROOTDIR)/communication/PduR\r
@@ -242,7 +243,7 @@ vpath-$(USE_TCF) += $(ROOTDIR)/common/tcf
 #SLEEP\r
 obj-$(USE_SLEEP) += sleep.o\r
 \r
-obj-y += xtoa.o\r
+\r
 \r
 ifeq ($(COMPILER),cw)\r
 SELECT_CLIB?=CLIB_CW\r
@@ -250,11 +251,16 @@ endif
 \r
 SELECT_CLIB?=CLIB_NEWLIB\r
 \r
-ifeq ($(SELECT_CLIB),CLIB_CW)\r
+ifeq ($(SELECT_CLIB),CLIB_NATIVE)\r
+  # Just use native clib \r
+  \r
+else ifeq ($(SELECT_CLIB),CLIB_CW)\r
   # This is not good, but don't know what to do right now....\r
+  obj-y += xtoa.o\r
   obj-y += msl_port.o\r
 else\r
   # Newlib\r
+  obj-y += xtoa.o\r
   obj-y += newlib_port.o\r
   # If we have configured console output we include printf. \r
   # Overridden to use lib implementation with CFG_NEWLIB_PRINTF\r