From owner-p4-projects@FreeBSD.ORG  Wed Mar 22 22:28:28 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4CC9816A420; Wed, 22 Mar 2006 22:28:28 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 2AA3916A400
	for <perforce@freebsd.org>; Wed, 22 Mar 2006 22:28:28 +0000 (UTC)
	(envelope-from cognet@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id EA53E43D45
	for <perforce@freebsd.org>; Wed, 22 Mar 2006 22:28:27 +0000 (GMT)
	(envelope-from cognet@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2MMSRD7005832
	for <perforce@freebsd.org>; Wed, 22 Mar 2006 22:28:27 GMT
	(envelope-from cognet@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2MMSRBP005829
	for perforce@freebsd.org; Wed, 22 Mar 2006 22:28:27 GMT
	(envelope-from cognet@freebsd.org)
Date: Wed, 22 Mar 2006 22:28:27 GMT
Message-Id: <200603222228.k2MMSRBP005829@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	cognet@freebsd.org using -f
From: Olivier Houchard <cognet@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 93827 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 22 Mar 2006 22:28:28 -0000

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

Change 93827 by cognet@cognet on 2006/03/22 22:28:05

	Now that all goes way, don't add a special case in locore.S to map
	the KB9202 devices.

Affected files ...

.. //depot/projects/arm/src/sys/arm/arm/locore.S#19 edit
.. //depot/projects/arm/src/sys/arm/at91/kb920x_machdep.c#19 edit

Differences ...

==== //depot/projects/arm/src/sys/arm/arm/locore.S#19 (text+ko) ====

@@ -199,8 +199,6 @@
 	MMU_INIT(PHYSADDR, PHYSADDR , 64, L1_TYPE_S|L1_S_C|L1_S_AP(AP_KRW))
 	/* map VA 0xc0000000..0xc3ffffff to PA */
 	MMU_INIT(KERNBASE, PHYSADDR, 64, L1_TYPE_S|L1_S_C|L1_S_AP(AP_KRW))
-	/* Map in the system devices */
-	MMU_INIT(0xfff00000, 0xfff00000, 1, L1_TYPE_S|L1_S_C|L1_S_AP(AP_KRW)) 
 
 	.word 0	/* end of table */
 #endif

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

@@ -203,7 +203,6 @@
 	i = 0;
 
 	set_cpufuncs();
-	cninit();
 
 	fake_preload[i++] = MODINFO_NAME;
 	fake_preload[i++] = strlen("elf kernel") + 1;
@@ -343,6 +342,7 @@
 	setttb(kernel_l1pt.pv_pa);
 	cpu_tlb_flushID();
 	cpu_domains(DOMAIN_CLIENT << (PMAP_DOMAIN_KERNEL*2));
+	cninit();
 
 	/*
 	 * Pages were allocated during the secondary bootstrap for the