commit ea909b7604306a400ee3abf57e2fa7b2dde5dde1
author wdenk <wdenk> Thu Nov 21 23:11:29 2002 +0000
committer wdenk <wdenk> Thu Nov 21 23:11:29 2002 +0000
tree f23f5653250d0440fe81b098037814a401fc9cc9
parent b2184c314de0af9788ce505b413030d2114cfa4a

* Added support for both PCMCIA slots (at the same time!) on MPC8xx

* Patch by Rod Boyce, 21 Nov 2002:
  fix PCMCIA on MBX8xx board

* Patch by Pierre Aubert , 21 Nov 2002
  Add CFG_CPM_POST_WORD_ADDR to make the offset of the
  bootmode word in DPRAM configurable

post/cpu.c

diff --git a/post/cpu.c b/post/cpu.c
index 6b8fc6e..6d09a75 100644
--- a/post/cpu.c
+++ b/post/cpu.c
@@ -78,6 +78,7 @@
 	int ic = icache_status ();
 	int ret = 0;
 
+	WATCHDOG_RESET();
 	if (ic)
 		icache_disable ();
 
@@ -89,15 +90,16 @@
 		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,29 @@
 		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 ();
 	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;
 }