Merge with git://www.denx.de/git/u-boot.git

[u-boot] / board / hymod / hymod.c

diff --git a/board/hymod/hymod.c b/board/hymod/hymod.c
index 3611a129771249f6cc55853c29a897888f314592..5e98e9edb7f171a0e0e7ff66181959e1296dbfea 100644 (file)
--- a/board/hymod/hymod.c
+++ b/board/hymod/hymod.c
@@ -30,6 +30,8 @@
 #include <i2c.h>
 #include <asm/iopin_8260.h>
 
+DECLARE_GLOBAL_DATA_PTR;
+
 /* ------------------------------------------------------------------------- */
 
 /* imports from eeprom.c */
@@ -424,8 +426,6 @@ initdram (int board_type)
 int
 last_stage_init (void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        hymod_conf_t *cp = &gd->bd->bi_hymod_conf;
        int rc;
 
@@ -513,3 +513,25 @@ last_stage_init (void)
 
        return (0);
 }
+
+#ifdef CONFIG_SHOW_ACTIVITY
+void board_show_activity (ulong timebase)
+{
+#ifdef CFG_HYMOD_DBLEDS
+       volatile immap_t *immr = (immap_t *) CFG_IMMR;
+       volatile iop8260_t *iop = &immr->im_ioport;
+       static int shift = 0;
+
+       if ((timestamp % CFG_HZ) == 0) {
+               if (++shift > 3)
+                       shift = 0;
+               iop->iop_pdatd =
+                               (iop->iop_pdatd & ~0x0f000000) | (1 << (24 + shift));
+       }
+#endif /* CFG_HYMOD_DBLEDS */
+}
+
+void show_activity(int arg)
+{
+}
+#endif /* CONFIG_SHOW_ACTIVITY */