PERFORCE change 88021 for review

[Warner Losh]

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

Change 88021 by imp at imp_plunger on 2005/12/11 06:03:45

	Remove debug.
	Also, remove the VA == PA hack.  I think I've found the problem.

Affected files ...

.. //depot/projects/arm/src/sys/arm/at91/kb920x_machdep.c#11 edit

Differences ...

==== //depot/projects/arm/src/sys/arm/at91/kb920x_machdep.c#11 (text+ko) ====

@@ -185,23 +185,11 @@
 	uint32_t fake_preload[35];
 	uint32_t memsize = 32 * 1024 * 1024;
 
-	int pc;
-#if 0
-	volatile uint32_t *ptr = (uint32_t *)(0xfffff830);	/* PIOC_SODR */
-        *ptr = AT91RM92_PIO_PC18;
-        *ptr = AT91RM92_PIO_PC19;
-        *ptr = AT91RM92_PIO_PC20;
-	ptr = (uint32_t *)(0xfffff834);	/* PIOC_CODR */
-#endif
-
 	i = 0;
 
 	set_cpufuncs();
 	cninit();
-	printf("CNINIT DONE\n");
 
-	__asm __volatile("mov %0, pc" : "=r" (pc));
-	printf("pc is %x\n", pc);
 	fake_preload[i++] = MODINFO_NAME;
 	fake_preload[i++] = strlen("elf kernel") + 1;
 	strcpy((char*)&fake_preload[i++], "elf kernel");
@@ -227,7 +215,6 @@
 #define KERNEL_TEXT_BASE (KERNBASE)
 	freemempos = ((vm_offset_t)&end + PAGE_MASK) & ~PAGE_MASK;
 	/* Define a macro to simplify memory allocation */
-	printf("freemempos %x\n", freemempos);
 #define valloc_pages(var, np)                   \
 	alloc_pages((var).pv_va, (np));         \
 	(var).pv_pa = (var).pv_va + (KERNPHYSADDR - KERNVIRTADDR);
@@ -284,7 +271,7 @@
 	pmap_map_chunk(l1pagetable, KERNBASE, KERNPHYSADDR,
 	   (((uint32_t)(&end) - KERNBASE) + PAGE_SIZE) & ~(PAGE_SIZE - 1),
 	    VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE);
-#if 1
+#if 0
 	/* XXX PA == VA XXX */
 	pmap_map_chunk(l1pagetable, KERNPHYSADDR, KERNPHYSADDR,
 	  (((uint32_t)(&end) - KERNBASE) + L1_S_SIZE) & ~(L1_S_SIZE - 1),
@@ -325,7 +312,6 @@
 		    VM_PROT_READ|VM_PROT_WRITE, PTE_PAGETABLE);
 	}
 
-	printf("pa is %x va is %x\n", kernel_l1pt.pv_pa, kernel_l1pt.pv_va);
 	pmap_devmap_bootstrap(l1pagetable, kb920x_devmap);
 	cpu_domains((DOMAIN_CLIENT << (PMAP_DOMAIN_KERNEL*2)) | DOMAIN_CLIENT);
 	setttb(kernel_l1pt.pv_pa);