svn commit: r194609 - head/sys/arm/arm

[Olivier Houchard]

Author: cognet
Date: Sun Jun 21 21:38:12 2009
New Revision: 194609
URL: http://svn.freebsd.org/changeset/base/194609

Log:
  Disable write-back until I figure out what's wrong with it on the i81342.
  There's no need to disable the MMU once we're done inflating the kernel.

Modified:
  head/sys/arm/arm/elf_trampoline.c

Modified: head/sys/arm/arm/elf_trampoline.c
==============================================================================
--- head/sys/arm/arm/elf_trampoline.c	Sun Jun 21 21:04:12 2009	(r194608)
+++ head/sys/arm/arm/elf_trampoline.c	Sun Jun 21 21:38:12 2009	(r194609)
@@ -550,7 +550,7 @@ setup_pagetables(unsigned int pt_addr, v
 	for (addr = physstart; addr < physend; addr += L1_S_SIZE) {
 		pd[addr >> L1_S_SHIFT] = L1_TYPE_S|L1_S_C|L1_S_AP(AP_KRW)|
 		    L1_S_DOM(PMAP_DOMAIN_KERNEL) | addr;
-		if (write_back)
+		if (write_back && 0)
 			pd[addr >> L1_S_SHIFT] |= L1_S_B;
 	}
 	/* XXX: See below */
@@ -610,12 +610,6 @@ __start(void)
 		    (unsigned int)&func_end + 800 , 0);
 		if (altdst > dst)
 			dst = altdst;
-		cpu_idcache_wbinv_all();
-		cpu_l2cache_wbinv_all();
-		__asm __volatile("mrc p15, 0, %0, c1, c0, 0\n"
-		    "bic %0, %0, #1\n" /* MMU_ENABLE */
-		    "mcr p15, 0, %0, c1, c0, 0\n"
-		    : "=r" (pt_addr));
 	} else
 #endif
 		dst = 4 + load_kernel((unsigned int)&kernel_start,