Fixes for 55xx builds.

diff --git a/arch/ppc/mpc55xx/drivers/Can.c b/arch/ppc/mpc55xx/drivers/Can.c
index f260b2b3c91b8cb3ff587b9e914613e2ed42397a..744c7e3faa0afa3c0473b000cc7a71f68331ec3c 100644 (file)
--- a/arch/ppc/mpc55xx/drivers/Can.c
+++ b/arch/ppc/mpc55xx/drivers/Can.c
@@ -917,8 +917,10 @@ void Can_InitController( uint8 controller, const Can_ControllerConfigType *confi
   canHw->CR.B.LPB =    config->Can_Arc_Loopback;\r
   canHw->CR.B.BOFFREC = 1;  // Disable bus off recovery\r
 \r
+#if defined(CFG_MPC5606S)\r
   SIU.PSMI[0].R = 0x00;\r
   SIU.PSMI[1].R = 0x00;\r
+#endif\r
 \r
 #if defined(CFG_MPC5516) || defined(CFG_MPC5517) || defined(CFG_MPC5606S)\r
   // Check if we use individual masks. If so accept anything(=0) for now\r

diff --git a/arch/ppc/mpc55xx/drivers/sys_tick.c b/arch/ppc/mpc55xx/drivers/sys_tick.c
index 8027488b9ddda39df8bbdf625d3bd2b5123af118..19267186e3a34832f74122d3d96e51b4fa5df0fd 100644 (file)
--- a/arch/ppc/mpc55xx/drivers/sys_tick.c
+++ b/arch/ppc/mpc55xx/drivers/sys_tick.c
@@ -28,7 +28,11 @@ extern OsTickType OsTickFreq;
 void Os_SysTickInit( void ) {\r
        TaskType tid;\r
        tid = Os_Arc_CreateIsr(OsTick, 6 /*prio*/, "OsTick");\r
+#if defined(CFG_MPC5606S)\r
        Irq_AttachIsr2(tid, NULL, RTC_INT);  /* Attach ISR2 to RTC interrupt */\r
+#else\r
+       Irq_AttachIsr2(tid, NULL, 7);  /* Attach ISR2 to INTC_SSCIR0_CLR7  */\r
+#endif\r
 }\r
 \r
 /**\r
@@ -55,6 +59,7 @@ void Os_SysTickStart(uint32_t period_ticks) {
 \r
        RTC.RTCC.B.CNTEN = 1;           // start RTC\r
 #else\r
+               uint32 tmp;\r
 \r
        // Enable the TB\r
        tmp = get_spr(SPR_HID0);\r