PERFORCE change 101171 for review

[Wojciech A. Koszek]

http://perforce.freebsd.org/chv.cgi?CH=101171

Change 101171 by wkoszek at wkoszek_laptop on 2006/07/09 22:03:12

	
	Remove MIPS_SR_SR, as we don't have this one in NetBSD's cpuregs.h.
	I tried to find a replacement, and came up with a
	MIPS_SR_SOFT_RESET. Unfortunately, even on NetBSD it's defined to
	something like:
	
	#define MIPS_SR_SOFT_RESET <othermacro_which_doesn't_exists>

Affected files ...

.. //depot/projects/mips2/src/sys/mips/mips/locore.S#8 edit

Differences ...

==== //depot/projects/mips2/src/sys/mips/mips/locore.S#8 (text+ko) ====

@@ -48,7 +48,16 @@
 	 * 	Soft reset
 	 *	Boot exception vectors (firmware-provided)
 	 */
-	li	t0, MIPS_SR_BEV | MIPS_SR_SR
+/*
+ * XXXMIPS: I get absolute expression required `li' with this below.
+ * Probably because cpuregs.h from NetBSD defines MIPS_SR_SOFT_RESET as
+ * another macro which is not defined.
+ */
+#if 0
+	li	t0, (MIPS_SR_BEV | MIPS_SR_SOFT_RESET)
+#endif
+	li	t0, MIPS_SR_BEV
+
 	/*
 	 * t1: Bits to set explicitly:
 	 *	Kernel mode is 64-bit
@@ -58,7 +67,7 @@
  * XXXMIPS: look at this. I think "Kernel mode is 64-bit" == MIPS_SR_KX, so
  * it's probably worth to remove it soon.
  */
- #if 0
+#if 0
 	li	t1, MIPS_SR_KX | MIPS_SR_COP_1_BIT
 #endif
 	li	t1, MIPS_SR_COP_1_BIT