summaryrefslogtreecommitdiffstats
path: root/sys/mips/conf
diff options
context:
space:
mode:
authorjmallett <jmallett@FreeBSD.org>2012-03-12 21:25:32 +0000
committerjmallett <jmallett@FreeBSD.org>2012-03-12 21:25:32 +0000
commit195d12217257f3fd4b328858cbb31ccf5a101652 (patch)
treef982d7b32e1a65ea4d9f9f78cf4321252085149f /sys/mips/conf
parentcb55999141197a7294c6e4eefb8d5ed74c97a25d (diff)
downloadFreeBSD-src-195d12217257f3fd4b328858cbb31ccf5a101652.zip
FreeBSD-src-195d12217257f3fd4b328858cbb31ccf5a101652.tar.gz
o) Use ABI, not ISA_* options, to determine whether to compile bits if libkern
required for the ABI the kernel is being built for. XXX This is implemented in a kind-of nasty way that involves including source files, but it's still an improvement. o) Retire ISA_* options since they're unused and were always wrong.
Diffstat (limited to 'sys/mips/conf')
-rw-r--r--sys/mips/conf/AR71XX_BASE1
-rw-r--r--sys/mips/conf/AR91XX_BASE1
-rw-r--r--sys/mips/conf/MALTA2
-rw-r--r--sys/mips/conf/MALTA642
-rw-r--r--sys/mips/conf/OCTEON13
-rw-r--r--sys/mips/conf/SWARM1
-rw-r--r--sys/mips/conf/SWARM_SMP1
-rw-r--r--sys/mips/conf/XLP1
-rw-r--r--sys/mips/conf/XLP641
-rw-r--r--sys/mips/conf/XLPN321
-rw-r--r--sys/mips/conf/XLR1
-rw-r--r--sys/mips/conf/XLR642
-rw-r--r--sys/mips/conf/XLRN321
13 files changed, 0 insertions, 18 deletions
diff --git a/sys/mips/conf/AR71XX_BASE b/sys/mips/conf/AR71XX_BASE
index 4b447cf..78905f5 100644
--- a/sys/mips/conf/AR71XX_BASE
+++ b/sys/mips/conf/AR71XX_BASE
@@ -10,7 +10,6 @@
machine mips mipseb
ident AR71XX_BASE
cpu CPU_MIPS4KC
-options ISA_MIPS32
makeoptions TARGET_BIG_ENDIAN
makeoptions KERNLOADADDR=0x80050000
options HZ=1000
diff --git a/sys/mips/conf/AR91XX_BASE b/sys/mips/conf/AR91XX_BASE
index d97b234..571f974 100644
--- a/sys/mips/conf/AR91XX_BASE
+++ b/sys/mips/conf/AR91XX_BASE
@@ -13,7 +13,6 @@
machine mips mipseb
ident AR91XX_BASE
cpu CPU_MIPS4KC
-options ISA_MIPS32
makeoptions KERNLOADADDR=0x80050000
options HZ=1000
diff --git a/sys/mips/conf/MALTA b/sys/mips/conf/MALTA
index 27598fb..54ece74 100644
--- a/sys/mips/conf/MALTA
+++ b/sys/mips/conf/MALTA
@@ -33,8 +33,6 @@ options TICK_USE_YAMON_FREQ=defined
include "../malta/std.malta"
-options ISA_MIPS32
-
hints "MALTA.hints" #Default places to look for devices.
makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols
diff --git a/sys/mips/conf/MALTA64 b/sys/mips/conf/MALTA64
index 45b6862..3f3ace0 100644
--- a/sys/mips/conf/MALTA64
+++ b/sys/mips/conf/MALTA64
@@ -33,8 +33,6 @@ options TICK_USE_YAMON_FREQ=defined
include "../malta/std.malta"
-options ISA_MIPS64
-
hints "MALTA.hints" #Default places to look for devices.
makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols
diff --git a/sys/mips/conf/OCTEON1 b/sys/mips/conf/OCTEON1
index 8357943..fe7d112 100644
--- a/sys/mips/conf/OCTEON1
+++ b/sys/mips/conf/OCTEON1
@@ -37,9 +37,6 @@ makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols
#options OCTEON_VENDOR_LANNER # Support for Lanner boards.
#options OCTEON_BOARD_CAPK_0100ND # Support for CAPK-0100nd.
-# XXX This option is very nearly irrelevant.
-options ISA_MIPS64
-
options SCHED_ULE # ULE scheduler
options PREEMPTION # Enable kernel thread preemption
options INET # InterNETworking
diff --git a/sys/mips/conf/SWARM b/sys/mips/conf/SWARM
index 53c9e52..10d6a12 100644
--- a/sys/mips/conf/SWARM
+++ b/sys/mips/conf/SWARM
@@ -7,7 +7,6 @@ include "std.SWARM"
ident SWARM
machine mips mipseb
-options ISA_MIPS32
makeoptions ARCH_FLAGS="-mabi=32 -march=mips32"
makeoptions LDSCRIPT_NAME= ldscript.mips.cfe
diff --git a/sys/mips/conf/SWARM_SMP b/sys/mips/conf/SWARM_SMP
index 59bf57d..a3ec092 100644
--- a/sys/mips/conf/SWARM_SMP
+++ b/sys/mips/conf/SWARM_SMP
@@ -10,7 +10,6 @@ options SMP
options PRINTF_BUFR_SIZE=128
machine mips mipseb
-options ISA_MIPS32
makeoptions ARCH_FLAGS="-mabi=32 -march=mips32"
makeoptions LDSCRIPT_NAME= ldscript.mips.cfe
diff --git a/sys/mips/conf/XLP b/sys/mips/conf/XLP
index b6cef20..9c1de77 100644
--- a/sys/mips/conf/XLP
+++ b/sys/mips/conf/XLP
@@ -20,7 +20,6 @@
machine mips mipseb
ident XLP
-options ISA_MIPS32
makeoptions KERNLOADADDR=0x80100000
include "std.XLP"
diff --git a/sys/mips/conf/XLP64 b/sys/mips/conf/XLP64
index 9080e24..165eb75 100644
--- a/sys/mips/conf/XLP64
+++ b/sys/mips/conf/XLP64
@@ -20,7 +20,6 @@
machine mips mips64eb
ident XLP64
-options ISA_MIPS64
makeoptions ARCH_FLAGS="-march=mips64r2 -mabi=64"
makeoptions KERNLOADADDR=0xffffffff80100000
diff --git a/sys/mips/conf/XLPN32 b/sys/mips/conf/XLPN32
index d196f85..74c3627 100644
--- a/sys/mips/conf/XLPN32
+++ b/sys/mips/conf/XLPN32
@@ -20,7 +20,6 @@
machine mips mipsn32eb
ident XLPN32
-options ISA_MIPS64
makeoptions ARCH_FLAGS="-march=mips64 -mabi=n32"
makeoptions KERNLOADADDR=0x80100000
diff --git a/sys/mips/conf/XLR b/sys/mips/conf/XLR
index 16845f4..a13235f 100644
--- a/sys/mips/conf/XLR
+++ b/sys/mips/conf/XLR
@@ -53,7 +53,6 @@ makeoptions MODULES_OVERRIDE=""
makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
makeoptions KERNLOADADDR=0x80100000
#profile 2
-options ISA_MIPS32
options SCHED_ULE # ULE scheduler
#options VERBOSE_SYSINIT
diff --git a/sys/mips/conf/XLR64 b/sys/mips/conf/XLR64
index aa3c1b3..6616245 100644
--- a/sys/mips/conf/XLR64
+++ b/sys/mips/conf/XLR64
@@ -26,8 +26,6 @@ makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
makeoptions ARCH_FLAGS="-march=mips64 -mabi=64"
makeoptions KERNLOADADDR=0xffffffff80100000
-options ISA_MIPS64
-
#profile 2
options SCHED_ULE # ULE scheduler
diff --git a/sys/mips/conf/XLRN32 b/sys/mips/conf/XLRN32
index eecab94..6b733cd 100644
--- a/sys/mips/conf/XLRN32
+++ b/sys/mips/conf/XLRN32
@@ -26,7 +26,6 @@ makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols
makeoptions ARCH_FLAGS="-march=mips64 -mabi=n32"
makeoptions KERNLOADADDR=0x80100000
-options ISA_MIPS64
#profile 2
options SCHED_ULE # ULE scheduler
OpenPOWER on IntegriCloud