svn commit: r194148 - in projects/mips/sys/mips: conf octeon1

[Warner Losh]

Author: imp
Date: Sun Jun 14 03:44:43 2009
New Revision: 194148
URL: http://svn.freebsd.org/changeset/base/194148

Log:
  Actually rename the files this time.  Also, start to fix OCTEON1 so it
  can configure.

Added:
  projects/mips/sys/mips/octeon1/files.octeon1   (contents, props changed)
     - copied, changed from r194143, projects/mips/sys/mips/octeon1/files.octeon32
  projects/mips/sys/mips/octeon1/std.octeon1   (contents, props changed)
     - copied, changed from r194143, projects/mips/sys/mips/octeon1/std.octeon32
Deleted:
  projects/mips/sys/mips/octeon1/files.octeon32
  projects/mips/sys/mips/octeon1/std.octeon32
Modified:
  projects/mips/sys/mips/conf/OCTEON1

Modified: projects/mips/sys/mips/conf/OCTEON1
==============================================================================
--- projects/mips/sys/mips/conf/OCTEON1	Sun Jun 14 03:44:01 2009	(r194147)
+++ projects/mips/sys/mips/conf/OCTEON1	Sun Jun 14 03:44:43 2009	(r194148)
@@ -58,13 +58,12 @@ options		INVARIANT_SUPPORT	#Extra sanity
 #options		WITNESS			#Enable checks to detect deadlocks and cycles
 #options		WITNESS_SKIPSPIN	#Don't run witness on spinlocks for speed
 
-device		genclock
+#XXXimp device		genclock
 device		loop
 device		ether
 device		md
 device		uart
-device		uart_oct16550
-nodevice	uart_8250
+nodevice	uart_ns8250
 device 		rgmii
 #options 	VERBOSE_SYSINIT
 

Copied and modified: projects/mips/sys/mips/octeon1/files.octeon1 (from r194143, projects/mips/sys/mips/octeon1/files.octeon32)
==============================================================================
--- projects/mips/sys/mips/octeon1/files.octeon32	Sun Jun 14 03:01:39 2009	(r194143, copy source)
+++ projects/mips/sys/mips/octeon1/files.octeon1	Sun Jun 14 03:44:43 2009	(r194148)
@@ -5,12 +5,12 @@
 # $FreeBSD$
 # Octeon Support Files
 #
-mips/mips4k/octeon32/obio.c			optional uart
-mips/mips4k/octeon32/uart_cpu_octeonusart.c	optional uart
-mips/mips4k/octeon32/uart_bus_octeonusart.c	optional uart
+mips/octeon1/obio.c				optional uart
+mips/octeon1/uart_cpu_octeonusart.c		optional uart
+mips/octeon1/uart_bus_octeonusart.c		optional uart
 dev/uart/uart_dev_oct16550.c			optional uart
 mips/mips/mp_machdep.c                          optional smp
-mips/mips4k/octeon32/octeon_machdep.c		standard
+mips/octeon1/octeon_machdep.c			standard
 
 dev/flash/octeon_ebt3000_cf.c			optional cf
 

Copied and modified: projects/mips/sys/mips/octeon1/std.octeon1 (from r194143, projects/mips/sys/mips/octeon1/std.octeon32)
==============================================================================
--- projects/mips/sys/mips/octeon1/std.octeon32	Sun Jun 14 03:01:39 2009	(r194143, copy source)
+++ projects/mips/sys/mips/octeon1/std.octeon1	Sun Jun 14 03:44:43 2009	(r194148)
@@ -4,8 +4,7 @@
 # */
 # $FreeBSD$
 # 
-include "../mips4k/std.mips4k"
-files	"../mips4k/octeon32/files.octeon32"
+files	"../octeon1/files.octeon1"
 
 #
 #