Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx

[u-boot] / lib_ppc / interrupts.c

diff --git a/lib_ppc/interrupts.c b/lib_ppc/interrupts.c
index 1e540a5c3f79a5dfc3ce327c3991a7c8e7891ac8..f6031707aeb1805f7f7ad5e253a5bc910b27e660 100644 (file)
--- a/lib_ppc/interrupts.c
+++ b/lib_ppc/interrupts.c
@@ -32,11 +32,16 @@
 #endif
 
 #ifdef CONFIG_SHOW_ACTIVITY
-       extern void board_show_activity (ulong);
+void board_show_activity (ulong) __attribute__((weak, alias("__board_show_activity")));
+
+void __board_show_activity (ulong dummy)
+{
+       return;
+}
 #endif /* CONFIG_SHOW_ACTIVITY */
 
-#ifndef CFG_WATCHDOG_FREQ
-#define CFG_WATCHDOG_FREQ (CFG_HZ / 2)
+#ifndef CONFIG_SYS_WATCHDOG_FREQ
+#define CONFIG_SYS_WATCHDOG_FREQ (CONFIG_SYS_HZ / 2)
 #endif
 
 extern int interrupt_init_cpu (unsigned *);
@@ -46,11 +51,11 @@ static unsigned decrementer_count; /* count value for 1e6/HZ microseconds */
 
 static __inline__ unsigned long get_msr (void)
 {
-        unsigned long msr;
+       unsigned long msr;
 
-        asm volatile ("mfmsr %0":"=r" (msr):);
+       asm volatile ("mfmsr %0":"=r" (msr):);
 
-        return msr;
+       return msr;
 }
 
 static __inline__ void set_msr (unsigned long msr)
@@ -93,7 +98,7 @@ int interrupt_init (void)
 {
        int ret;
 
-        /* call cpu specific function from $(CPU)/interrupts.c */
+       /* call cpu specific function from $(CPU)/interrupts.c */
        ret = interrupt_init_cpu (&decrementer_count);
 
        if (ret)
@@ -119,12 +124,12 @@ void timer_interrupt (struct pt_regs *regs)
        timestamp++;
 
 #if defined(CONFIG_WATCHDOG) || defined (CONFIG_HW_WATCHDOG)
-       if ((timestamp % (CFG_WATCHDOG_FREQ)) == 0)
+       if ((timestamp % (CONFIG_SYS_WATCHDOG_FREQ)) == 0)
                WATCHDOG_RESET ();
 #endif    /* CONFIG_WATCHDOG || CONFIG_HW_WATCHDOG */
 
 #ifdef CONFIG_STATUS_LED
-        status_led_tick (timestamp);
+       status_led_tick (timestamp);
 #endif /* CONFIG_STATUS_LED */
 
 #ifdef CONFIG_SHOW_ACTIVITY