rename CFG_ macros to CONFIG_SYS

[platform/kernel/u-boot.git] / lib_ppc / time.c

diff --git a/lib_ppc/time.c b/lib_ppc/time.c
index 2649d5f..173ffab 100644 (file)
--- a/lib_ppc/time.c
+++ b/lib_ppc/time.c
@@ -67,7 +67,7 @@ void udelay(unsigned long usec)
 }
 
 /* ------------------------------------------------------------------------- */
-
+#ifndef CONFIG_NAND_SPL
 unsigned long ticks2usec(unsigned long ticks)
 {
        ulong tbclk = get_tbclk();
@@ -83,13 +83,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;