Remove the 'machine mips' from DEFAULTS. Put the proper 'machine mips

mipsel' or 'machine mips mipseb' into the config file (with a few 64's
tossed in for good measure).  This will let us build the proper
kernels with different worlds as part of make universe.

25 files changed, 50 insertions, 42 deletions

diff --git a/sys/mips/adm5120/std.adm5120 b/sys/mips/adm5120/std.adm5120
index 59bf118..c76a393 100644
--- a/sys/mips/adm5120/std.adm5120
+++ b/sys/mips/adm5120/std.adm5120
@@ -1,11 +1,13 @@
 # $FreeBSD$
+#
 # Standard include file for ADM5120
 
-files	"../adm5120/files.adm5120"
+files		"../adm5120/files.adm5120"
 
+machine		mips mipsel
 cpu		CPU_MIPS4KC
 options		ISA_MIPS32
 
-# device		admpci
+# device 	admpci
 device		admsw
 device		pci
diff --git a/sys/mips/alchemy/std.alchemy b/sys/mips/alchemy/std.alchemy
index a955b67..82f0886 100644
--- a/sys/mips/alchemy/std.alchemy
+++ b/sys/mips/alchemy/std.alchemy
@@ -4,5 +4,6 @@
 
 files	"../alchemy/files.alchemy"
 
+machine		mips mipsel
 cpu		CPU_MIPS4KC
 options		ISA_MIPS32
diff --git a/sys/mips/atheros/std.ar71xx b/sys/mips/atheros/std.ar71xx
new file mode 100644
index 0000000..14859e0
--- /dev/null
+++ b/sys/mips/atheros/std.ar71xx
@@ -0,0 +1,9 @@
+# $FreeBSD$
+#
+# standard config for all ar71xx based kernels.
+
+files		"../atheros/files.ar71xx"
+
+machine		mips mipseb
+cpu		CPU_MIPS4KC
+options 	ISA_MIPS32
diff --git a/sys/mips/cavium/std.octeon1 b/sys/mips/cavium/std.octeon1
index 7b3152f..a99c6df 100644
--- a/sys/mips/cavium/std.octeon1
+++ b/sys/mips/cavium/std.octeon1
@@ -5,3 +5,5 @@
 # $FreeBSD$
 # 
 files	"../cavium/files.octeon1"
+machine	mips mips64eb
+cpu		CPU_CNMIPS
diff --git a/sys/mips/conf/ADM5120 b/sys/mips/conf/ADM5120
index a834c16..23ff643 100644
--- a/sys/mips/conf/ADM5120
+++ b/sys/mips/conf/ADM5120
@@ -19,9 +19,6 @@
 
 ident		ADM5120
 
-#makeoptions	ARCH_FLAGS=-march=mips32
-makeoptions	MIPS_LITTLE_ENDIAN=defined
-
 # Don't build any modules yet.
 makeoptions	MODULES_OVERRIDE=""
 
diff --git a/sys/mips/conf/ALCHEMY b/sys/mips/conf/ALCHEMY
index 8fa6070..db34318 100644
--- a/sys/mips/conf/ALCHEMY
+++ b/sys/mips/conf/ALCHEMY
@@ -19,9 +19,6 @@
 
 ident		ALCHEMY
 
-makeoptions	ARCH_FLAGS=-march=mips32
-makeoptions	MIPS_LITTLE_ENDIAN=defined
-
 # Don't build any modules yet.
 makeoptions	MODULES_OVERRIDE=""
 
diff --git a/sys/mips/conf/AR71XX b/sys/mips/conf/AR71XX
index bec8120..ffdf539 100644
--- a/sys/mips/conf/AR71XX
+++ b/sys/mips/conf/AR71XX
@@ -5,14 +5,11 @@
 #
 
 ident		AR71XX
-cpu		CPU_MIPS4KC
-options 	ISA_MIPS32
-makeoptions	TARGET_BIG_ENDIAN
 makeoptions	KERNLOADADDR=0x80050000
 options		HZ=1000
 
-files		"../atheros/files.ar71xx"
 hints		"AR71XX.hints"
+include		"../atheros/std.ar71xx"
 
 makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 #makeoptions	MODULES_OVERRIDE=""
diff --git a/sys/mips/conf/DEFAULTS b/sys/mips/conf/DEFAULTS
index dc480ce..f09ef54 100644
--- a/sys/mips/conf/DEFAULTS
+++ b/sys/mips/conf/DEFAULTS
@@ -3,8 +3,6 @@
 #
 # $FreeBSD$
 
-machine 	mips
-
 device		mem
 
 device		uart_ns8250
diff --git a/sys/mips/conf/MALTA b/sys/mips/conf/MALTA
index 77e072c..89ebac5 100644
--- a/sys/mips/conf/MALTA
+++ b/sys/mips/conf/MALTA
@@ -19,8 +19,8 @@
 
 ident		MALTA
 
-#makeoptions	ARCH_FLAGS=-march=mips32
-makeoptions	MIPS_LITTLE_ENDIAN=defined
+machine		mips mipsel	# Malta supports both, so it isn't in std.malta
+
 makeoptions	KERNLOADADDR=0x80100000
 
 options 	YAMON
