Makesystem modules cleanup

diff --git a/boards/board_common.mk b/boards/board_common.mk
index 193555fce3a52e4c46579cdfd51cb666b80e3222..b0369dfd0e8f76b7579a4c4a59ab5430009a3e25 100644 (file)
--- a/boards/board_common.mk
+++ b/boards/board_common.mk
@@ -4,6 +4,12 @@ vpath-$(CFG_ARM_CM3) += $(ARCH_PATH-y)kernel
 obj-$(CFG_ARM_CM3) += core_cm3.o\r
 obj-$(CFG_ARM_CM3) += startup_stm32f10x.o\r
 \r
+# OS object files. \r
+# (checking if already included for compatability)\r
+ifeq ($(filter Os_Cfg.o,$(obj-y)),)\r
+obj-$(USE_KERNEL) += Os_Cfg.o\r
+endif\r
+\r
 #Ecu\r
 #obj-y += EcuM_$(BOARDDIR).o\r
 obj-$(USE_ECUM) += EcuM.o\r
@@ -180,9 +186,13 @@ vpath-$(USE_DCM) += $(ROOTDIR)/diagnostic/Dcm
 obj-$(USE_RAMLOG) += ramlog.o\r
 \r
 # Common stuff, if speciied\r
-obj-$(USE_COMMON) += arc.o\r
 VPATH += $(ROOTDIR)/common\r
 \r
+\r
+# Newlib overrides (overridden by default)\r
+ifneq ($(CFG_STANDARD_NEWLIB),y)\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
 ifneq ($(CFG_NEWLIB_PRINTF),y)\r
@@ -190,13 +200,10 @@ ifneq ($(CFG_NEWLIB_PRINTF),y)
 #       just print to a buffer, e.g. sprintf() \r
 ifneq (,$(SELECT_CONSOLE) $(SELECT_OS_CONSOLE))\r
 obj-y += printf.o\r
-endif\r
-endif\r
-\r
 \r
-# Newlib\r
-obj-$(USE_NEWLIB) += xtoa.o\r
-obj-$(USE_NEWLIB) += newlib_port.o\r
+endif # SELECT_CONSOLE\r
+endif # CFG_NEWLIB_PRINTF\r
+endif # CFG_STANDARD_NEWLIB\r
 \r
 obj-y += $(obj-y-y)\r
 \r

diff --git a/boards/et_stm32_stamp/build_config.mk b/boards/et_stm32_stamp/build_config.mk
index c089746a7f13b330c08da124623196d179a536ff..4efb0be1b3f1aaa9371b80f0a980e94946861762 100644 (file)
--- a/boards/et_stm32_stamp/build_config.mk
+++ b/boards/et_stm32_stamp/build_config.mk
@@ -13,7 +13,7 @@ MOD_AVAIL+=ADC MCU PWM
 # System + Communication + Diagnostic\r
 MOD_AVAIL+=CANIF CANTP COM DCM DEM DET ECUM IOHWAB KERNEL PDUR WDGM\r
 # Additional\r
-MOD_AVAIL+=COMMON NEWLIB RAMLOG \r
+MOD_AVAIL+=  RAMLOG \r
 \r
 # Needed by us\r
 MOD_USE=KERNEL MCU\r

diff --git a/boards/hcs12_elmicro_card12/build_config.mk b/boards/hcs12_elmicro_card12/build_config.mk
index ed4d9bca73b6a55d5429ac779a6ccef9c0d94d55..df73c463d167b0fe3f3e8b1f633d0065ed0bfea5 100644 (file)
--- a/boards/hcs12_elmicro_card12/build_config.mk
+++ b/boards/hcs12_elmicro_card12/build_config.mk
@@ -13,7 +13,7 @@ MOD_AVAIL+=MCU GPT
 # System + Communication + Diagnostic
 MOD_AVAIL+=CANIF CANTP COM DCM DEM DET ECUM IOHWAB KERNEL PDUR WDGM
 # Additional
-MOD_AVAIL+=COMMON NEWLIB RAMLOG 
+MOD_AVAIL+=  RAMLOG 
 
 
 # Needed by us (These become USE_XXX=y and def-y += USE_XXX )

