Merge branch 'i2c'

[u-boot] / post / cpu.c

diff --git a/post/cpu.c b/post/cpu.c
index 6b8fc6e7cdb6cf1156c308498bfd937d135247e8..1f2ded2bf2642db034b0c3bc5b7057588eb80203 100644 (file)
--- a/post/cpu.c
+++ b/post/cpu.c
@@ -78,6 +78,7 @@ int cpu_post_test (int flags)
        int ic = icache_status ();
        int ret = 0;
 
+       WATCHDOG_RESET();
        if (ic)
                icache_disable ();
 
@@ -89,15 +90,16 @@ int cpu_post_test (int flags)
                ret = cpu_post_test_two ();
        if (ret == 0)
                ret = cpu_post_test_twox ();
+       WATCHDOG_RESET();
        if (ret == 0)
                ret = cpu_post_test_three ();
        if (ret == 0)
                ret = cpu_post_test_threex ();
        if (ret == 0)
                ret = cpu_post_test_threei ();
-       WATCHDOG_RESET();
        if (ret == 0)
                ret = cpu_post_test_andi ();
+       WATCHDOG_RESET();
        if (ret == 0)
                ret = cpu_post_test_srawi ();
        if (ret == 0)
@@ -106,25 +108,30 @@ int cpu_post_test (int flags)
                ret = cpu_post_test_rlwinm ();
        if (ret == 0)
                ret = cpu_post_test_rlwimi ();
+       WATCHDOG_RESET();
        if (ret == 0)
                ret = cpu_post_test_store ();
        if (ret == 0)
                ret = cpu_post_test_load ();
-       WATCHDOG_RESET();
        if (ret == 0)
                ret = cpu_post_test_cr ();
        if (ret == 0)
                ret = cpu_post_test_b ();
+       WATCHDOG_RESET();
        if (ret == 0)
                ret = cpu_post_test_multi ();
+       WATCHDOG_RESET();
        if (ret == 0)
                ret = cpu_post_test_string ();
        if (ret == 0)
                ret = cpu_post_test_complex ();
+       WATCHDOG_RESET();
 
        if (ic)
                icache_enable ();
 
+       WATCHDOG_RESET();
+
        return ret;
 }