merge with head

diff --cc boards/mpc551xsim/build_config.mk
index c315086f55d086cb34db503a51583c84cc0f0187,43ff38edc1929e3516e08cc1e865b89dd7e9aad8..fe4963575d56b37e934f637f62ffc5905d82aaa8
--- 1/boards/mpc551xsim/build_config.mk
--- 2/boards/mpc551xsim/build_config.mk
+++ b/boards/mpc551xsim/build_config.mk
@@@ -13,6 -13,9 +13,9 @@@ CFG=PPC BOOKE E200Z1 MPC55XX MPC5516 BR
  # 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 RTE\r
 +MOD_AVAIL+=CANIF CANTP COM DCM DEM DET ECUM IOHWAB KERNEL PDUR WDGM RTE KERNEL_EXTRA\r
  # Additional\r
  MOD_AVAIL+=RAMLOG KERNEL_EXTRA\r
+ \r
+ # Default cross compiler\r
+ DEFAULT_CROSS_COMPILE = /opt/powerpc-eabispe/bin/powerpc-eabispe-\r

diff --cc scripts/rules.mk
Simple merge