svn commit: r207033 - in user/jmallett/octeon/sys/mips: cavium conf

[Juli Mallett]

Author: jmallett
Date: Thu Apr 22 00:15:29 2010
New Revision: 207033
URL: http://svn.freebsd.org/changeset/base/207033

Log:
  o) Comment out RGMII driver.
  o) Build a large amount of the Simple Executive code in for a mythical "octe"
     driver.
     XXX Not thrilled about including cvmx-bootmem.c.  Looks like Linux probably
         does this, too, but I'd be much happier providing an implementation of
         the bootmem API in mips/cavium/ somewhere.  But that's a concern for
         once there's actually something functional.

Modified:
  user/jmallett/octeon/sys/mips/cavium/files.octeon1
  user/jmallett/octeon/sys/mips/conf/OCTEON1
  user/jmallett/octeon/sys/mips/conf/OCTEON1-32
  user/jmallett/octeon/sys/mips/conf/OCTEON1-o32

Modified: user/jmallett/octeon/sys/mips/cavium/files.octeon1
==============================================================================
--- user/jmallett/octeon/sys/mips/cavium/files.octeon1	Thu Apr 22 00:15:04 2010	(r207032)
+++ user/jmallett/octeon/sys/mips/cavium/files.octeon1	Thu Apr 22 00:15:29 2010	(r207033)
@@ -16,6 +16,25 @@ mips/mips/tick.c				standard
 #mips/cavium/dev/rgmii/octeon_ipd.c 		optional rgmii
 #mips/cavium/dev/rgmii/octeon_pko.c		optional rgmii
 #mips/cavium/dev/rgmii/octeon_rgmx.c		optional rgmii
-mips/mips/tick.c				optional rgmii
+
+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
+contrib/octeon-sdk/cvmx-helper-board.c		optional octe
+contrib/octeon-sdk/cvmx-helper-errata.c		optional octe
+contrib/octeon-sdk/cvmx-helper-fpa.c		optional octe
+contrib/octeon-sdk/cvmx-helper-loop.c		optional octe
+contrib/octeon-sdk/cvmx-helper-npi.c		optional octe
+contrib/octeon-sdk/cvmx-helper-rgmii.c		optional octe
+contrib/octeon-sdk/cvmx-helper-sgmii.c		optional octe
+contrib/octeon-sdk/cvmx-helper-spi.c		optional octe
+contrib/octeon-sdk/cvmx-helper-util.c		optional octe
+contrib/octeon-sdk/cvmx-helper-xaui.c		optional octe
+contrib/octeon-sdk/cvmx-pko.c			optional octe
+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-sysinfo.c		standard

Modified: user/jmallett/octeon/sys/mips/conf/OCTEON1
==============================================================================
--- user/jmallett/octeon/sys/mips/conf/OCTEON1	Thu Apr 22 00:15:04 2010	(r207032)
+++ user/jmallett/octeon/sys/mips/conf/OCTEON1	Thu Apr 22 00:15:29 2010	(r207033)
@@ -28,7 +28,7 @@ machine		mips
 cpu		CPU_MIPS4KC
 ident		OCTEON1
 
-makeoptions	ARCH_FLAGS="-march=mips64r2"
+makeoptions	ARCH_FLAGS="-march=octeon"
 makeoptions	LDSCRIPT_NAME=ldscript.mips.octeon1
 
 # Don't build any modules yet.
@@ -82,7 +82,8 @@ device		ether
 device		md
 device		uart
 nodevice	uart_ns8250
-device		rgmii
+device		octe
+#device		rgmii
 #options 	VERBOSE_SYSINIT
 
 device		bpf

Modified: user/jmallett/octeon/sys/mips/conf/OCTEON1-32
==============================================================================
--- user/jmallett/octeon/sys/mips/conf/OCTEON1-32	Thu Apr 22 00:15:04 2010	(r207032)
+++ user/jmallett/octeon/sys/mips/conf/OCTEON1-32	Thu Apr 22 00:15:29 2010	(r207033)
@@ -23,7 +23,7 @@ ident		OCTEON1
 
 # Don't build any modules yet.
 makeoptions	MODULES_OVERRIDE=""
-makeoptions	ARCH_FLAGS="-march=mips64r2"
+makeoptions	ARCH_FLAGS="-march=octeon"
 makeoptions     LDSCRIPT_NAME=ldscript.mips.octeon1
 
 makeoptions	KERNLOADADDR=0xffffffff81000000
@@ -72,7 +72,8 @@ device		ether
 device		md
 device		uart
 nodevice	uart_ns8250
-device		rgmii
+#device		rgmii
+device		octe
 #options 	VERBOSE_SYSINIT
 
 device		bpf

Modified: user/jmallett/octeon/sys/mips/conf/OCTEON1-o32
==============================================================================
--- user/jmallett/octeon/sys/mips/conf/OCTEON1-o32	Thu Apr 22 00:15:04 2010	(r207032)
+++ user/jmallett/octeon/sys/mips/conf/OCTEON1-o32	Thu Apr 22 00:15:29 2010	(r207033)
@@ -23,7 +23,7 @@ ident		OCTEON1
 
 # Don't build any modules yet.
 makeoptions	MODULES_OVERRIDE=""
-makeoptions	ARCH_FLAGS="-march=mips64r2"
+makeoptions	ARCH_FLAGS="-march=octeon"
 makeoptions     LDSCRIPT_NAME=ldscript.mips.octeon1
 
 makeoptions	KERNLOADADDR=0xffffffff81000000
@@ -72,7 +72,8 @@ device		ether
 device		md
 device		uart
 nodevice	uart_ns8250
-device		rgmii
+device		octe
+#device		rgmii
 #options 	VERBOSE_SYSINIT
 
 device		bpf