Merge with 6c0406457e55f82d7a30afd3b7cec1c458993ef4

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

diff --cc arch/ppc/mpc55xx/scripts/linkscript_gcc.ldf
index 945bbbcc46eb7bd8353febd8b63936824f3776f1,f8f9010088a4fa55f8a14e4176a755be71965399..146e6443623f39474eea496f10557ebb7b0fc8ce
--- 1/arch/ppc/mpc55xx/scripts/linkscript_gcc.ldf
--- 2/arch/ppc/mpc55xx/scripts/linkscript_gcc.ldf
+++ b/arch/ppc/mpc55xx/scripts/linkscript_gcc.ldf
@@@ -134,17 -141,7 +141,16 @@@ __FLS_PROG_START__ = 0;  /* Must be alig
        .sbss2 : {\r
                *(.sbss2 .sbss2.* .gnu.linkonce.sb2.*);\r
                __TEXT_END = .;\r
-               . = . + ALIGN(8);\r
        } > flash\r
 +\r
 +#if defined(CFG_MPC5516)\r
 +      .McuE_LowPowerRecoverFlash 0x000ff000: {\r
 +          *(.lowpower_text);\r
 +      }\r
 +      .lowpower_vector 0x000ffffc: {\r
 +          *(.lowpower_vector);\r
 +      }\r
 +#endif        \r
        \r
  \r
        .data : {\r

diff --cc boards/board_common.mk
Simple merge