From owner-p4-projects@FreeBSD.ORG  Sun Mar  3 21:12:56 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id ADDA47D6; Sun,  3 Mar 2013 21:12:56 +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 7110E7D4
 for <perforce@freebsd.org>; Sun,  3 Mar 2013 21:12:56 +0000 (UTC)
 (envelope-from brooks@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 38A8E9E5
 for <perforce@freebsd.org>; Sun,  3 Mar 2013 21:12:56 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r23LCuYI026324
 for <perforce@freebsd.org>; Sun, 3 Mar 2013 21:12:56 GMT
 (envelope-from brooks@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r23LCuMD026321
 for perforce@freebsd.org; Sun, 3 Mar 2013 21:12:56 GMT
 (envelope-from brooks@freebsd.org)
Date: Sun, 3 Mar 2013 21:12:56 GMT
Message-Id: <201303032112.r23LCuMD026321@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 222574 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: Sun, 03 Mar 2013 21:12:57 -0000

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

Change 222574 by brooks@brooks_zenith on 2013/03/03 21:12:55

	Pull in device cfid and full strataflash support from BeriBSD.

Affected files ...

.. //depot/projects/ctsrd/cheribsd/src/sys/mips/conf/BERI_DE4_BASE#4 integrate

Differences ...

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

@@ -30,6 +30,8 @@
 
 device		bpf
 device		cfi
+device		cfid
+options 	CFI_SUPPORT_STRATAFLASH
 device		sc
 
 device		miibus