From owner-p4-projects@FreeBSD.ORG  Fri Oct 18 18:41:48 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 070E8953; Fri, 18 Oct 2013 18:41:48 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id B508C950
 for <perforce@freebsd.org>; Fri, 18 Oct 2013 18:41:47 +0000 (UTC)
 (envelope-from brooks@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id A19BF26EC
 for <perforce@freebsd.org>; Fri, 18 Oct 2013 18:41:47 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r9IIflUG082480
 for <perforce@freebsd.org>; Fri, 18 Oct 2013 18:41:47 GMT
 (envelope-from brooks@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r9IIflMN082477
 for perforce@freebsd.org; Fri, 18 Oct 2013 18:41:47 GMT
 (envelope-from brooks@freebsd.org)
Date: Fri, 18 Oct 2013 18:41:47 GMT
Message-Id: <201310181841.r9IIflMN082477@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 1136252 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: Fri, 18 Oct 2013 18:41:48 -0000

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

Change 1136252 by brooks@brooks_zenith on 2013/10/18 18:41:00

	Add a new option ATSE_CFI_HACK to cause cfi(4) devices to be
	mapped shared so atse(4) can read from them.

Affected files ...

.. //depot/projects/ctsrd/beribsd/src/sys/conf/options#12 edit
.. //depot/projects/ctsrd/beribsd/src/sys/dev/cfi/cfi_core.c#21 edit
.. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_DE4_BASE#7 edit

Differences ...

==== //depot/projects/ctsrd/beribsd/src/sys/conf/options#12 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: head/sys/conf/options 256377 2013-10-12 12:57:57Z markm $
+# $FreeBSD: head/sys/conf/options 256744 2013-10-18 15:27:11Z brooks $
 #
 #        On the handling of kernel options
 #
@@ -69,6 +69,7 @@
 ADAPTIVE_LOCKMGRS
 ALQ
 ALTERA_SDCARD_FAST_SIM	opt_altera_sdcard.h
+ATSE_CFI_HACK	opt_cfi.h
 AUDIT		opt_global.h
 BOOTHOWTO	opt_global.h
 BOOTVERBOSE	opt_global.h

==== //depot/projects/ctsrd/beribsd/src/sys/dev/cfi/cfi_core.c#21 (text+ko) ====

@@ -281,7 +281,11 @@
 
 	sc->sc_rid = 0;
 	sc->sc_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &sc->sc_rid,
+#ifndef ATSE_CFI_HACK
+	    RF_ACTIVE);
+#else
 	    RF_ACTIVE | RF_SHAREABLE);
+#endif
 	if (sc->sc_res == NULL)
 		return (ENXIO);
 

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

@@ -32,6 +32,7 @@
 device		cfi
 device		cfid
 options 	CFI_SUPPORT_STRATAFLASH
+options 	ATSE_CFI_HACK
 device		sc
 
 device		uart