X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=lib_ppc%2Ftime.c;h=29099612db4f4d46d243eed2546a98d997c6597f;hb=45e565337a90bbca0c1bb712b5e008b7c0b18bd5;hp=3b3c50e4527ef7409614616f406e55be7456f58e;hpb=0db5bca8076998a7516102988ac976a2da28d531;p=u-boot

diff --git a/lib_ppc/time.c b/lib_ppc/time.c
index 3b3c50e452..29099612db 100644
--- a/lib_ppc/time.c
+++ b/lib_ppc/time.c
@@ -23,7 +23,6 @@
 
 #include <common.h>
 
-
 /* ------------------------------------------------------------------------- */
 
 /*
@@ -51,15 +50,14 @@ unsigned long usec2ticks(unsigned long usec)
  * microseconds to wait) into a number of time base ticks; then we
  * watch the time base until it has incremented by that amount.
  */
-void udelay(unsigned long usec)
+void __udelay(unsigned long usec)
 {
 	ulong ticks = usec2ticks (usec);
-
 	wait_ticks (ticks);
 }
 
 /* ------------------------------------------------------------------------- */
-
+#ifndef CONFIG_NAND_SPL
 unsigned long ticks2usec(unsigned long ticks)
 {
 	ulong tbclk = get_tbclk();
@@ -75,13 +73,13 @@ unsigned long ticks2usec(unsigned long ticks)
 
 	return ((ulong)ticks);
 }
-
+#endif
 /* ------------------------------------------------------------------------- */
 
 int init_timebase (void)
 {
 #if defined(CONFIG_5xx) || defined(CONFIG_8xx)
-	volatile immap_t *immap = (immap_t *) CFG_IMMR;
+	volatile immap_t *immap = (immap_t *) CONFIG_SYS_IMMR;
 
 	/* unlock */
 	immap->im_sitk.sitk_tbk = KAPWR_KEY;
@@ -97,4 +95,3 @@ int init_timebase (void)
 	return (0);
 }
 /* ------------------------------------------------------------------------- */
-