From owner-p4-projects@FreeBSD.ORG  Wed Jun 19 23:07:26 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 06BA9973; Wed, 19 Jun 2013 23:07:26 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id BBAD6971
 for <perforce@freebsd.org>; Wed, 19 Jun 2013 23:07:25 +0000 (UTC)
 (envelope-from brooks@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks6.freebsd.org
 [IPv6:2001:1900:2254:2068::682:0])
 by mx1.freebsd.org (Postfix) with ESMTP id AB9311616
 for <perforce@freebsd.org>; Wed, 19 Jun 2013 23:07:25 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r5JN7P2o097191
 for <perforce@freebsd.org>; Wed, 19 Jun 2013 23:07:25 GMT
 (envelope-from brooks@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r5JN7PBf097188
 for perforce@freebsd.org; Wed, 19 Jun 2013 23:07:25 GMT
 (envelope-from brooks@freebsd.org)
Date: Wed, 19 Jun 2013 23:07:25 GMT
Message-Id: <201306192307.r5JN7PBf097188@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 brooks@freebsd.org using -f
From: Brooks Davis <brooks@FreeBSD.org>
Subject: PERFORCE change 229977 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.14
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/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, 19 Jun 2013 23:07:26 -0000

http://p4web.freebsd.org/@@229977?ac=10

Change 229977 by brooks@brooks_zenith on 2013/06/19 23:06:55

	Fold in SMP prep work in 229976.

Affected files ...

.. //depot/projects/ctsrd/cheribsd/src/sys/boot/fdt/dts/beripad-de4.dts#11 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/mips/conf/BERI_TEMPLATE#8 integrate

Differences ...

==== //depot/projects/ctsrd/cheribsd/src/sys/boot/fdt/dts/beripad-de4.dts#11 (text+ko) ====

@@ -51,8 +51,21 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 
+		/*
+		 * Secondary CPUs all start disabled and use the
+		 * spin-table enable method.  cpu-release-addr must be  
+		 * specified for each cpu other than cpu@0.  Values of
+		 * cpu-release-addr grow down from 0x100000 (kernel).
+		 */
+		status = "disabled";
+		enable-method = "spin-table";
+
 		cpu@0 {
+			device-type = "cpu";
 			compatible = "sri-cambridge,beri";
+			
+			reg = <0>;
+			status = "okay";
 		};
 	};
 

==== //depot/projects/ctsrd/cheribsd/src/sys/mips/conf/BERI_TEMPLATE#8 (text+ko) ====

@@ -12,6 +12,7 @@
 machine		mips mips64
 
 cpu		CPU_BERI
+options 	SMP
 
 options 	HZ=200