From owner-svn-src-user@FreeBSD.ORG  Thu Apr 29 06:46:03 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 A60E7106566B;
	Thu, 29 Apr 2010 06:46:03 +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 956768FC1B;
	Thu, 29 Apr 2010 06:46:03 +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 o3T6k33Q033287;
	Thu, 29 Apr 2010 06:46:03 GMT
	(envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3T6k3HP033284;
	Thu, 29 Apr 2010 06:46:03 GMT
	(envelope-from jmallett@svn.freebsd.org)
Message-Id: <201004290646.o3T6k3HP033284@svn.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Thu, 29 Apr 2010 06:46:03 +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: r207356 - in user/jmallett/octeon/sys: conf mips/conf
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: Thu, 29 Apr 2010 06:46:03 -0000

Author: jmallett
Date: Thu Apr 29 06:46:03 2010
New Revision: 207356
URL: http://svn.freebsd.org/changeset/base/207356

Log:
  Add an option to include vendor-specific changes for Lanner.

Added:
  user/jmallett/octeon/sys/mips/conf/MR_320
Modified:
  user/jmallett/octeon/sys/conf/options.mips

Modified: user/jmallett/octeon/sys/conf/options.mips
==============================================================================
--- user/jmallett/octeon/sys/conf/options.mips	Thu Apr 29 06:22:07 2010	(r207355)
+++ user/jmallett/octeon/sys/conf/options.mips	Thu Apr 29 06:46:03 2010	(r207356)
@@ -67,4 +67,5 @@ MAXMEM			opt_global.h
 #
 # Options that control the Cavium Simple Executive.
 #
+OCTEON_VENDOR_LANNER		opt_cvmx.h
 OCTEON_BOARD_CAPK_0100ND	opt_cvmx.h

Added: user/jmallett/octeon/sys/mips/conf/MR_320
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/jmallett/octeon/sys/mips/conf/MR_320	Thu Apr 29 06:46:03 2010	(r207356)
@@ -0,0 +1,7 @@
+#
+# $FreeBSD$
+#
+
+options 	OCTEON_VENDOR_LANNER
+
+include		OCTEON1-32