From owner-svn-src-head@FreeBSD.ORG  Sat Jan 12 12:35:00 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 404DE46F;
 Sat, 12 Jan 2013 12:35:00 +0000 (UTC)
 (envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 32E8F6D1;
 Sat, 12 Jan 2013 12:35:00 +0000 (UTC)
Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0CCZ0Pu023726;
 Sat, 12 Jan 2013 12:35:00 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0CCZ0dI023716;
 Sat, 12 Jan 2013 12:35:00 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <201301121235.r0CCZ0dI023716@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Sat, 12 Jan 2013 12:35:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r245329 - head/sys/mips/beri
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 12 Jan 2013 12:35:00 -0000

Author: rwatson
Date: Sat Jan 12 12:34:59 2013
New Revision: 245329
URL: http://svnweb.freebsd.org/changeset/base/245329

Log:
  Merge Perforce change @219935 to head:
  
    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
  
  Sponsored by:	DARPA, AFRL

Modified:
  head/sys/mips/beri/beri_machdep.c

Modified: head/sys/mips/beri/beri_machdep.c
==============================================================================
--- head/sys/mips/beri/beri_machdep.c	Sat Jan 12 11:36:23 2013	(r245328)
+++ head/sys/mips/beri/beri_machdep.c	Sat Jan 12 12:34:59 2013	(r245329)
@@ -87,17 +87,6 @@ mips_init(void)
 {
 	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 @@ platform_start(__register_t a0, __regist
 
 	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).