Get rid of redundant .kernel in these names.

2009-11-24 14:57:50 +00:00 · 2009-11-24 14:57:50 +00:00 · 2dbfc94816
commit 2dbfc94816
parent 21c09d7cc1
5 changed files with 4 additions and 3 deletions
--- a/sys/conf/ldscript.mips.octeon1.kernel.32
+++ b/sys/conf/ldscript.mips.octeon1.kernel.32
--- a/sys/conf/ldscript.mips.octeon1.kernel.64
+++ b/sys/conf/ldscript.mips.octeon1.kernel.64
--- a/sys/conf/ldscript.mips.octeon1.kernel.n32
+++ b/sys/conf/ldscript.mips.octeon1.kernel.n32
--- a/sys/mips/conf/OCTEON1
+++ b/sys/mips/conf/OCTEON1
@ -22,14 +22,15 @@ cpu		CPU_MIPS4KC
 ident		OCTEON1

 makeoptions	ARCH_FLAGS="-march=mips64 -mabi=64"
-makeoptions	LDSCRIPT_NAME=	ldscript.mips.mips64
+makeoptions	LDSCRIPT_NAME=ldscript.mips.octeon.64

 # Don't build any modules yet.
 makeoptions	MODULES_OVERRIDE=""
 makeoptions     TARGET_BIG_ENDIAN=defined
 makeoptions     TARGET_64BIT=defined
+makeoptions	KERNLOADADDR=0xffffffff80100000

-options		KERNVIRTADDR=0x80100000
+options		KERNVIRTADDR=0xffffffff80100000
 include		"../octeon1/std.octeon1"

 hints		"OCTEON1.hints"		#Default places to look for devices.
--- a/sys/mips/conf/OCTEON1-32
+++ b/sys/mips/conf/OCTEON1-32
@ -27,7 +27,7 @@ ident		OCTEON1
 # Don't build any modules yet.
 makeoptions	MODULES_OVERRIDE=""
 makeoptions     TARGET_BIG_ENDIAN=defined
-makeoptions     LDSCRIPT_NAME=ldscript.mips.octeon1.kernel.32
+makeoptions     LDSCRIPT_NAME=ldscript.mips.octeon1.32
 #makeoptions     TARGET_64BIT=defined

 options		KERNVIRTADDR=0x80100000