Working on timer/timebase handling

diff --git a/include/ppcboot.h b/include/ppcboot.h
index 5ca3ee721b057468aa3d96a327d8333493e64faf..3d6f2c61d21534864233e5b3f9d7e94628addfb8 100644 (file)
--- a/include/ppcboot.h
+++ b/include/ppcboot.h
@@ -261,7 +261,6 @@ ulong       get_gclk_freq (void);
 #endif
 
 ulong  get_bus_freq  (ulong);
-void   init_timebase (void);
 
 #if defined(CONFIG_PPC405GP)
 void    get_sys_info  (PPC405_SYS_INFO *);
@@ -301,6 +300,7 @@ void        wait_ticks    (unsigned long);
 void   udelay        (unsigned long);
 ulong  usec2ticks    (unsigned long usec);
 ulong  ticks2usec    (unsigned long ticks);
+void   init_timebase (void);
 
 /* ppc/vsprintf.c */
 ulong  simple_strtoul(const char *cp,char **endp,unsigned int base);

diff --git a/mpc8xx/cpu_init.c b/mpc8xx/cpu_init.c
index 462552dbfbd3c3730e3721b20f7f3209d9b41839..701845202f33c18f50ff2ac3850aedd4129a61b1 100644 (file)
--- a/mpc8xx/cpu_init.c
+++ b/mpc8xx/cpu_init.c
@@ -171,7 +171,9 @@ cpu_init_f (volatile immap_t *immr)
 void
 cpu_init_r  (bd_t *bd)
 {
+#if defined(CFG_RTCSC) || defined(CFG_RCCR) || defined(CFG_RMDS)
     volatile immap_t *immr = (volatile immap_t *)(bd->bi_immr_base);
+#endif
 
 #ifdef CFG_RTCSC
     /* Unlock RTSC register */

diff --git a/mpc8xx/speed.c b/mpc8xx/speed.c
index ddba857a679af94a279b74542efc6888416f52b2..07dfb6d8ac8d456c8b308113e6a341872b593c18 100644 (file)
--- a/mpc8xx/speed.c
+++ b/mpc8xx/speed.c
@@ -133,23 +133,3 @@ ulong get_bus_freq (ulong gclk_freq)
 }
 
 /* ------------------------------------------------------------------------- */
-
-void init_timebase (void)
-{
-#ifdef CONFIG_8xx
-    volatile immap_t *immap  = (immap_t *)CFG_IMMR;
-
-    /* unlock */
-    immap->im_sitk.sitk_tbk  = KAPWR_KEY;
-#endif
-
-    /* reset */
-    asm ("li 3,0 ; mttbu 3 ; mttbl 3 ;");
-
-#ifdef CONFIG_8xx
-    /* enable */
-    immap->im_sit.sit_tbscr |= TBSCR_TBE;
-#endif
-}
-
-/* ------------------------------------------------------------------------- */

diff --git a/ppc/time.c b/ppc/time.c
index dcbe9132f6a1f36ad220ad79de20d4ad97b0e7bb..128fee42308a13bead1c105dfa90fefcbe3d38a3 100644 (file)
--- a/ppc/time.c
+++ b/ppc/time.c
@@ -65,3 +65,25 @@ unsigned long ticks2usec(unsigned long ticks)
        return ((ulong)ticks);
 }
 
+/* ------------------------------------------------------------------------- */
+
+void init_timebase (void)
+{
+#ifdef CONFIG_8xx
+    volatile immap_t *immap  = (immap_t *)CFG_IMMR;
+
+    /* unlock */
+    immap->im_sitk.sitk_tbk  = KAPWR_KEY;
+#endif
+
+    /* reset */
+    asm ("li 3,0 ; mttbu 3 ; mttbl 3 ;");
+
+#ifdef CONFIG_8xx
+    /* enable */
+    immap->im_sit.sit_tbscr |= TBSCR_TBE;
+#endif
+}
+
+/* ------------------------------------------------------------------------- */
+