From owner-svn-src-user@FreeBSD.ORG  Tue Apr 20 23:45:48 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 E45BB106567D;
	Tue, 20 Apr 2010 23:45:48 +0000 (UTC)
	(envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id BAAE78FC39;
	Tue, 20 Apr 2010 23:45:48 +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 o3KNjmcn081214;
	Tue, 20 Apr 2010 23:45:48 GMT
	(envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3KNjmnv081211;
	Tue, 20 Apr 2010 23:45:48 GMT
	(envelope-from jmallett@svn.freebsd.org)
Message-Id: <201004202345.o3KNjmnv081211@svn.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Tue, 20 Apr 2010 23:45:48 +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: r206960 - user/jmallett/octeon/sys/contrib/octeon-sdk
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: Tue, 20 Apr 2010 23:45:49 -0000

Author: jmallett
Date: Tue Apr 20 23:45:48 2010
New Revision: 206960
URL: http://svn.freebsd.org/changeset/base/206960

Log:
  Support building for FreeBSD's kernel.

Modified:
  user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-platform.h
  user/jmallett/octeon/sys/contrib/octeon-sdk/octeon-model.h

Modified: user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-platform.h
==============================================================================
--- user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-platform.h	Tue Apr 20 23:45:09 2010	(r206959)
+++ user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-platform.h	Tue Apr 20 23:45:48 2010	(r206960)
@@ -103,6 +103,8 @@
     /* To build the simple exec toolchain runtime (newlib) library. We
        should only use features available on all Octeon models.  */
     #define CVMX_BUILD_FOR_TOOLCHAIN
+#elif defined(__FreeBSD__) && defined(_KERNEL)
+    #define CVMX_BUILD_FOR_FREEBSD
 #else
     /* We are building a simple exec standalone image for Octeon */
     #define CVMX_BUILD_FOR_STANDALONE
@@ -187,6 +189,10 @@
     #include <string.h>
     #include <assert.h>
 
+#elif defined(CVMX_BUILD_FOR_FREEBSD)
+
+    #include <mips/cavium/cvmx_config.h>
+
 #else
 
     #error Unexpected CVMX_BUILD_FOR_* macro

Modified: user/jmallett/octeon/sys/contrib/octeon-sdk/octeon-model.h
==============================================================================
--- user/jmallett/octeon/sys/contrib/octeon-sdk/octeon-model.h	Tue Apr 20 23:45:09 2010	(r206959)
+++ user/jmallett/octeon/sys/contrib/octeon-sdk/octeon-model.h	Tue Apr 20 23:45:48 2010	(r206960)
@@ -254,7 +254,7 @@ extern "C" {
        && (((chip_model) & OCTEON_58XX_MODEL_MASK) < ((arg_model) & OCTEON_58XX_MODEL_MASK))) \
     )))
 
-#if defined(USE_RUNTIME_MODEL_CHECKS) || defined(__U_BOOT__) || (defined(__linux__) && defined(__KERNEL__))
+#if defined(USE_RUNTIME_MODEL_CHECKS) || defined(__U_BOOT__) || (defined(__linux__) && defined(__KERNEL__)) || (defined(__FreeBSD__) && defined(_KERNEL))
 
 /* NOTE: This for internal use only!!!!! */
 static inline int __octeon_is_model_runtime__(uint32_t model)