diff options
| author | jchandra <jchandra@FreeBSD.org> | 2011-01-20 08:15:11 +0000 |
|---|---|---|
| committer | jchandra <jchandra@FreeBSD.org> | 2011-01-20 08:15:11 +0000 |
| commit | 376dbcfd36b6548831849d2e4bbe851a6f9a4727 (patch) | |
| tree | d0465a9194785c8d0a97b0cc9cd7496e61c73912 /sys/mips | |
| parent | b2750647b417022b5ccef907fc4511ec5f502802 (diff) | |
| download | FreeBSD-src-376dbcfd36b6548831849d2e4bbe851a6f9a4727.zip FreeBSD-src-376dbcfd36b6548831849d2e4bbe851a6f9a4727.tar.gz | |
ldscript and conf cleanup for MIPS
- Remove sys/conf/ldscript.mips.64 and sys/conf/ldscript.mips.n32 and use
ldscript.mips for all ABIs. The default OUTPUT_FORMAT of the toolchain
is correct.
- Remove LDSCRIPT_NAME entires from XLR n32 and n64 conf files.
- Remove TARGET_BIG_ENDIAN from XLR conf files.
- Fix machine entry in XLRN32
Diffstat (limited to 'sys/mips')
| -rw-r--r-- | sys/mips/conf/MALTA64 | 1 | ||||
| -rw-r--r-- | sys/mips/conf/XLR | 5 | ||||
| -rw-r--r-- | sys/mips/conf/XLR64 | 7 | ||||
| -rw-r--r-- | sys/mips/conf/XLRN32 | 9 |
4 files changed, 7 insertions, 15 deletions
diff --git a/sys/mips/conf/MALTA64 b/sys/mips/conf/MALTA64 index 26376b0..627ca35 100644 --- a/sys/mips/conf/MALTA64 +++ b/sys/mips/conf/MALTA64 @@ -22,7 +22,6 @@ ident MALTA machine mips mips64el # Malta supports both, so it isn't in std.malta makeoptions ARCH_FLAGS="-march=mips64 -mabi=64" -makeoptions LDSCRIPT_NAME= ldscript.mips.mips64 options YAMON diff --git a/sys/mips/conf/XLR b/sys/mips/conf/XLR index 28b1c91..5c89ef1 100644 --- a/sys/mips/conf/XLR +++ b/sys/mips/conf/XLR @@ -50,7 +50,6 @@ cpu CPU_RMI ident XLR makeoptions MODULES_OVERRIDE="" -makeoptions TARGET_BIG_ENDIAN # include "../rmi/std.xlr" @@ -58,6 +57,8 @@ include "../rmi/std.xlr" makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols #profile 2 +makeoptions KERNLOADADDR=0x80100000 +options ISA_MIPS32 options SCHED_ULE # ULE scheduler #options VERBOSE_SYSINIT @@ -156,5 +157,3 @@ device at24co2n # EEPROM on XLR boards #device cryptodev #device crypto #device rmisec -options ISA_MIPS32 -makeoptions KERNLOADADDR=0x80100000 diff --git a/sys/mips/conf/XLR64 b/sys/mips/conf/XLR64 index 3d18f0c..719fcce 100644 --- a/sys/mips/conf/XLR64 +++ b/sys/mips/conf/XLR64 @@ -22,13 +22,12 @@ cpu CPU_RMI ident XLR64 makeoptions MODULES_OVERRIDE="" -makeoptions TARGET_BIG_ENDIAN - include "../rmi/std.xlr" makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols makeoptions ARCH_FLAGS="-march=mips64 -mabi=64" -makeoptions LDSCRIPT_NAME=ldscript.mips.64 +makeoptions KERNLOADADDR=0xffffffff80100000 +options ISA_MIPS64 #profile 2 @@ -129,5 +128,3 @@ device umass # Disks/Mass storage - Requires scbus and da #device cryptodev #device crypto #device rmisec -options ISA_MIPS64 -makeoptions KERNLOADADDR=0xffffffff80100000 diff --git a/sys/mips/conf/XLRN32 b/sys/mips/conf/XLRN32 index 313db52..8f80545 100644 --- a/sys/mips/conf/XLRN32 +++ b/sys/mips/conf/XLRN32 @@ -17,18 +17,17 @@ # # $FreeBSD$ -machine mips mipseb +machine mips mipsn32eb cpu CPU_RMI ident XLRN32 makeoptions MODULES_OVERRIDE="" -makeoptions TARGET_BIG_ENDIAN - include "../rmi/std.xlr" makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols makeoptions ARCH_FLAGS="-march=mips64 -mabi=n32" -makeoptions LDSCRIPT_NAME=ldscript.mips.n32 +makeoptions KERNLOADADDR=0x80100000 +options ISA_MIPS64 #profile 2 @@ -129,5 +128,3 @@ device umass # Disks/Mass storage - Requires scbus and da #device cryptodev #device crypto #device rmisec -options ISA_MIPS64 -makeoptions KERNLOADADDR=0x80100000 |