diff --git a/boards/linux/build_config.mk b/boards/linux/build_config.mk
index 16ad7d504276ff2df2f549ab081da9d9a6686f04..51d9edf38b6969cbaea63e857ad33f4be485d111 100644 (file)
--- a/boards/linux/build_config.mk
+++ b/boards/linux/build_config.mk
@@ -11,7 +11,7 @@ CFG= BRD_LINUX
 \r
 # What buildable modules does this board have, \r
 # default or private\r
-MOD_AVAIL+=COM PDUR NEWLIB DET DCM DEM COMM CANSM CANTP CANIF CANNM NM\r
+MOD_AVAIL+=COM PDUR  DET DCM DEM COMM CANSM CANTP CANIF CANNM NM\r
 \r
 # Needed by us\r
 MOD_USE=\r

diff --git a/boards/mpc5516it/build_config.mk b/boards/mpc5516it/build_config.mk
index 7668ba741906dce1c5af825d89017b94a8c4a312..6c62547402fcb085cb45879faeed1148ffc02ca2 100644 (file)
--- a/boards/mpc5516it/build_config.mk
+++ b/boards/mpc5516it/build_config.mk
@@ -15,4 +15,4 @@ MOD_AVAIL+=ADC DIO DMA CAN GPT LIN MCU PORT PWM WDG
 # System + Communication + Diagnostic\r
 MOD_AVAIL+=CANIF CANTP COM DCM DEM DET ECUM IOHWAB KERNEL PDUR WDGM\r
 # Additional\r
-MOD_AVAIL+=COMMON NEWLIB RAMLOG \r
+MOD_AVAIL+= RAMLOG \r

diff --git a/boards/mpc551xsim/build_config.mk b/boards/mpc551xsim/build_config.mk
index caed459e5973327b78bddc5245daa05c3f31871e..e6744ff90d773666d391fa6d36d2067de30fa649 100644 (file)
--- a/boards/mpc551xsim/build_config.mk
+++ b/boards/mpc551xsim/build_config.mk
@@ -15,4 +15,4 @@ MOD_AVAIL+=ADC DIO DMA CAN GPT LIN MCU PORT PWM WDG
 # System + Communication + Diagnostic\r
 MOD_AVAIL+=CANIF CANTP COM DCM DEM DET ECUM IOHWAB KERNEL PDUR WDGM\r
 # Additional\r
-MOD_AVAIL+=COMMON NEWLIB RAMLOG \r
+MOD_AVAIL+=  RAMLOG \r

diff --git a/boards/mpc5554sim/build_config.mk b/boards/mpc5554sim/build_config.mk
index 6ad7ba710d7c643ad67e6395c0b0ee01da6ff3b1..a9c706cca64abbb59cc66308ccd0721b97408986 100644 (file)
--- a/boards/mpc5554sim/build_config.mk
+++ b/boards/mpc5554sim/build_config.mk
@@ -15,4 +15,4 @@ MOD_AVAIL+=ADC DIO DMA CAN GPT LIN MCU PORT PWM WDG
 # System + Communication + Diagnostic\r
 MOD_AVAIL+=CANIF CANTP COM DCM DEM DET ECUM IOHWAB KERNEL PDUR WDGM\r
 # Additional\r
-MOD_AVAIL+=COMMON NEWLIB RAMLOG \r
+MOD_AVAIL+=  RAMLOG \r

diff --git a/boards/mpc5567qrtech/build_config.mk b/boards/mpc5567qrtech/build_config.mk
index 88c64693a4f9229624d9db9734b6c45c47ed0bea..976e7e66250bde4f8aa58bd9918cea6ba44d1dd8 100644 (file)
--- a/boards/mpc5567qrtech/build_config.mk
+++ b/boards/mpc5567qrtech/build_config.mk
@@ -15,6 +15,6 @@ MOD_AVAIL+=ADC DIO DMA CAN GPT LIN MCU PORT PWM WDG
 # System + Communication + Diagnostic\r
 MOD_AVAIL+=CANIF CANTP COM DCM DEM DET ECUM IOHWAB KERNEL PDUR WDGM\r
 # Additional\r
-MOD_AVAIL+=COMMON NEWLIB RAMLOG \r
+MOD_AVAIL+=  RAMLOG \r
 \r
 \r

