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

* 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

2 files changed, 17 insertions, 8 deletions

diff --git a/post/cpu.c b/post/cpu.c
index 6b8fc6e7cdb..6d09a75ebc5 100644
--- 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,29 @@ 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 ();
 	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;
 }
 
diff --git a/post/post.c b/post/post.c
index d1b8d1ae28b..f87636cb44c 100644
--- a/post/post.c
+++ b/post/post.c
@@ -193,18 +193,21 @@ int post_run (char *name, int flags)
 				(flags & test_flags[last] & POST_ALWAYS) &&
 				(flags & test_flags[last] & POST_MEM)) {
 
-				post_run_single (post_list + last, test_flags[last],
-								 flags | POST_REBOOT, last);
+				post_run_single (post_list + last,
+						 test_flags[last],
+						 flags | POST_REBOOT, last);
 
 				for (i = last + 1; i < post_list_size; i++) {
-					post_run_single (post_list + i, test_flags[i],
-									 flags, i);
+					post_run_single (post_list + i,
+							 test_flags[i],
+							 flags, i);
 				}
 			}
 		} else {
 			for (i = 0; i < post_list_size; i++) {
-				post_run_single (post_list + i, test_flags[i], flags,
-								 i);
+				post_run_single (post_list + i,
+						 test_flags[i],
+						 flags, i);
 			}
 		}