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

[u-boot] / board / cogent / lcd.c

diff --git a/board/cogent/lcd.c b/board/cogent/lcd.c
index c1b4d116ea843b5b2086911d9e712f74a4a72271..05ffc4d1ac385bd7443046f0bd2a52e88a669c47 100644 (file)
--- a/board/cogent/lcd.c
+++ b/board/cogent/lcd.c
@@ -48,7 +48,7 @@
 
 #include <common.h>
 #include <stdarg.h>
-#include <board/cogent/lcd.h>
+#include "lcd.h"
 
 static char lines[2][LCD_LINE_LENGTH+1];
 static int curline;
@@ -197,7 +197,7 @@ void
 lcd_printf(const char *fmt, ...)
 {
     va_list args;
-    char buf[CFG_PBSIZE];
+    char buf[CONFIG_SYS_PBSIZE];
 
     va_start(args, fmt);
     (void)vsprintf(buf, fmt, args);
@@ -229,3 +229,17 @@ lcd_heartbeat(void)
     if (++rotator_index >= (sizeof rotchars / sizeof rotchars[0]))
        rotator_index = 0;
 }
+
+#ifdef CONFIG_SHOW_ACTIVITY
+void board_show_activity (ulong timestamp)
+{
+#ifdef CONFIG_STATUS_LED
+       if ((timestamp % (CONFIG_SYS_HZ / 2)) == 0)
+               lcd_heartbeat ();
+#endif
+}
+
+void show_activity(int arg)
+{
+}
+#endif