diff options
| author | imp <imp@FreeBSD.org> | 2009-11-24 14:57:50 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2009-11-24 14:57:50 +0000 |
| commit | 2dbfc94816bb3e61b21e0da037c97ac08ae85d34 (patch) | |
| tree | 99725485c6ad90923b554d1bc8b4a459d165d00e | |
| parent | 21c09d7cc1e9af346db01db0aca36e2cc0d078fd (diff) | |
| download | FreeBSD-src-2dbfc94816bb3e61b21e0da037c97ac08ae85d34.zip FreeBSD-src-2dbfc94816bb3e61b21e0da037c97ac08ae85d34.tar.gz | |
Get rid of redundant .kernel in these names.
| -rw-r--r-- | sys/conf/ldscript.mips.octeon1.32 (renamed from sys/conf/ldscript.mips.octeon1.kernel.32) | 0 | ||||
| -rw-r--r-- | sys/conf/ldscript.mips.octeon1.64 (renamed from sys/conf/ldscript.mips.octeon1.kernel.64) | 0 | ||||
| -rw-r--r-- | sys/conf/ldscript.mips.octeon1.n32 (renamed from sys/conf/ldscript.mips.octeon1.kernel.n32) | 0 | ||||
| -rw-r--r-- | sys/mips/conf/OCTEON1 | 5 | ||||
| -rw-r--r-- | sys/mips/conf/OCTEON1-32 | 2 |
5 files changed, 4 insertions, 3 deletions
diff --git a/sys/conf/ldscript.mips.octeon1.kernel.32 b/sys/conf/ldscript.mips.octeon1.32 index d3b3c41..d3b3c41 100644 --- a/sys/conf/ldscript.mips.octeon1.kernel.32 +++ b/sys/conf/ldscript.mips.octeon1.32 diff --git a/sys/conf/ldscript.mips.octeon1.kernel.64 b/sys/conf/ldscript.mips.octeon1.64 index b476abf..b476abf 100644 --- a/sys/conf/ldscript.mips.octeon1.kernel.64 +++ b/sys/conf/ldscript.mips.octeon1.64 diff --git a/sys/conf/ldscript.mips.octeon1.kernel.n32 b/sys/conf/ldscript.mips.octeon1.n32 index 4eb3224..4eb3224 100644 --- a/sys/conf/ldscript.mips.octeon1.kernel.n32 +++ b/sys/conf/ldscript.mips.octeon1.n32 diff --git a/sys/mips/conf/OCTEON1 b/sys/mips/conf/OCTEON1 index 6c7810c..0694afb 100644 --- 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. diff --git a/sys/mips/conf/OCTEON1-32 b/sys/mips/conf/OCTEON1-32 index a75015e..361964e 100644 --- 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 |
