From owner-svn-src-user@FreeBSD.ORG  Tue Apr 27 22:04:40 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 0271F1065674;
	Tue, 27 Apr 2010 22:04:40 +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 CDA178FC18;
	Tue, 27 Apr 2010 22:04:39 +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 o3RM4dqf035592;
	Tue, 27 Apr 2010 22:04:39 GMT
	(envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3RM4dpL035589;
	Tue, 27 Apr 2010 22:04:39 GMT
	(envelope-from jmallett@svn.freebsd.org)
Message-Id: <201004272204.o3RM4dpL035589@svn.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Tue, 27 Apr 2010 22:04:39 +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: r207300 - user/jmallett/octeon/sys/mips/cavium
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, 27 Apr 2010 22:04:40 -0000

Author: jmallett
Date: Tue Apr 27 22:04:39 2010
New Revision: 207300
URL: http://svn.freebsd.org/changeset/base/207300

Log:
  o) Print model string at startup.
  o) Fix build without octe by linking in more of the SDK that we use now.

Modified:
  user/jmallett/octeon/sys/mips/cavium/files.octeon1
  user/jmallett/octeon/sys/mips/cavium/octeon_machdep.c

Modified: user/jmallett/octeon/sys/mips/cavium/files.octeon1
==============================================================================
--- user/jmallett/octeon/sys/mips/cavium/files.octeon1	Tue Apr 27 21:29:30 2010	(r207299)
+++ user/jmallett/octeon/sys/mips/cavium/files.octeon1	Tue Apr 27 22:04:39 2010	(r207300)
@@ -26,7 +26,6 @@ mips/cavium/octe/ethernet-xaui.c		option
 mips/cavium/octe/octe.c				optional octe
 mips/cavium/octe/octebus.c			optional octe
 
-contrib/octeon-sdk/cvmx-bootmem.c		optional octe
 contrib/octeon-sdk/cvmx-cmd-queue.c		optional octe
 contrib/octeon-sdk/cvmx-fpa.c			optional octe
 contrib/octeon-sdk/cvmx-helper.c		optional octe
@@ -44,6 +43,8 @@ contrib/octeon-sdk/cvmx-pko.c			optional
 contrib/octeon-sdk/cvmx-spi.c			optional octe
 contrib/octeon-sdk/cvmx-spi4000.c		optional octe
 contrib/octeon-sdk/cvmx-twsi.c			optional octe
-contrib/octeon-sdk/cvmx-warn.c			optional octe
 
+contrib/octeon-sdk/cvmx-bootmem.c		standard
 contrib/octeon-sdk/cvmx-sysinfo.c		standard
+contrib/octeon-sdk/cvmx-warn.c			standard
+contrib/octeon-sdk/octeon-model.c		standard

Modified: user/jmallett/octeon/sys/mips/cavium/octeon_machdep.c
==============================================================================
--- user/jmallett/octeon/sys/mips/cavium/octeon_machdep.c	Tue Apr 27 21:29:30 2010	(r207299)
+++ user/jmallett/octeon/sys/mips/cavium/octeon_machdep.c	Tue Apr 27 22:04:39 2010	(r207300)
@@ -299,6 +299,8 @@ platform_start(__register_t a0, __regist
 	mips_timer_early_init(OCTEON_CLOCK_DEFAULT);
 	cninit();
 
+	printf("Model: %s\n", octeon_model_get_string(cvmx_get_proc_id()));
+
 	octeon_ciu_reset();
 	octeon_boot_params_init(a3);
 	bootverbose = 1;