diff --git a/sys/mips/conf/MALTA64 b/sys/mips/conf/MALTA64
index 65b1e98..26376b0 100644
--- a/sys/mips/conf/MALTA64
+++ b/sys/mips/conf/MALTA64
@@ -19,8 +19,9 @@
 
 ident		MALTA
 
+machine		mips mips64el	# Malta supports both, so it isn't in std.malta
+
 makeoptions	ARCH_FLAGS="-march=mips64 -mabi=64"
-makeoptions	MIPS_LITTLE_ENDIAN=defined
 makeoptions	LDSCRIPT_NAME=	ldscript.mips.mips64
 
 options 	YAMON
diff --git a/sys/mips/conf/OCTEON1 b/sys/mips/conf/OCTEON1
index a00e95d..9028ba0 100644
--- a/sys/mips/conf/OCTEON1
+++ b/sys/mips/conf/OCTEON1
@@ -18,7 +18,6 @@
 #
 # $FreeBSD$
 
-machine		mips
 cpu		CPU_CNMIPS
 ident		OCTEON1
 
@@ -27,7 +26,6 @@ makeoptions	LDSCRIPT_NAME=ldscript.mips.octeon1.64
 
 # Don't build any modules yet.
 makeoptions	MODULES_OVERRIDE=""
-makeoptions	TARGET_BIG_ENDIAN=defined
 makeoptions	KERNLOADADDR=0xffffffff80100000
 
 include		"../cavium/std.octeon1"
diff --git a/sys/mips/conf/OCTEON1-32 b/sys/mips/conf/OCTEON1-32
index 3fe7d61..dce780d 100644
--- a/sys/mips/conf/OCTEON1-32
+++ b/sys/mips/conf/OCTEON1-32
@@ -17,18 +17,16 @@
 #
 # $FreeBSD$
 
-machine		mips
-cpu		CPU_CNMIPS
-ident		OCTEON1
+ident		OCTEON1-32
 
 # Don't build any modules yet.
 makeoptions	MODULES_OVERRIDE=""
-makeoptions	TARGET_BIG_ENDIAN=defined
 makeoptions	ARCH_FLAGS="-march=octeon"
 makeoptions	LDSCRIPT_NAME=ldscript.mips.octeon1.32
 
 makeoptions	KERNLOADADDR=0x81000000
 include		"../cavium/std.octeon1"
+machine		mips mipseb
 
 hints		"OCTEON1.hints"		#Default places to look for devices.
 
diff --git a/sys/mips/conf/QEMU b/sys/mips/conf/QEMU
index ebb09f8..fde9085 100644
--- a/sys/mips/conf/QEMU
+++ b/sys/mips/conf/QEMU
@@ -20,10 +20,6 @@
 cpu		CPU_MIPS32
 ident		QEMU
 
-# XXX: These two options must be defined in MIPS kernel configs.
-makeoptions	MIPS_LITTLE_ENDIAN=defined
-makeoptions	ARCH_FLAGS=-march=mips32
-
 # Don't build any modules yet.
 makeoptions	MODULES_OVERRIDE=""
 
diff --git a/sys/mips/conf/SENTRY5 b/sys/mips/conf/SENTRY5
index c38e45f..0f6aa16 100644
--- a/sys/mips/conf/SENTRY5
+++ b/sys/mips/conf/SENTRY5
@@ -25,14 +25,9 @@
 #
 
 ident		SENTRY5
-cpu		CPU_MIPS4KC
-options 	ISA_MIPS32
-options		CPU_SENTRY5			# XXX should this be a
-						# sub-cpu option?
 
 # XXX only siba should be hardwired for now; we will use
 # bus enumeration there
-files		"../sentry5/files.sentry5"
 hints		"SENTRY5.hints"
 
 # sentry5 normally ships with cfe firmware; use the console for now
@@ -40,8 +35,6 @@ options		CFE
 options		CFE_CONSOLE
 options		ALT_BREAK_TO_DEBUGGER
 
-#makeoptions	ARCH_FLAGS=-march=mips32
-makeoptions	MIPS_LITTLE_ENDIAN=defined
 makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 makeoptions	MODULES_OVERRIDE=""
 
@@ -56,18 +49,18 @@ options		PSEUDOFS		#Pseudo-filesystem framework
 options		_KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
 
 # Debugging for use in -current
-#options		DEADLKRES
+#options 	DEADLKRES
 options		INVARIANTS
 options		INVARIANT_SUPPORT
 
-#options		BUS_DEBUG
+#options 	BUS_DEBUG
 #makeoptions	BUS_DEBUG
 
 device		siba			# Sonics SiliconBackplane
 device		pci			# siba_pcib
 
-# device		bfe			# XXX will build both pci and siba
-# device		miibus			# attachments
+# device 	bfe			# XXX will build both pci and siba
+# device 	miibus			# attachments
 
 # pci devices
 # notyet:
diff --git a/sys/mips/conf/SWARM b/sys/mips/conf/SWARM
index 6db2181..8c304fc 100644
--- a/sys/mips/conf/SWARM
+++ b/sys/mips/conf/SWARM
@@ -6,6 +6,7 @@ include		std.SWARM
 
 ident		SWARM
 
