From owner-p4-projects@FreeBSD.ORG  Wed Mar  6 21:49:16 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 91F00745; Wed,  6 Mar 2013 21:49:16 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 55578743
 for <perforce@freebsd.org>; Wed,  6 Mar 2013 21:49:16 +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 468BBA73
 for <perforce@freebsd.org>; Wed,  6 Mar 2013 21:49:16 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r26LnGnW065315
 for <perforce@freebsd.org>; Wed, 6 Mar 2013 21:49:16 GMT
 (envelope-from brooks@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r26LnG0G065312
 for perforce@freebsd.org; Wed, 6 Mar 2013 21:49:16 GMT
 (envelope-from brooks@freebsd.org)
Date: Wed, 6 Mar 2013 21:49:16 GMT
Message-Id: <201303062149.r26LnG0G065312@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 222674 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, 06 Mar 2013 21:49:16 -0000

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

Change 222674 by brooks@brooks_zenith on 2013/03/06 21:48:47

	Integrate from BeriBSD at 222673.  cfi(4) writes work correctly
	and add de4ctl.

Affected files ...

.. //depot/projects/ctsrd/cheribsd/src/ctsrd/Makefile#11 integrate
.. //depot/projects/ctsrd/cheribsd/src/ctsrd/de4ctl/Makefile#1 branch
.. //depot/projects/ctsrd/cheribsd/src/ctsrd/de4ctl/de4ctl.c#1 branch
.. //depot/projects/ctsrd/cheribsd/src/sys/boot/fdt/dts/beripad-de4.dts#5 integrate
.. //depot/projects/ctsrd/cheribsd/src/sys/dev/cfi/cfi_core.c#6 integrate

Differences ...

==== //depot/projects/ctsrd/cheribsd/src/ctsrd/Makefile#11 (text+ko) ====

@@ -4,6 +4,7 @@
 		browser \
 		cheripoint \
 		cycle_led \
+		de4ctl \
 		flashit \
 		libexec \
 		minifile \

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

@@ -148,5 +148,13 @@
 			sri-cambridge,fileio = "rw";
 			sri-cambridge,devname = "berirom";
 		};
+
+		avgen@0x7f00c000 {
+			compatible = "sri-cambridge,avgen";
+			reg = <0x7f00c000 0x8>;
+			sri-cambridge,width = <4>;
+			sri-cambridge,fileio = "rw";
+			sri-cambridge,devname = "de4tempfan";
+		};
 	};
 };

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

@@ -545,13 +545,13 @@
 					break;
 				}
 
-				cfi_write(sc, sc->sc_wrofs, CFI_BCS_CONFIRM);
+				cfi_write(sc, sc->sc_wrofs + i,
+				    CFI_BCS_CONFIRM);
 
-				error = cfi_wait_ready(sc, sc->sc_wrofs + 1,
+				error = cfi_wait_ready(sc, sc->sc_wrofs + i,
 				    &start, CFI_TIMEOUT_BUFWRITE);
-
-				goto out;
 			}
+			goto out;
 		default:
 			/* Fall through to single word case */
 			break;