Merged in from mahi-1

diff --cc boards/mpc5516it/build_config.mk
index 7668ba741906dce1c5af825d89017b94a8c4a312,b8622cc54b341158474adc748d6c22cb03cc2934..dbd53a28c604eca79b8f2b067abfe6166f075622
--- 1/boards/mpc5516it/build_config.mk
--- 2/boards/mpc5516it/build_config.mk
+++ b/boards/mpc5516it/build_config.mk
@@@ -9,10 -9,7 +9,13 @@@ CFG=PPC BOOKE E200Z1 MPC55XX MPC5516 BR
  \r
  # What buildable modules does this board have, \r
  # default or private\r
 -MOD_AVAIL+=KERNEL MCU GPT LIN CAN CANIF CANTP PORT DIO WDG WDGM PWM COM ADC DMA DEM DCM PDUR IOHWAB COMM NM CANNM CANSM RTE\r
 +\r
 +# Memory + Peripherals\r
 +MOD_AVAIL+=ADC DIO DMA CAN GPT LIN MCU PORT PWM WDG    \r
 +# 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
+ \r
+ # Needed by us\r
+ MOD_USE=KERNEL MCU\r

diff --cc examples/blinker_node/makefile
index a64521f17844ca794f045dcdaf243e54f0b399ba,7775e8e28476a069b783cab17291dcf734cecef9..6f120530e36d9b36547538f50b182150d14d6782
--- 1/examples/blinker_node/makefile
--- 2/examples/blinker_node/makefile
+++ b/examples/blinker_node/makefile
@@@ -1,42 -1,47 +1,44 @@@
- 
- # Our object files
- obj-y += blinker_main.o
- obj-y += Tasks.o
- obj-y += Hooks.o
- obj-y += Rte.o
- 
- # OS object files.
- obj-y += Os_Cfg.o
- # Board object files
- include $(ROOTDIR)/boards/board_common.mk
- 
- ABSDIR := $(subst $(TOPDIR)/,,$(CURDIR))
- 
- # The more precise configuration, the higher preceedance.
- VPATH := ../config/$(BOARDDIR) ../config $(VPATH)
- inc-y := ../config/$(BOARDDIR) ../config $(inc-y)
- 
- inc-y += $(ROOTDIR)/system/kernel/$(objdir)
- inc-y += $(ROOTDIR)/system/kernel/include
- 
- #TODO: Remove?, Build other way?
- VPATH += $(ROOTDIR)/$(SUBDIR)/Rte
- inc-y += $(ROOTDIR)/$(SUBDIR)/Rte
- VPATH += $(ROOTDIR)/components/blinker
- inc-y += $(ROOTDIR)/components/blinker
- 
- 
- # libs needed by us 
- #libitem-y +=
- 
- #linkfile
- ldcmdfile-y = linkscript_gcc.ldp
- vpath %.ldf $(ROOTDIR)/$(ARCH_PATH-y)/scripts
- 
- # What I want to build
- build-exe-y = blinker_node.elf
- 
- 
- 
- 
- 
+ \r
+ # Our object files\r
+ obj-y += blinker_main.o\r
+ obj-y += Tasks.o\r
+ obj-y += Hooks.o\r
+ obj-y += Rte.o\r
+ \r
+ VPATH += ..\r
+ \r
+ # OS object files.\r
+ obj-y += Os_Cfg.o\r
+ # Board object files\r
+ include $(ROOTDIR)/boards/board_common.mk\r
+ \r
+ ABSDIR := $(subst $(TOPDIR)/,,$(CURDIR))\r
+ \r
+ # The more precise configuration, the higher preceedance.\r
+ VPATH := ../config/$(BOARDDIR) ../config $(VPATH)\r
+ inc-y := ../config/$(BOARDDIR) ../config $(inc-y)\r
+ \r
+ inc-y += $(ROOTDIR)/system/kernel/$(objdir)\r
+ inc-y += $(ROOTDIR)/system/kernel/include\r
+ \r
+ #TODO: Remove?, Build other way?\r
+ VPATH += ../Rte\r
+ inc-y += ../Rte\r
+ VPATH += $(ROOTDIR)/components/blinker\r
+ inc-y += $(ROOTDIR)/components/blinker\r
+ \r
 -$(warning ROOTDIR: $(ROOTDIR))\r
 -$(warning SUBDIR: $(SUBDIR))\r
 -$(warning VPATH: $(VPATH))\r
+ \r
+ # libs needed by us \r
+ #libitem-y +=\r
+ \r
+ #linkfile\r
+ ldcmdfile-y = linkscript_gcc.ldp\r
+ vpath %.ldf $(ROOTDIR)/$(ARCH_PATH-y)/scripts\r
+ \r
+ # What I want to build\r
+ build-exe-y = blinker_node.elf\r
+ \r
+ \r
+ \r
+ \r
+ \r

diff --cc examples/pwm_node/build_config.mk
Simple merge

diff --cc include/Os.h
Simple merge

diff --cc system/EcuM/EcuM.c
Simple merge

diff --cc system/kernel/makefile
Simple merge

diff --cc system/kernel/task.c
Simple merge