[LV-k25-commit] kernel-2.5/arch/vax/kernel cpu_vxt.c,1.14,1.15

[Jan-Benedict G. <jb...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27872

Modified Files:
	cpu_vxt.c 
Log Message:
- Clean-up cpu_vxt.c a bit.
- My machine now boots like this:
---------------------------------------------------------------------
CPU type: VXT2000 SID: 0x14000006 SIDEX: 0x08050002
Boot Head.S loaded at address 0x0000F400
rpb/bootr5/ap/sp  0x00000000 0x00000100 0x00009918 0x0000F200
relocated at phys address 0x00100283

Starting VM
Hello you!IO mapped phys addr 0x200a0000, 0x0001 pages at virt 0x80de100)
Early console enabled
Linux/VAX (lin...@mi...)
RPB info: .l_pfncnt=0x00006f05, .l_vmb_version=0x0a00020c, .l_badpgs=0x00
Physical memory: 0x00006f05 HW pagelets, 0x00000de0 pages (14210KB)
CPU type: VXT2000, SID: 0x14000006, SIDEX: 0x08050002
VM: mapped physical from 0x80000000 to 0x80de0a00, iomap from 80de1000
VM: vmalloc from 0x81de1000 to 0x821e1000
VM: ptemap from 0x821e2000 to 0x844e2000 for 64 processes
calling start_kernel...

Linux version 2.6.8.1 (jbglaw@d2) (gcc version 2.95.2 19991024 (release)4
kernel_cmd_line 8000f404
root=/dev/nfs ip=bootp rw debug
VAXMM: Initialising mm layer for 64 tasks of size 64MB
VAXMM: system page table base 802e9e00, length (bytes)    89c40 length (0
bootmap size = 000001bc
calling free_bootmem(start=00001000, len=000ff000)
calling free_bootmem(start=00374000, len=00a6c000)
Built 1 zonelists
Kernel command line: root=/dev/nfs ip=bootp rw debug
PID hash table entries: 64 (order 6: 512 bytes)
---------------------------------------------------------------------
  ...and here it hangs.


Index: cpu_vxt.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/arch/vax/kernel/cpu_vxt.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- cpu_vxt.c	2 Oct 2004 00:03:14 -0000	1.14
+++ cpu_vxt.c	2 Oct 2004 18:37:31 -0000	1.15
@@ -21,19 +21,11 @@
 
 static void vxt_pre_vm_init(void)
 {
-	mv_vxt.sidex = *(unsigned int *)SOC_SIDEX_ADDR;
 }
 
 static void vxt_post_vm_init(void)
 {
-#if 0
-#ifdef CONFIG_DZ
-	init_dz11_console(0x200A0000, 3);
-	dz_serial_console_init();
-#endif
-#endif
 	init_vxt2694_console (0x200a0000);
-	//register_console (&vax_console);
 }
 
 static const char *vxt_cpu_type_str(void)
@@ -46,15 +38,12 @@
 	.post_vm_init = vxt_post_vm_init,
 	.pre_vm_putchar = ka4x_prom_putchar,
 	.pre_vm_getchar = ka4x_prom_getchar,
-	//.post_vm_putchar = dz11_putchar,
 	.post_vm_putchar = vxt2694_putchar,
-	//.post_vm_getchar = dz11_getchar,
 	.post_vm_getchar = vxt2694_putchar,
 	.cpu_type_str = vxt_cpu_type_str,
 	.clock_init = generic_clock_init,
 };
 
-#ifdef USE_NEW_VECTORS
 static struct machvec_match __CPU_MATCH mvm_vxt = {
         .mv = &mv_vxt,
         .sid_mask = VAX_SID_FAMILY_MASK,
@@ -65,5 +54,4 @@
         .sidex_mask = SOC_SIDEX_TYPE_MASK,
         .sidex_match = SOC_SIDEX_TYPE_VXT << SOC_SIDEX_TYPE_SHIFT
 };
-#endif /* USE_NEW_VECTORS */