svn commit: r202065 - head/sys/mips/conf

[Warner Losh]

Author: imp
Date: Mon Jan 11 04:40:38 2010
New Revision: 202065
URL: http://svn.freebsd.org/changeset/base/202065

Log:
  Cope with the octeon1->cavium move.

Modified:
  head/sys/mips/conf/OCTEON1   (contents, props changed)
  head/sys/mips/conf/OCTEON1-32   (contents, props changed)
Directory Properties:
  head/sys/mips/conf/OCTEON1.hints   (props changed)

Modified: head/sys/mips/conf/OCTEON1
==============================================================================
--- head/sys/mips/conf/OCTEON1	Mon Jan 11 04:38:37 2010	(r202064)
+++ head/sys/mips/conf/OCTEON1	Mon Jan 11 04:40:38 2010	(r202065)
@@ -31,7 +31,7 @@ makeoptions     TARGET_64BIT=defined
 makeoptions	KERNLOADADDR=0xffffffff80100000
 
 options		KERNVIRTADDR=0xffffffff80100000
-include		"../octeon1/std.octeon1"
+include		"../cavium/std.octeon1"
 
 hints		"OCTEON1.hints"		#Default places to look for devices.
 

Modified: head/sys/mips/conf/OCTEON1-32
==============================================================================
--- head/sys/mips/conf/OCTEON1-32	Mon Jan 11 04:38:37 2010	(r202064)
+++ head/sys/mips/conf/OCTEON1-32	Mon Jan 11 04:40:38 2010	(r202065)
@@ -32,7 +32,7 @@ makeoptions     LDSCRIPT_NAME=ldscript.m
 
 options		KERNVIRTADDR=0x80100000
 makeoptions	KERNLOADADDR=0x80100000
-include		"../octeon1/std.octeon1"
+include		"../cavium/std.octeon1"
 
 hints		"OCTEON1.hints"		#Default places to look for devices.