+machine		mips mipseb
 options		ISA_MIPS32
 
 makeoptions	ARCH_FLAGS="-mabi=32 -march=mips32"
diff --git a/sys/mips/conf/SWARM64 b/sys/mips/conf/SWARM64
index af04269..21cce4a 100644
--- a/sys/mips/conf/SWARM64
+++ b/sys/mips/conf/SWARM64
@@ -6,6 +6,7 @@ include		std.SWARM
 
 ident		SWARM64
 
+machine		mips mips64eb
 makeoptions	ARCH_FLAGS="-mabi=64 -march=mips64"
 makeoptions	LDSCRIPT_NAME=ldscript.mips.64.cfe
 makeoptions	KERNLOADADDR=0xffffffff80001000
diff --git a/sys/mips/conf/SWARM64_SMP b/sys/mips/conf/SWARM64_SMP
index 7985210..35b1a5e 100644
--- a/sys/mips/conf/SWARM64_SMP
+++ b/sys/mips/conf/SWARM64_SMP
@@ -9,6 +9,7 @@ ident		SWARM64_SMP
 options		SMP
 options		PRINTF_BUFR_SIZE=128
 
+machine		mips mips64eb
 makeoptions	ARCH_FLAGS="-mabi=64 -march=mips64"
 makeoptions	LDSCRIPT_NAME=ldscript.mips.64.cfe
 makeoptions	KERNLOADADDR=0xffffffff80001000
diff --git a/sys/mips/conf/SWARM_SMP b/sys/mips/conf/SWARM_SMP
index 925f1bb..0906501 100644
--- a/sys/mips/conf/SWARM_SMP
+++ b/sys/mips/conf/SWARM_SMP
@@ -9,6 +9,7 @@ ident		SWARM_SMP
 options		SMP
 options		PRINTF_BUFR_SIZE=128
 
+machine		mips mipseb
 options		ISA_MIPS32
 
 makeoptions	ARCH_FLAGS="-mabi=32 -march=mips32"
diff --git a/sys/mips/conf/XLR b/sys/mips/conf/XLR
index 34551d8..3df81c4 100644
--- a/sys/mips/conf/XLR
+++ b/sys/mips/conf/XLR
@@ -45,7 +45,7 @@
 #
 # $FreeBSD$
 
-machine 	mips
+machine 	mips mipseb
 cpu 		CPU_RMI
 ident 		XLR
 
diff --git a/sys/mips/conf/XLR64 b/sys/mips/conf/XLR64
index 4bc8794..3d18f0c 100644
--- a/sys/mips/conf/XLR64
+++ b/sys/mips/conf/XLR64
@@ -17,7 +17,7 @@
 #
 # $FreeBSD$
 
-machine 	mips
+machine 	mips mips64eb
 cpu 		CPU_RMI
 ident 		XLR64
 
diff --git a/sys/mips/conf/XLRN32 b/sys/mips/conf/XLRN32
index d26a1a4..313db52 100644
--- a/sys/mips/conf/XLRN32
+++ b/sys/mips/conf/XLRN32
@@ -17,7 +17,7 @@
 #
 # $FreeBSD$
 
-machine 	mips
+machine 	mips mipseb
 cpu 		CPU_RMI
 ident 		XLRN32
 
diff --git a/sys/mips/conf/std.SWARM b/sys/mips/conf/std.SWARM
index 1d22e3c..5ffcde0 100644
--- a/sys/mips/conf/std.SWARM
+++ b/sys/mips/conf/std.SWARM
@@ -2,8 +2,8 @@
 # $FreeBSD$
 #
 
-files		"../sibyte/files.sibyte"
 hints		"SWARM.hints"
+include		"../sibyte/std.sibyte"
 
 options		CFE
 options		CFE_CONSOLE
diff --git a/sys/mips/idt/std.idt b/sys/mips/idt/std.idt
index e40f4a4..83eba1f 100644
--- a/sys/mips/idt/std.idt
+++ b/sys/mips/idt/std.idt
@@ -3,4 +3,5 @@
 
 files	"../idt/files.idt"
 
+machine		mips mipsel
 options		ISA_MIPS32
diff --git a/sys/mips/sentry5/std.sentry5 b/sys/mips/sentry5/std.sentry5
new file mode 100644
index 0000000..0cf3655
--- /dev/null
+++ b/sys/mips/sentry5/std.sentry5
@@ -0,0 +1,11 @@
+# $FreeBSD$
+#
+
+machine		mips mipsel
+
+cpu		CPU_MIPS4KC
+options 	ISA_MIPS32
+options		CPU_SENTRY5			# XXX should this be a
+						# sub-cpu option?
+files		"../sentry5/files.sentry5"
+
diff --git a/sys/mips/sibyte/std.sibyte b/sys/mips/sibyte/std.sibyte
new file mode 100644
index 0000000..3f31153
--- /dev/null
+++ b/sys/mips/sibyte/std.sibyte
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+files		"../sibyte/files.sibyte"