From owner-p4-projects@FreeBSD.ORG  Fri Feb  1 16:12:34 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 24A9CAFC; Fri,  1 Feb 2013 16:12:34 +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 DCEFFAFA
 for <perforce@freebsd.org>; Fri,  1 Feb 2013 16:12:33 +0000 (UTC)
 (envelope-from bz@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 B52F0F6D
 for <perforce@freebsd.org>; Fri,  1 Feb 2013 16:12:33 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r11GCXOP060075
 for <perforce@freebsd.org>; Fri, 1 Feb 2013 16:12:33 GMT
 (envelope-from bz@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r11GCXJw060072
 for perforce@freebsd.org; Fri, 1 Feb 2013 16:12:33 GMT
 (envelope-from bz@freebsd.org)
Date: Fri, 1 Feb 2013 16:12:33 GMT
Message-Id: <201302011612.r11GCXJw060072@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 bz@freebsd.org using -f
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Subject: PERFORCE change 221676 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, 01 Feb 2013 16:12:34 -0000

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

Change 221676 by bz@bz_zenith on 2013/02/01 16:12:08

	Change order so that isf(4) is always probed and attached
	before atse(4) will be, so that we can find the device and
	read the Ethernet addresses.
	
	This is hackish but a good workaround for now until a loader
	will fix it for us.

Affected files ...

.. //depot/projects/ctsrd/beribsd/src/sys/boot/fdt/dts/beripad-de4.dts#14 edit

Differences ...

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

@@ -95,6 +95,20 @@
 			reg = <0x7f006000 0x1>;
 		};
 
+		/*
+		 * XXX-BZ keep flash before ethernet so that atse can read the
+		 * Ethernet addresses for now.
+		 */
+		flash@0x74000000 {
+			compatible = "intel,strataflash";
+			reg = <0x74000000 0x2000000>;
+		};
+
+		flash@0x76000000 {
+			compatible = "intel,strataflash";
+			reg = <0x76000000 0x2000000>;
+		};
+
 		ethernet@7f007000 {
 			compatible = "altera,atse";
 			/* MAC, RX+RXC, TX+TXC. */
@@ -124,16 +138,6 @@
 			       0x70177000 0x2000>;
 		};
 
-		flash@0x74000000 {
-			compatible = "intel,strataflash";
-			reg = <0x74000000 0x2000000>;
-		};
-
-		flash@0x76000000 {
-			compatible = "intel,strataflash";
-			reg = <0x76000000 0x2000000>;
-		};
-
 		avgen@0x7f009000 {
 			compatible = "sri-cambridge,avgen";
 			reg = <0x7f009000 0x2>;