# HG changeset patch
# User gthomas
# Date 1046884887 0
# Node ID 561295f7b8e7a3bfcf259e8b2fa47715051ca238
# Parent  422f7c9c87d9618eb77d2aebfb117ec01324f7d4
Always reset CPM.

diff --git a/packages/hal/powerpc/mpc8xx/current/ChangeLog b/packages/hal/powerpc/mpc8xx/current/ChangeLog
--- a/packages/hal/powerpc/mpc8xx/current/ChangeLog
+++ b/packages/hal/powerpc/mpc8xx/current/ChangeLog
@@ -1,6 +1,6 @@
 2003-03-05  Gary Thomas  <gary@mlbassoc.com>
 
-	* src/var_misc.c (hal_variant_init): Reset CPM (ROM/monitor only).
+	* src/var_misc.c (hal_variant_init): Reset CPM - always.
 
 2003-03-05  Jonathan Larmour  <jifl@eCosCentric.com>
 
diff --git a/packages/hal/powerpc/mpc8xx/current/src/var_misc.c b/packages/hal/powerpc/mpc8xx/current/src/var_misc.c
--- a/packages/hal/powerpc/mpc8xx/current/src/var_misc.c
+++ b/packages/hal/powerpc/mpc8xx/current/src/var_misc.c
@@ -72,10 +72,12 @@ hal_variant_init(void)
         ictrl |= ICTRL_NOSERSHOW;
         CYGARC_MTSPR (ICTRL, ictrl);
     }
-#ifndef CYGSEM_HAL_USE_ROM_MONITOR
+
+    // Note: it would be nice to only do this in the ROM/monitor.  However,
+    // "new" programs which rely on that happening would break if the monitor
+    // environment does not handle this properly.
     // Reset CPM
     _mpc8xx_reset_cpm();
-#endif
 }
 
 //--------------------------------------------------------------------------