diff --git a/boards/mpc563xsim/build_config.mk b/boards/mpc563xsim/build_config.mk
index 77ee8b025425d03f4999f9936f753333cbfbfcc7..01e1bbb51b3b922afbb2aa62461b2b1b0ee81bcf 100644 (file)
--- a/boards/mpc563xsim/build_config.mk
+++ b/boards/mpc563xsim/build_config.mk
@@ -15,5 +15,5 @@ MOD_AVAIL+=ADC DIO DMA CAN GPT LIN MCU PORT PWM WDG
 # System + Communication + Diagnostic
 MOD_AVAIL+=CANIF CANTP COM DCM DEM DET ECUM IOHWAB KERNEL PDUR WDGM
 # Additional
-MOD_AVAIL+=COMMON NEWLIB RAMLOG 
+MOD_AVAIL+=  RAMLOG 
 

diff --git a/boards/stm32_mcbstm32/build_config.mk b/boards/stm32_mcbstm32/build_config.mk
index ad7fd75f628e5fb197e42e4dca692c60f0e90d5b..d6b26db50a344a4033eba7a411eff83402257b8a 100644 (file)
--- a/boards/stm32_mcbstm32/build_config.mk
+++ b/boards/stm32_mcbstm32/build_config.mk
@@ -29,7 +29,7 @@ MOD_AVAIL+=ADC CAN DIO MCU FLS PORT PWM
 # System + Communication + Diagnostic\r
 MOD_AVAIL+=CANIF CANTP COM DCM DEM DET ECUM IOHWAB KERNEL PDUR WDGM\r
 # Additional\r
-MOD_AVAIL+=COMMON NEWLIB RAMLOG \r
+MOD_AVAIL+=  RAMLOG \r
 \r
 #\r
 # Extra defines \r

diff --git a/boards/stm32_stm3210c/build_config.mk b/boards/stm32_stm3210c/build_config.mk
index b04acee3d73750288b6adeab6a5404a031130277..0ab3027f56895a4d0231e0af34d59c60469b91a7 100644 (file)
--- a/boards/stm32_stm3210c/build_config.mk
+++ b/boards/stm32_stm3210c/build_config.mk
@@ -29,7 +29,7 @@ MOD_AVAIL+=ADC CAN DIO MCU FLS PORT PWM
 # System + Communication + Diagnostic\r
 MOD_AVAIL+=CANIF CANTP COM DCM DEM DET ECUM IOHWAB KERNEL PDUR WDGM\r
 # Additional\r
-MOD_AVAIL+=COMMON NEWLIB RAMLOG \r
+MOD_AVAIL+=  RAMLOG \r
 \r
 #\r
 # Extra defines \r

