[Linux-mips-commits]CVS: linux/arch/mips/vr4181/osprey prom.c,1.1,1.2 reset.c,1.1,1.2

[Jun S. <ju...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/vr4181/osprey
In directory usw-pr-cvs1:/tmp/cvs-serv5895/arch/mips/vr4181/osprey

Modified Files:
	prom.c reset.c 
Log Message:
Osprey kernel more or less works now, but very unstable.  See TODO file.


Index: prom.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/vr4181/osprey/prom.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- prom.c	2001/09/22 04:27:15	1.1
+++ prom.c	2001/09/22 16:35:15	1.2
@@ -31,9 +31,10 @@
  */
 void __init prom_init()
 {
-        strcpy(arcs_cmdline, "ether=0,0x03fe0300,eth0 "
+	strcpy(arcs_cmdline, "ip=bootp ");
+        strcat(arcs_cmdline, "ether=0,0x03fe0300,eth0 ");
         // strcpy(arcs_cmdline, "ether=0,0x0300,eth0 "
-                             "video=vr4181fb:xres:240,yres:320,bpp:8");
+	// strcat(arcs_cmdline, "video=vr4181fb:xres:240,yres:320,bpp:8 ");
 
         mips_machgroup = MACH_GROUP_NEC_VR41XX;
         mips_machtype = MACH_NEC_OSPREY;

Index: reset.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/vr4181/osprey/reset.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- reset.c	2001/09/22 04:27:15	1.1
+++ reset.c	2001/09/22 16:35:15	1.2
@@ -18,8 +18,8 @@
 
 void nec_osprey_restart(char *command)
 {
-	set_cp0_status((ST0_BEV | ST0_ERL), (ST0_BEV | ST0_ERL));
-	set_cp0_config(CONF_CM_CMASK, CONF_CM_UNCACHED);
+	change_cp0_status((ST0_BEV | ST0_ERL), (ST0_BEV | ST0_ERL));
+	change_cp0_config(CONF_CM_CMASK, CONF_CM_UNCACHED);
 	flush_cache_all();
 	write_32bit_cp0_register(CP0_WIRED, 0);
 	__asm__ __volatile__("jr\t%0"::"r"(0xbfc00000));