From owner-p4-projects@FreeBSD.ORG  Wed Jan  2 10:10:07 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 75982562; Wed,  2 Jan 2013 10:10:07 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id E8AB3560
 for <perforce@freebsd.org>; Wed,  2 Jan 2013 10:10:06 +0000 (UTC)
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:4f8:fff6::2d])
 by mx1.freebsd.org (Postfix) with ESMTP id CD0B38FC08
 for <perforce@freebsd.org>; Wed,  2 Jan 2013 10:10:06 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
 by skunkworks.freebsd.org (8.14.5/8.14.5) with ESMTP id r02AA6jP075588
 for <perforce@freebsd.org>; Wed, 2 Jan 2013 10:10:06 GMT
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.5/8.14.5/Submit) id r02AA6jF075585
 for perforce@freebsd.org; Wed, 2 Jan 2013 10:10:06 GMT
 (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Wed, 2 Jan 2013 10:10:06 GMT
Message-Id: <201301021010.r02AA6jF075585@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
Subject: PERFORCE change 219935 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, 02 Jan 2013 10:10:07 -0000

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

Change 219935 by rwatson@rwatson_zenith_cl_cam_ac_uk on 2013/01/02 10:09:18

	Initialise Openfirmware/FDT code earlier in the FreeBSD/beri boot,
	so that the results will be available for configuring the console
	UART (eventually).
	
	Suggested by:	thompsa

Affected files ...

.. //depot/projects/ctsrd/beribsd/src/sys/mips/beri/beri_machdep.c#7 edit

Differences ...

==== //depot/projects/ctsrd/beribsd/src/sys/mips/beri/beri_machdep.c#7 (text+ko) ====

@@ -87,17 +87,6 @@
 {
 	int i;
 
-#ifdef FDT
-#ifndef FDT_DTB_STATIC
-#error	"mips_init with FDT requires FDT_DTB_STATIC"
-#endif
-
-	if (OF_install(OFW_FDT, 0) == FALSE)
-		while (1);
-	if (OF_init(&fdt_static_dtb) != 0)
-		while (1);
-#endif
-
 	for (i = 0; i < 10; i++) {
 		phys_avail[i] = 0;
 	}
@@ -156,6 +145,17 @@
 
 	mips_pcpu0_init();
 
+#ifdef FDT
+#ifndef FDT_DTB_STATIC
+#error	"mips_init with FDT requires FDT_DTB_STATIC"
+#endif
+
+	if (OF_install(OFW_FDT, 0) == FALSE)
+		while (1);
+	if (OF_init(&fdt_static_dtb) != 0)
+		while (1);
+#endif
+
 	/*
 	 * XXXRW: We have no way to compare wallclock time to cycle rate on
 	 * BERI, so for now assume we run at the MALTA default (100MHz).