From owner-svn-src-user@FreeBSD.ORG  Mon Aug  2 12:15:46 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 578DD1065781;
	Mon,  2 Aug 2010 12:15:46 +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 462A38FC18;
	Mon,  2 Aug 2010 12:15:46 +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 o72CFkRb018918;
	Mon, 2 Aug 2010 12:15:46 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o72CFk1A018916;
	Mon, 2 Aug 2010 12:15:46 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201008021215.o72CFk1A018916@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Mon, 2 Aug 2010 12:15:46 +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: r210756 - 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: Mon, 02 Aug 2010 12:15:46 -0000

Author: nwhitehorn
Date: Mon Aug  2 12:15:46 2010
New Revision: 210756
URL: http://svn.freebsd.org/changeset/base/210756

Log:
  Add support for static FDT blobs, and declare FDT to be "real mode" for now,
  so that the system won't try to read its translations. This is a hack.

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	Mon Aug  2 12:15:22 2010	(r210755)
+++ user/nwhitehorn/ps3/powerpc/aim/ofw_machdep.c	Mon Aug  2 12:15:46 2010	(r210756)
@@ -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
@@ -362,6 +368,7 @@ OF_bootstrap()
 		 */
 		ofw_quiesce();
 	} else {
+		ofw_real_mode = 1;  /* XXX: don't use special virt mode code */
 		status = OF_install(OFW_FDT, 0);
 
 		if (status != TRUE)