# HG changeset patch
# User gthomas
# Date 1072014077 0
# Node ID 0e3378e69a2ada6cfa57ec774e75d8ce2a33be2b
# Parent  c15fe26f81c7ef8efeb75795ff386b2bde2b2e06
Fix some issues with network debugging by not clearing caches on startup

diff --git a/packages/hal/powerpc/adder/current/ChangeLog b/packages/hal/powerpc/adder/current/ChangeLog
--- a/packages/hal/powerpc/adder/current/ChangeLog
+++ b/packages/hal/powerpc/adder/current/ChangeLog
@@ -1,3 +1,9 @@
+2003-12-21  Gary Thomas  <gary@mlbassoc.com>
+
+	* src/adder.S: Only clear caches on non-RAM startup modes.  This fixes
+	some problems when using network debug connections (messing with the
+	caches seems to confuse the CPM)
+
 2003-12-10  Gary Thomas  <gary@mlbassoc.com>
 
 	* cdl/hal_powerpc_adder.cdl: System clock was using wrong frequency
diff --git a/packages/hal/powerpc/adder/current/src/adder.S b/packages/hal/powerpc/adder/current/src/adder.S
--- a/packages/hal/powerpc/adder/current/src/adder.S
+++ b/packages/hal/powerpc/adder/current/src/adder.S
@@ -95,7 +95,9 @@ FUNC_START( hal_hardware_init )
 	
 	lwi     r4,CYGARC_REG_IMM_BASE  # base address of control registers
 	mtspr	CYGARC_REG_IMMR,r4
-	
+
+#ifndef CYG_HAL_STARTUP_RAM
+                	
 #define CACHE_UNLOCKALL		0x0a00
 #define CACHE_DISABLE		0x0400
 #define CACHE_INVALIDATEALL	0x0c00
@@ -142,6 +144,8 @@ FUNC_START( hal_hardware_init )
 	isync
 	
 	sync
+
+#endif // ! CYG_HAL_STARTUP_RAM        
 	
 	/*
 	 * SIU Initialization.
diff --git a/packages/hal/powerpc/arch/current/ChangeLog b/packages/hal/powerpc/arch/current/ChangeLog
--- a/packages/hal/powerpc/arch/current/ChangeLog
+++ b/packages/hal/powerpc/arch/current/ChangeLog
@@ -137,7 +137,7 @@ 2002-04-24  Jonathan Larmour  <jlarmour@
 
 2002-04-11  Gary Thomas  <gthomas@redhat.com>
 
-	* src/hal_misc.c (hal_enable_caches): Chance cache handling & setup to
+	* src/hal_misc.c (hal_enable_caches): Change cache handling & setup to
 	be controlled by common CDL (like other platforms/architectures).
 
 	* src/hal_intr.c (hal_delay_us): Didn't work if there are less than
diff --git a/packages/hal/powerpc/viper/current/ChangeLog b/packages/hal/powerpc/viper/current/ChangeLog
--- a/packages/hal/powerpc/viper/current/ChangeLog
+++ b/packages/hal/powerpc/viper/current/ChangeLog
@@ -1,3 +1,12 @@
+2003-12-21  Gary Thomas  <gary@mlbassoc.com>
+
+	* src/viper.S: Only clear caches on non-RAM startup.  This is to
+	help solve a problem with network debug connections.  It seems 
+	that messing with the caches during startup confuses the CPM.
+
+	* misc/viper2_862P.ecm: New file, used to describe a Viper with
+	a PPC862P processor (very rare)
+
 2003-12-08  Gary Thomas  <gary@mlbassoc.com>
 
 	* cdl/hal_powerpc_viper.cdl: 
diff --git a/packages/hal/powerpc/viper/current/misc/viper2_862P.ecm b/packages/hal/powerpc/viper/current/misc/viper2_862P.ecm
new file mode 100644
--- /dev/null
+++ b/packages/hal/powerpc/viper/current/misc/viper2_862P.ecm
@@ -0,0 +1,3 @@
+cdl_component CYGHWR_HAL_POWERPC_MPC8XX {
+    user_value 862P
+};
diff --git a/packages/hal/powerpc/viper/current/src/viper.S b/packages/hal/powerpc/viper/current/src/viper.S
--- a/packages/hal/powerpc/viper/current/src/viper.S
+++ b/packages/hal/powerpc/viper/current/src/viper.S
@@ -105,7 +105,9 @@ FUNC_START( hal_hardware_init )
 	mtspr	CYGARC_REG_IMMR,r4
 	
 	LED( 0 )			# turn all LEDs off
-	
+
+#ifndef CYG_HAL_STARTUP_RAM
+                	
 #define CACHE_UNLOCKALL		0x0a00
 #define CACHE_DISABLE		0x0400
 #define CACHE_INVALIDATEALL	0x0c00
@@ -152,7 +154,8 @@ FUNC_START( hal_hardware_init )
 	isync
 	
 	sync
-	
+#endif // ! CYG_HAL_STARTUP_RAM
+        	
 	LED( 0x01 )
 	
 	/*