From owner-svn-src-user@FreeBSD.ORG  Sun Jul  4 01:39:59 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 600981065674;
	Sun,  4 Jul 2010 01:39:59 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4FCC68FC08;
	Sun,  4 Jul 2010 01:39:59 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o641dxDE085223;
	Sun, 4 Jul 2010 01:39:59 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o641dx3g085222;
	Sun, 4 Jul 2010 01:39:59 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201007040139.o641dx3g085222@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Sun, 4 Jul 2010 01:39:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r209678 - user/nwhitehorn/ps3/powerpc/aim
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 04 Jul 2010 01:39:59 -0000

Author: nwhitehorn
Date: Sun Jul  4 01:39:58 2010
New Revision: 209678
URL: http://svn.freebsd.org/changeset/base/209678

Log:
  Make static FDT inclusion work on PPC/aim.

Modified:
  user/nwhitehorn/ps3/powerpc/aim/ofw_machdep.c

Modified: user/nwhitehorn/ps3/powerpc/aim/ofw_machdep.c
==============================================================================
--- user/nwhitehorn/ps3/powerpc/aim/ofw_machdep.c	Sat Jul  3 22:02:29 2010	(r209677)
+++ user/nwhitehorn/ps3/powerpc/aim/ofw_machdep.c	Sun Jul  4 01:39:58 2010	(r209678)
@@ -333,6 +333,12 @@ OF_initial_setup(void *fdt_ptr, void *ju
 	#endif
 
 	fdt = fdt_ptr;
+
+#ifdef FDT_DTB_STATIC
+	/* Check for a statically included blob */
+	if (fdt == NULL)
+		fdt = &fdt_static_dtb;
+#endif
 }
 
 boolean_t