From owner-p4-projects@FreeBSD.ORG  Wed Jul 17 21:52:24 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 829694FB; Wed, 17 Jul 2013 21:52:24 +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 443544F9
 for <perforce@freebsd.org>; Wed, 17 Jul 2013 21:52:24 +0000 (UTC)
 (envelope-from brooks@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74])
 by mx1.freebsd.org (Postfix) with ESMTP id 35E61DBD
 for <perforce@freebsd.org>; Wed, 17 Jul 2013 21:52:24 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r6HLqOqU000764
 for <perforce@freebsd.org>; Wed, 17 Jul 2013 21:52:24 GMT
 (envelope-from brooks@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r6HLqOsw000761
 for perforce@freebsd.org; Wed, 17 Jul 2013 21:52:24 GMT
 (envelope-from brooks@freebsd.org)
Date: Wed, 17 Jul 2013 21:52:24 GMT
Message-Id: <201307172152.r6HLqOsw000761@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 231234 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, 17 Jul 2013 21:52:24 -0000

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

Change 231234 by brooks@brooks_zenith on 2013/07/17 21:52:06

	Integrate commenting out of second CPUs from FreeBSD/BERI 

Affected files ...

.. //depot/projects/ctsrd/cheribsd/src/sys/boot/fdt/dts/beri-sim.dts#4 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/boot/fdt/dts/beripad-de4.dts#13 integrate

Differences ...

==== //depot/projects/ctsrd/cheribsd/src/sys/boot/fdt/dts/beri-sim.dts#4 (text+ko) ====

@@ -67,6 +67,7 @@
 			status = "okay";
 		};
 
+/*
 		cpu@1 {
 			device-type = "cpu";
 			compatible = "sri-cambridge,beri";
@@ -75,6 +76,7 @@
 			// XXX: should we need cached prefix?
 			cpu-release-addr = <0xffffffff 0x800fffe0>;
 		};
+*/
 	};
 
 	soc {

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

@@ -68,6 +68,7 @@
 			status = "okay";
 		};
 
+/*
 		cpu@1 {
 			device-type = "cpu";
 			compatible = "sri-cambridge,beri";
@@ -76,6 +77,7 @@
 			// XXX: should we need cached prefix?
 			cpu-release-addr = <0xffffffff 0x800fffe0>;
 		}
+*/
 	};
 
 	soc {