diff --git a/examples/pwm_node/build_config.mk b/examples/pwm_node/build_config.mk
index 067f3d9fef689385c2f1b32683f7e67a71c5db86..8bff5047ea1c13823a82068edc23197ee486707c 100644 (file)
--- a/examples/pwm_node/build_config.mk
+++ b/examples/pwm_node/build_config.mk
@@ -4,4 +4,4 @@
 -include ../config/*.mk\r
 -include ../config/$(BOARDDIR)/*.mk\r
 \r
-MOD_USE+=KERNEL MCU ECUM NEWLIB COMMON DET PORT PWM RAMLOG\r
+MOD_USE+=KERNEL MCU ECUM  DET PORT PWM RAMLOG\r

diff --git a/examples/pwm_node2/build_config.mk b/examples/pwm_node2/build_config.mk
index 66c84d9625162ae335e0c5c46e4895eae2a48186..2ab67f6e1abf50d164128d33bdb6245997dbd87a 100644 (file)
--- a/examples/pwm_node2/build_config.mk
+++ b/examples/pwm_node2/build_config.mk
@@ -2,4 +2,4 @@
 -include ../config/*.mk\r
 -include ../config/$(BOARDDIR)/*.mk\r
 \r
-MOD_USE+=KERNEL MCU ECUM NEWLIB COMMON DET PORT COM CAN CANIF PWM RAMLOG\r
+MOD_USE+=KERNEL MCU ECUM  DET PORT COM CAN CANIF PWM RAMLOG\r

diff --git a/examples/simple/build_config.mk b/examples/simple/build_config.mk
index 34aa9bfe6d95c152aec5f32bc61d460f70233ac5..3d74a9239ebded010c8bf0b484e03353f0dc18ac 100644 (file)
--- a/examples/simple/build_config.mk
+++ b/examples/simple/build_config.mk
@@ -4,7 +4,7 @@
 -include ../config/*.mk\r
 -include ../config/$(BOARDDIR)/*.mk\r
 \r
-MOD_USE+= COMMON DET ECUM MCU NEWLIB KERNEL RAMLOG \r
+MOD_USE+= DET ECUM MCU  KERNEL RAMLOG \r
 \r
 #def-y += NDEBUG\r
 #def-y += HEAPSIZE=1400
\ No newline at end of file

diff --git a/examples/tiny/build_config.mk b/examples/tiny/build_config.mk
index cfacb3920b242372efa1e7943f41e852e90f6f5a..46b89559392119e45c8e2f0d5b83eb0ed34eec2c 100644 (file)
--- a/examples/tiny/build_config.mk
+++ b/examples/tiny/build_config.mk
@@ -4,7 +4,7 @@
 -include ../config/*.mk\r
 -include ../config/$(BOARDDIR)/*.mk\r
 \r
-MOD_USE+=COMMON DET ECUM MCU NEWLIB KERNEL RAMLOG \r
+MOD_USE+= DET ECUM MCU  KERNEL RAMLOG \r
 \r
 SELECT_CONSOLE = RAMLOG\r
 SELECT_OS_CONSOLE = RAMLOG\r

diff --git a/system/kernel/testsystem/build_config.mk b/system/kernel/testsystem/build_config.mk
index 154314c9c71ec04b1fba222cde089dbb8923e1de..20c9b7693118f43aa311183ea7198a144eccafd0 100644 (file)
--- a/system/kernel/testsystem/build_config.mk
+++ b/system/kernel/testsystem/build_config.mk
@@ -1,7 +1,8 @@
 \r
 # Figure out the most of the modules to use.\r
+\r
 OPTIMAL_USE = RAMLOG\r
-MOD_USE+=KERNEL MCU COMMON NEWLIB DET ECUM $(filter $(OPTIMAL_USE),$(MOD_AVAIL))\r
+MOD_USE+=KERNEL MCU  DET ECUM $(filter $(OPTIMAL_USE),$(MOD_AVAIL))\r
 $(warning $(MOD_USE)) \r
 #MOD_USE+=KERNEL MCU T32_TERM SIMPLE_PRINTF RAMLOG\r
 \r

diff --git a/system/kernel/testsystem/makefile b/system/kernel/testsystem/makefile
index 37431f2e13d75f099bbf487acda7ae27fc4c8e23..10cb8f4f7f13449932baa86308f9acbee8cb578d 100644 (file)
--- a/system/kernel/testsystem/makefile
+++ b/system/kernel/testsystem/makefile
@@ -1,4 +1,5 @@
 \r
+obj-y+= arc.o\r
 # included from rules.mk\r
 \r
 # =======================================================================\r

diff --git a/system/kernel/testsystem/suite_01/build_config.mk b/system/kernel/testsystem/suite_01/build_config.mk
index 9848681d0a21fa2dae42206743de767e937360a0..d3c6f3fc0a76c69df5c51ac3fdcff3d97bc415ef 100644 (file)
--- a/system/kernel/testsystem/suite_01/build_config.mk
+++ b/system/kernel/testsystem/suite_01/build_config.mk
@@ -1,5 +1,6 @@
 \r
 # Figure out the most of the modules to use.\r
+\r
 OPTIMAL_USE = RAMLOG\r
-MOD_USE+=KERNEL MCU COMMON NEWLIB DET ECUM $(filter $(OPTIMAL_USE),$(MOD_AVAIL))\r
+MOD_USE+=KERNEL MCU  DET ECUM $(filter $(OPTIMAL_USE),$(MOD_AVAIL))\r
 \r

diff --git a/system/kernel/testsystem/suite_01/makefile b/system/kernel/testsystem/suite_01/makefile
index 2a4df53636e6d2bd6ce03353f59ec41a4c129e56..cafa98c41fdf1b85100beb9421a767267d62959d 100644 (file)
--- a/system/kernel/testsystem/suite_01/makefile
+++ b/system/kernel/testsystem/suite_01/makefile
@@ -1,4 +1,5 @@
 \r
+obj-y+= arc.o\r
 # included from rules.mk\r
 \r
 # =======================================================================\r

diff --git a/system/kernel/testsystem/suite_02/build_config.mk b/system/kernel/testsystem/suite_02/build_config.mk
index b574ebed837ee34eb67a66b5a85a261225027462..66542bfc7bf5dd6b816a65157919428f6f4dca22 100644 (file)
--- a/system/kernel/testsystem/suite_02/build_config.mk
+++ b/system/kernel/testsystem/suite_02/build_config.mk
@@ -1,5 +1,5 @@
 \r
 # Figure out the most of the modules to use.\r
 OPTIMAL_USE = SIMPLE_PRINTF RAMLOG\r
-MOD_USE+=KERNEL MCU COMMON NEWLIB DET ECUM $(filter $(OPTIMAL_USE),$(MOD_AVAIL))\r
+MOD_USE+=KERNEL MCU  DET ECUM $(filter $(OPTIMAL_USE),$(MOD_AVAIL))\r
 \r

diff --git a/system/kernel/testsystem/suite_02/makefile b/system/kernel/testsystem/suite_02/makefile
index 2b47146f8678a5de885b9876cd05d1ad1c7643b1..351f43f7d879561f932b44d93c9fa3ed39dc1036 100644 (file)
--- a/system/kernel/testsystem/suite_02/makefile
+++ b/system/kernel/testsystem/suite_02/makefile
@@ -1,4 +1,5 @@
 \r
+obj-y+= arc.o\r
 # included from rules.mk\r
 \r
 # =======================================================================\r

diff --git a/system/kernel/testsystem/suite_03/build_config.mk b/system/kernel/testsystem/suite_03/build_config.mk
index b574ebed837ee34eb67a66b5a85a261225027462..66542bfc7bf5dd6b816a65157919428f6f4dca22 100644 (file)
--- a/system/kernel/testsystem/suite_03/build_config.mk
+++ b/system/kernel/testsystem/suite_03/build_config.mk
@@ -1,5 +1,5 @@
 \r
 # Figure out the most of the modules to use.\r
 OPTIMAL_USE = SIMPLE_PRINTF RAMLOG\r
-MOD_USE+=KERNEL MCU COMMON NEWLIB DET ECUM $(filter $(OPTIMAL_USE),$(MOD_AVAIL))\r
+MOD_USE+=KERNEL MCU  DET ECUM $(filter $(OPTIMAL_USE),$(MOD_AVAIL))\r
 \r

diff --git a/system/kernel/testsystem/suite_03/makefile b/system/kernel/testsystem/suite_03/makefile
index 2b47146f8678a5de885b9876cd05d1ad1c7643b1..351f43f7d879561f932b44d93c9fa3ed39dc1036 100644 (file)
--- a/system/kernel/testsystem/suite_03/makefile
+++ b/system/kernel/testsystem/suite_03/makefile
@@ -1,4 +1,5 @@
 \r
+obj-y+= arc.o\r
 # included from rules.mk\r
 \r
 # =======================================================================\r

diff --git a/system/kernel/testsystem/suite_perf/build_config.mk b/system/kernel/testsystem/suite_perf/build_config.mk
index 083cd749a801f7b84da86005fa05b8ed6d9f0252..b8bbb30e6a24f17d9bd38a217d8cfe29b691d811 100644 (file)
--- a/system/kernel/testsystem/suite_perf/build_config.mk
+++ b/system/kernel/testsystem/suite_perf/build_config.mk
@@ -1,7 +1,7 @@
 \r
 # Figure out the most of the modules to use.\r
 OPTIMAL_USE = SIMPLE_PRINTF RAMLOG\r
-MOD_USE+=KERNEL MCU COMMON NEWLIB DET ECUM $(filter $(OPTIMAL_USE),$(MOD_AVAIL))\r
+MOD_USE+=KERNEL MCU  DET ECUM $(filter $(OPTIMAL_USE),$(MOD_AVAIL))\r
 $(warning $(MOD_USE)) \r
 #MOD_USE+=KERNEL MCU SIMPLE_PRINTF RAMLOG\r
 \r

diff --git a/system/kernel/testsystem/suite_perf/makefile b/system/kernel/testsystem/suite_perf/makefile
index 1ccef433d2a24f4dfd5b40df2e366794caf1a96d..9920940378aa686c30a5d24b84cb5c10fd6ea59f 100644 (file)
--- a/system/kernel/testsystem/suite_perf/makefile
+++ b/system/kernel/testsystem/suite_perf/makefile
@@ -1,4 +1,5 @@
 \r
+obj-y+= arc.o\r
 # included from rules.mk\r
 \r
 # =======================================================================\r