merge with default

diff --cc boards/ti_tms570ls/examples/rte_simple/config/Calibration_Settings.h
index 4d4afcbd6f34f0bda52190b2fa6bc70f4d3fc33f,e175d0581dd28ad1ea9b5e1fb9ae2a9b0d5fe7cb..c56c723f659d01d2235e9812566e16af497a4b45
--- 1/boards/ti_tms570ls/examples/rte_simple/config/Calibration_Settings.h
--- 2/boards/ti_tms570ls/examples/rte_simple/config/Calibration_Settings.h
+++ b/boards/ti_tms570ls/examples/rte_simple/config/Calibration_Settings.h
@@@ -10,20 -10,20 +10,20 @@@
  * Generator version:       0.0.9\r
  *\r
  * Generated by Arctic Studio (http://arccore.com) \r
 -*           on Thu Jun 16 13:26:20 CEST 2011\r
 +*           on Thu Jun 16 18:30:21 CEST 2011\r
  */\r
  \r
--/* Calibration_Settings.h */
--
--#ifndef CALIBRATION_SETTINGS_H
--#define CALIBRATION_SETTINGS_H
--
--#undef CALIBRATION_INITIALIZED_RAM
--
--#undef CALIBRATION_ENABLED
--
--#undef CALIBRATION_FLS_START
--
--
--
--#endif
++/* Calibration_Settings.h */\r
++\r
++#ifndef CALIBRATION_SETTINGS_H\r
++#define CALIBRATION_SETTINGS_H\r
++\r
++#undef CALIBRATION_INITIALIZED_RAM\r
++\r
++#undef CALIBRATION_ENABLED\r
++\r
++#undef CALIBRATION_FLS_START\r
++\r
++\r
++\r
++#endif\r

diff --cc boards/ti_tms570ls/examples/rte_simple/config/CanIf_Cfg.h
index cbb2c5fd3f479e9644c06565f560cf6c9f6de18e,4573637246013b3db3d80b34596d867a48f319c3..59116601b9e9c02b7b33a455306dabf9408f48c8
--- 1/boards/ti_tms570ls/examples/rte_simple/config/CanIf_Cfg.h
--- 2/boards/ti_tms570ls/examples/rte_simple/config/CanIf_Cfg.h
+++ b/boards/ti_tms570ls/examples/rte_simple/config/CanIf_Cfg.h
@@@ -10,14 -10,14 +10,14 @@@
  * Generator version:       2.0.5\r
  *\r
  * Generated by Arctic Studio (http://arccore.com) \r
 -*           on Thu Jun 16 13:26:19 CEST 2011\r
 +*           on Thu Jun 16 18:30:20 CEST 2011\r
  */\r
  \r
--
--#if !(((CANIF_SW_MAJOR_VERSION == 1) && (CANIF_SW_MINOR_VERSION == 3)) )
--#error CanIf: Configuration file expected BSW module version to be 1.3.*
--#endif
--
++\r
++#if !(((CANIF_SW_MAJOR_VERSION == 1) && (CANIF_SW_MINOR_VERSION == 3)) )\r
++#error CanIf: Configuration file expected BSW module version to be 1.3.*\r
++#endif\r
++\r
  \r
  #ifndef CANIF_CFG_H_\r
  #define CANIF_CFG_H_\r

diff --cc boards/ti_tms570ls/examples/rte_simple/config/CanIf_SpecialPdus.h
index 8d320daedd9fc473888bb92c15c4e1a0cfd1d73d,09df9195528339aba095a9a6bdfacad2acd0f86b..111d036df2f6f9148afc00decc4fb1d66c40e99d
--- 1/boards/ti_tms570ls/examples/rte_simple/config/CanIf_SpecialPdus.h
--- 2/boards/ti_tms570ls/examples/rte_simple/config/CanIf_SpecialPdus.h
+++ b/boards/ti_tms570ls/examples/rte_simple/config/CanIf_SpecialPdus.h
@@@ -10,14 -10,14 +10,14 @@@
  * Generator version:       2.0.5\r
  *\r
  * Generated by Arctic Studio (http://arccore.com) \r
 -*           on Thu Jun 16 13:26:19 CEST 2011\r
 +*           on Thu Jun 16 18:30:20 CEST 2011\r
  */\r
  \r
--
--#if !(((CANIF_SW_MAJOR_VERSION == 1) && (CANIF_SW_MINOR_VERSION == 3)) )
--#error CanIf: Configuration file expected BSW module version to be 1.3.*
--#endif
--
++\r
++#if !(((CANIF_SW_MAJOR_VERSION == 1) && (CANIF_SW_MINOR_VERSION == 3)) )\r
++#error CanIf: Configuration file expected BSW module version to be 1.3.*\r
++#endif\r
++\r
  \r
  #ifndef CANIF_SPECIALPDUS_H_\r
  #define CANIF_SPECIALPDUS_H_\r

diff --cc boards/ti_tms570ls/examples/rte_simple/config/Can_Cfg.h
index a7f849a44c7a49967b70bf6957918820f2e61857,69d475db478a9abc8568e25d5abbd1a5d78f003e..024ad89017a231a61588814ad783fd354afc71e4
--- 1/boards/ti_tms570ls/examples/rte_simple/config/Can_Cfg.h
--- 2/boards/ti_tms570ls/examples/rte_simple/config/Can_Cfg.h
+++ b/boards/ti_tms570ls/examples/rte_simple/config/Can_Cfg.h
@@@ -10,14 -10,14 +10,14 @@@
  * Generator version:       2.0.1\r
  *\r
  * Generated by Arctic Studio (http://arccore.com) \r
 -*           on Thu Jun 16 13:26:19 CEST 2011\r
 +*           on Thu Jun 16 18:30:20 CEST 2011\r
  */\r
  \r
--
--#if !(((CAN_SW_MAJOR_VERSION == 1) && (CAN_SW_MINOR_VERSION == 0)) )
--#error Can: Configuration file expected BSW module version to be 1.0.*
--#endif
--
++\r
++#if !(((CAN_SW_MAJOR_VERSION == 1) && (CAN_SW_MINOR_VERSION == 0)) )\r
++#error Can: Configuration file expected BSW module version to be 1.0.*\r
++#endif\r
++\r
        \r
  \r
  #ifndef CAN_CFG_H_\r

diff --cc boards/ti_tms570ls/examples/rte_simple/config/Com_Cfg.h
index c431f3ff244d0e422844ce66bc7632f3b58244c6,20b18fb89277dc7d1bfcb5387bbffc0222208070..842dd5f9dd311b032b579b3dba68b7578c2acbed
--- 1/boards/ti_tms570ls/examples/rte_simple/config/Com_Cfg.h
--- 2/boards/ti_tms570ls/examples/rte_simple/config/Com_Cfg.h
+++ b/boards/ti_tms570ls/examples/rte_simple/config/Com_Cfg.h
@@@ -10,14 -10,14 +10,14 @@@
  * Generator version:       2.0.5\r
  *\r
  * Generated by Arctic Studio (http://arccore.com) \r
 -*           on Thu Jun 16 13:26:20 CEST 2011\r
 +*           on Thu Jun 16 18:30:20 CEST 2011\r
  */\r
  \r
--
- #if !(((COM_SW_MAJOR_VERSION == 1) && (COM_SW_MINOR_VERSION == 2)) )
- #error Com: Configuration file expected BSW module version to be 1.2.*
 -#if !(((COM_SW_MAJOR_VERSION == 1) && (COM_SW_MINOR_VERSION == 1)) )
 -#error Com: Configuration file expected BSW module version to be 1.1.*
--#endif
--
++\r
++#if !(((COM_SW_MAJOR_VERSION == 1) && (COM_SW_MINOR_VERSION == 2)) )\r
++#error Com: Configuration file expected BSW module version to be 1.2.*\r
++#endif\r
++\r
  \r
  #ifndef COM_CFG_H\r
  #define COM_CFG_H\r

diff --cc boards/ti_tms570ls/examples/rte_simple/config/Com_PbCfg.h
index a7941cd4a06b7b3e92477af14047063f3d675b51,2f347ed237b7e4dba7d6f90261e3626ec4bec51f..797cc7bd80c9b054d6c610039ec2eae9c8c9ef82
--- 1/boards/ti_tms570ls/examples/rte_simple/config/Com_PbCfg.h
--- 2/boards/ti_tms570ls/examples/rte_simple/config/Com_PbCfg.h
+++ b/boards/ti_tms570ls/examples/rte_simple/config/Com_PbCfg.h
@@@ -10,14 -10,14 +10,14 @@@
  * Generator version:       2.0.5\r
  *\r
  * Generated by Arctic Studio (http://arccore.com) \r
 -*           on Thu Jun 16 13:26:19 CEST 2011\r
 +*           on Thu Jun 16 18:30:20 CEST 2011\r
  */\r
  \r
--
- #if !(((COM_SW_MAJOR_VERSION == 1) && (COM_SW_MINOR_VERSION == 2)) )
- #error Com: Configuration file expected BSW module version to be 1.2.*
 -#if !(((COM_SW_MAJOR_VERSION == 1) && (COM_SW_MINOR_VERSION == 1)) )
 -#error Com: Configuration file expected BSW module version to be 1.1.*
--#endif
--
++\r
++#if !(((COM_SW_MAJOR_VERSION == 1) && (COM_SW_MINOR_VERSION == 2)) )\r
++#error Com: Configuration file expected BSW module version to be 1.2.*\r
++#endif\r
++\r
  #ifndef COM_PBCFG_H\r
  #define COM_PBCFG_H\r
  \r

diff --cc boards/ti_tms570ls/examples/rte_simple/config/Det_Cfg.h
index 1ab7eeb7cde29e65534b46cf0df87674c3629b55,dae26deaac8dcfaa44489847e40f9445e9810d5f..576fd69125694209b6a09fefb90986a9b3f3559a
--- 1/boards/ti_tms570ls/examples/rte_simple/config/Det_Cfg.h
--- 2/boards/ti_tms570ls/examples/rte_simple/config/Det_Cfg.h
+++ b/boards/ti_tms570ls/examples/rte_simple/config/Det_Cfg.h
@@@ -10,14 -10,14 +10,14 @@@
  * Generator version:       2.0.1\r
  *\r
  * Generated by Arctic Studio (http://arccore.com) \r
 -*           on Thu Jun 16 13:26:20 CEST 2011\r
 +*           on Thu Jun 16 18:30:20 CEST 2011\r
  */\r
  \r
--
--#if !(((DET_SW_MAJOR_VERSION == 1) && (DET_SW_MINOR_VERSION == 0)) )
--#error Det: Configuration file expected BSW module version to be 1.0.*
--#endif
--
++\r
++#if !(((DET_SW_MAJOR_VERSION == 1) && (DET_SW_MINOR_VERSION == 0)) )\r
++#error Det: Configuration file expected BSW module version to be 1.0.*\r
++#endif\r
++\r
  /*\r
   * Development Error Tracer driver\r
   *\r

diff --cc boards/ti_tms570ls/examples/rte_simple/config/EcuM_Cfg.h
index 86869830c8bcb80905877fa6aa9ec102717a3fbf,2a501ec3e5917570d83ae7fbeb162c2d0e9678c6..eeaf50086c4ea5f3a0b2a916c2c5fa890aa08298
--- 1/boards/ti_tms570ls/examples/rte_simple/config/EcuM_Cfg.h
--- 2/boards/ti_tms570ls/examples/rte_simple/config/EcuM_Cfg.h
+++ b/boards/ti_tms570ls/examples/rte_simple/config/EcuM_Cfg.h
@@@ -10,14 -10,14 +10,14 @@@
  * Generator version:       2.0.2\r
  *\r
  * Generated by Arctic Studio (http://arccore.com) \r
 -*           on Thu Jun 16 13:26:20 CEST 2011\r
 +*           on Thu Jun 16 18:30:20 CEST 2011\r
  */\r
  \r
--
--#if !(((ECUM_SW_MAJOR_VERSION == 2) && (ECUM_SW_MINOR_VERSION == 0)) )
--#error EcuM: Configuration file expected BSW module version to be 2.0.*
--#endif
--
++\r
++#if !(((ECUM_SW_MAJOR_VERSION == 2) && (ECUM_SW_MINOR_VERSION == 0)) )\r
++#error EcuM: Configuration file expected BSW module version to be 2.0.*\r
++#endif\r
++\r
  \r
  \r
  #ifndef ECUM_CFG_H_\r

diff --cc boards/ti_tms570ls/examples/rte_simple/config/Mcu_Cfg.h
index 312bc469536fc586671bf2b9482875b38fa37faf,40cb43811887155e2fc80ddaa5bcdfed93e986d3..204722be487d6f76d773a8155d22bd52168f3a4b
--- 1/boards/ti_tms570ls/examples/rte_simple/config/Mcu_Cfg.h
--- 2/boards/ti_tms570ls/examples/rte_simple/config/Mcu_Cfg.h
+++ b/boards/ti_tms570ls/examples/rte_simple/config/Mcu_Cfg.h
@@@ -10,14 -10,14 +10,14 @@@
  * Generator version:       2.0.2\r
  *\r
  * Generated by Arctic Studio (http://arccore.com) \r
 -*           on Thu Jun 16 13:26:20 CEST 2011\r
 +*           on Thu Jun 16 18:30:20 CEST 2011\r
  */\r
  \r
--
--#if !(((MCU_SW_MAJOR_VERSION == 2) && (MCU_SW_MINOR_VERSION == 0)) )
--#error Mcu: Configuration file expected BSW module version to be 2.0.*
--#endif
--
++\r
++#if !(((MCU_SW_MAJOR_VERSION == 2) && (MCU_SW_MINOR_VERSION == 0)) )\r
++#error Mcu: Configuration file expected BSW module version to be 2.0.*\r
++#endif\r
++\r
  \r
  #ifndef MCU_CFG_H_\r
  #define MCU_CFG_H_\r

diff --cc boards/ti_tms570ls/examples/rte_simple/config/Os_Cfg.h
index 5811b6b7c083c2e01f668b77e308624f691e0db7,ffa8a568dbdaaee3463f6b123d60a6fac10cb853..6f3909f92204fd5970bb807b1b58758c3b977595
--- 1/boards/ti_tms570ls/examples/rte_simple/config/Os_Cfg.h
--- 2/boards/ti_tms570ls/examples/rte_simple/config/Os_Cfg.h
+++ b/boards/ti_tms570ls/examples/rte_simple/config/Os_Cfg.h
@@@ -10,14 -10,14 +10,14 @@@
  * Generator version:       2.0.34\r
  *\r
  * Generated by Arctic Studio (http://arccore.com) \r
 -*           on Thu Jun 16 13:26:20 CEST 2011\r
 +*           on Thu Jun 16 18:30:20 CEST 2011\r
  */\r
  \r
--
--#if !(((OS_SW_MAJOR_VERSION == 2) && (OS_SW_MINOR_VERSION == 0)) )
--#error Os: Configuration file expected BSW module version to be 2.0.*
--#endif
--
++\r
++#if !(((OS_SW_MAJOR_VERSION == 2) && (OS_SW_MINOR_VERSION == 0)) )\r
++#error Os: Configuration file expected BSW module version to be 2.0.*\r
++#endif\r
++\r
  \r
  \r
  #ifndef OS_CFG_H_\r

diff --cc boards/ti_tms570ls/examples/rte_simple/config/PduR_Cfg.h
index b3e0b620bf34cef74b5b6ce683766f5b765475a0,5735cefb02160ac592c5f2ba1184df9ddc6c22cb..58b74d3b87b327c7dc0c462b5a712e5ed02ae8bb
--- 1/boards/ti_tms570ls/examples/rte_simple/config/PduR_Cfg.h
--- 2/boards/ti_tms570ls/examples/rte_simple/config/PduR_Cfg.h
+++ b/boards/ti_tms570ls/examples/rte_simple/config/PduR_Cfg.h
@@@ -10,14 -10,14 +10,14 @@@
  * Generator version:       3.0.8\r
  *\r
  * Generated by Arctic Studio (http://arccore.com) \r
 -*           on Thu Jun 16 13:26:20 CEST 2011\r
 +*           on Thu Jun 16 18:30:20 CEST 2011\r
  */\r
  \r
--
--#if !(((PDUR_SW_MAJOR_VERSION == 2) && (PDUR_SW_MINOR_VERSION == 0)) )
--#error PduR: Configuration file expected BSW module version to be 2.0.*
--#endif
--
++\r
++#if !(((PDUR_SW_MAJOR_VERSION == 2) && (PDUR_SW_MINOR_VERSION == 0)) )\r
++#error PduR: Configuration file expected BSW module version to be 2.0.*\r
++#endif\r
++\r
  \r
  \r
  #ifndef PDUR_CFG_H_\r

diff --cc boards/ti_tms570ls/examples/rte_simple/config/PduR_PbCfg.h
index 4204e19deb69abef166479d174179ab2970a2b93,8a3f8e35c14772714b4442c8b47bdd9864cdc5c4..03493adc94d8f8aa0b93fce457fb891ff52c82d4
--- 1/boards/ti_tms570ls/examples/rte_simple/config/PduR_PbCfg.h
--- 2/boards/ti_tms570ls/examples/rte_simple/config/PduR_PbCfg.h
+++ b/boards/ti_tms570ls/examples/rte_simple/config/PduR_PbCfg.h
@@@ -10,14 -10,14 +10,14 @@@
  * Generator version:       3.0.8\r
  *\r
  * Generated by Arctic Studio (http://arccore.com) \r
 -*           on Thu Jun 16 13:26:20 CEST 2011\r
 +*           on Thu Jun 16 18:30:20 CEST 2011\r
  */\r
  \r
--
--#if !(((PDUR_SW_MAJOR_VERSION == 2) && (PDUR_SW_MINOR_VERSION == 0)) )
--#error PduR: Configuration file expected BSW module version to be 2.0.*
--#endif
--
++\r
++#if !(((PDUR_SW_MAJOR_VERSION == 2) && (PDUR_SW_MINOR_VERSION == 0)) )\r
++#error PduR: Configuration file expected BSW module version to be 2.0.*\r
++#endif\r
++\r
  \r
  #if defined(USE_DCM)\r
  #include "Dcm.h"\r

diff --cc boards/ti_tms570ls/examples/rte_simple/config/Port_Cfg.h
index 523e1f8a1fa283b048cb188791fa2e696d50ec00,e52e4dc577f0a28a6deae02a6d247044baf7ab0a..de7c5e7f607aeaa4d516b5c58c6ab110805a5f57
--- 1/boards/ti_tms570ls/examples/rte_simple/config/Port_Cfg.h
--- 2/boards/ti_tms570ls/examples/rte_simple/config/Port_Cfg.h
+++ b/boards/ti_tms570ls/examples/rte_simple/config/Port_Cfg.h
@@@ -10,14 -10,14 +10,14 @@@
  * Generator version:       2.0.2\r
  *\r
  * Generated by Arctic Studio (http://arccore.com) \r
 -*           on Thu Jun 16 13:26:20 CEST 2011\r
 +*           on Thu Jun 16 18:30:20 CEST 2011\r
  */\r
  \r
--
--#if !(((PORT_SW_MAJOR_VERSION == 1) && (PORT_SW_MINOR_VERSION == 0)) )
--#error Port: Configuration file expected BSW module version to be 1.0.*
--#endif
--
++\r
++#if !(((PORT_SW_MAJOR_VERSION == 1) && (PORT_SW_MINOR_VERSION == 0)) )\r
++#error Port: Configuration file expected BSW module version to be 1.0.*\r
++#endif\r
++\r
  \r
  #ifndef PORT_CFG_H_\r
  #define PORT_CFG_H_\r