Merge branch 'master' of git+ssh://10.10.0.7/home/wd/git/u-boot/master

diff --git a/lib_ppc/cache.c b/lib_ppc/cache.c
index 27e1a823c6175eb6fe45feef1e0c3736da23a6e6..5bfb22070727e6d1103398990374d002d42a2e6c 100644 (file)
--- a/lib_ppc/cache.c
+++ b/lib_ppc/cache.c
@@ -23,6 +23,7 @@
 
 #include <common.h>
 #include <asm/cache.h>
+#include <watchdog.h>
 
 void flush_cache (ulong start_addr, ulong size)
 {
@@ -35,6 +36,7 @@ void flush_cache (ulong start_addr, ulong size)
                     addr < end_addr;
                     addr += CFG_CACHELINE_SIZE) {
                        asm ("dcbst 0,%0": :"r" (addr));
+                       WATCHDOG_RESET();
                }
                asm ("sync");   /* Wait for all dcbst to complete on bus */
 
@@ -42,6 +44,7 @@ void flush_cache (ulong start_addr, ulong size)
                     addr < end_addr;
                     addr += CFG_CACHELINE_SIZE) {
                        asm ("icbi 0,%0": :"r" (addr));
+                       WATCHDOG_RESET();
                }
        }
        asm ("sync");           /* Always flush prefetch queue in any case */