svn commit: r207300 - user/jmallett/octeon/sys/mips/cavium

[Juli Mallett]

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;