From owner-p4-projects@FreeBSD.ORG  Mon May 20 22:57:22 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 577561FE; Mon, 20 May 2013 22:57:22 +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 1B3821FC
 for <perforce@freebsd.org>; Mon, 20 May 2013 22:57:22 +0000 (UTC)
 (envelope-from prw35@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:1900:2254:2068::682:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 059DAF8D
 for <perforce@freebsd.org>; Mon, 20 May 2013 22:57:22 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r4KMvL7D008381
 for <perforce@freebsd.org>; Mon, 20 May 2013 22:57:21 GMT
 (envelope-from prw35@FreeBSD.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r4KMvL9u008378
 for perforce@freebsd.org; Mon, 20 May 2013 22:57:21 GMT
 (envelope-from prw35@FreeBSD.org)
Date: Mon, 20 May 2013 22:57:21 GMT
Message-Id: <201305202257.r4KMvL9u008378@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 prw35@FreeBSD.org using -f
From: Philip Withnall <prw35@FreeBSD.org>
Subject: PERFORCE change 228884 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: Mon, 20 May 2013 22:57:22 -0000

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

Change 228884 by prw35@pwithnall_zenith on 2013/05/20 22:57:15

	Add CHERI compositor to BERI DE4 hardware configuration
	
	This follows on from changeset #228881, enabling the CHERI compositor
	driver by default.

Affected files ...

.. //depot/projects/ctsrd/cheribsd/src/sys/boot/fdt/dts/beripad-de4.dts#10 edit
.. //depot/projects/ctsrd/cheribsd/src/sys/mips/conf/BERI_DE4_BASE#6 edit

Differences ...

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

@@ -201,6 +201,13 @@
 			       0x70177000 0x2000>;
 		};
 
+		compositor@7f80d000 {
+			compatible = "sri-cambridge,compositor";
+			reg = <0x7f80d000 0x1000
+			       0x20000000 0x10000000
+			       0x7f006100 0x007f>;
+		};
+
 /*
 		usb@0x7f100000 {
 			compatible = "philips,isp1761";

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

@@ -25,6 +25,7 @@
 device		altera_avgen
 device		altera_jtag_uart
 device		altera_sdcard
+device		cheri_compositor
 device		terasic_de4led
 device		terasic_mtl