From: joek <devnull@localhost>
Date: Mon, 23 May 2011 16:52:56 +0000 (+0200)
Subject: Fixes for 55xx builds.
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/arc.git/commitdiff_plain/5e4ea14353a77567a5789a1773c3af776d190b6b

Fixes for 55xx builds.
---

diff --git a/arch/ppc/mpc55xx/drivers/Can.c b/arch/ppc/mpc55xx/drivers/Can.c
index f260b2b3..744c7e3f 100644
--- 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;
   canHw->CR.B.BOFFREC = 1;  // Disable bus off recovery
 
+#if defined(CFG_MPC5606S)
   SIU.PSMI[0].R = 0x00;
   SIU.PSMI[1].R = 0x00;
+#endif
 
 #if defined(CFG_MPC5516) || defined(CFG_MPC5517) || defined(CFG_MPC5606S)
   // Check if we use individual masks. If so accept anything(=0) for now
diff --git a/arch/ppc/mpc55xx/drivers/sys_tick.c b/arch/ppc/mpc55xx/drivers/sys_tick.c
index 8027488b..19267186 100644
--- 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 ) {
 	TaskType tid;
 	tid = Os_Arc_CreateIsr(OsTick, 6 /*prio*/, "OsTick");
+#if defined(CFG_MPC5606S)
 	Irq_AttachIsr2(tid, NULL, RTC_INT);  /* Attach ISR2 to RTC interrupt */
+#else
+	Irq_AttachIsr2(tid, NULL, 7);  /* Attach ISR2 to INTC_SSCIR0_CLR7  */
+#endif
 }
 
 /**
@@ -55,6 +59,7 @@ void Os_SysTickStart(uint32_t period_ticks) {
 
 	RTC.RTCC.B.CNTEN = 1;		// start RTC
 #else
+		uint32 tmp;
 
     	// Enable the TB
     	tmp = get_spr(SPR_HID0);