Merge with 5eed0471196ddd710647bb8cf83ad6e9aa189c61 (default branch)

diff --cc arch/ppc/mpc55xx/drivers/Can.c
Simple merge

diff --cc arch/ppc/mpc55xx/drivers/Mcu.c
Simple merge

diff --cc boards/board_common.mk
Simple merge

diff --cc include/Mcu.h
index 7f28ad8ab4acdfedb66853cf863110787589c2a4,9681148bd91141a9083ec22813aa820ff6b48cfd..56130efdd1c7ed6794b3eb5a6b3aeff396cc0bf8
--- 1/include/Mcu.h
--- 2/include/Mcu.h
+++ b/include/Mcu.h
@@@ -28,10 -28,11 +28,11 @@@
  #define MCU_SW_PATCH_VERSION  0
  \r
  #include "Cpu.h"\r
 -#include "irq.h"\r
 +#include "irq_types.h"\r
  //#include "mpc55xx_aos.h"\r
  \r
- /* Service ID's */\r
+ /** @name Service id's */
+ //@{
  #define MCU_INIT_SERVICE_ID                 0x00\r
  #define MCU_INITRAMSECTION_SERVICE_ID       0x01\r
  #define MCU_INITCLOCK_SERVICE_ID            0x02\r

diff --cc include/Std_Types.h
index 9278b25cd0f90f29d8ee7676a9a23e25e2033667,c589d0de442003d6a34d1af6c5fa372236a9b419..fe7592cf03321af8470a720730c08514562ea579
--- 1/include/Std_Types.h
--- 2/include/Std_Types.h
+++ b/include/Std_Types.h
@@@ -13,6 -13,12 +13,13 @@@
   * for more details.
   * -------------------------------- Arctic Core ------------------------------*/
  
++
+ /** @addtogroup General General
+  *  @{ */
+ 
+ /** @file Std_Types.h
+  *  Definitions of General types.
+  */
  \r
  #ifndef _STD_TYPES_H\r
  #define _STD_TYPES_H\r