summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/conf/kern.pre.mk2
-rw-r--r--sys/conf/kmod.mk2
-rw-r--r--sys/mips/atheros/std.ar71xx2
-rw-r--r--sys/mips/cavium/std.octeon12
-rw-r--r--sys/mips/conf/AR71XX_BASE2
-rw-r--r--sys/mips/conf/AR91XX_BASE2
-rw-r--r--sys/mips/conf/SWARM2
-rw-r--r--sys/mips/conf/SWARM642
-rw-r--r--sys/mips/conf/SWARM64_SMP2
-rw-r--r--sys/mips/conf/SWARM_SMP2
-rw-r--r--sys/mips/conf/XLP2
-rw-r--r--sys/mips/conf/XLP642
-rw-r--r--sys/mips/conf/XLPN322
-rw-r--r--sys/mips/conf/XLR2
-rw-r--r--sys/mips/conf/XLR642
-rw-r--r--sys/mips/conf/XLRN322
-rw-r--r--sys/mips/include/param.h8
17 files changed, 20 insertions, 20 deletions
diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk
index b093428..f50a2a0 100644
--- a/sys/conf/kern.pre.mk
+++ b/sys/conf/kern.pre.mk
@@ -6,7 +6,7 @@
.include <bsd.own.mk>
# backwards compat option for older systems.
-MACHINE_CPUARCH?=${MACHINE_ARCH:C/mipse[lb]/mips/:C/armeb/arm/:C/powerpc64/powerpc/}
+MACHINE_CPUARCH?=${MACHINE_ARCH:C/mips(n32|64)?(el)?/mips/:C/armeb/arm/:C/powerpc64/powerpc/}
# Can be overridden by makeoptions or /etc/make.conf
KERNEL_KO?= kernel
diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk
index cb460ee..929cec6 100644
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
@@ -61,7 +61,7 @@
#
# backwards compat option for older systems.
-MACHINE_CPUARCH?=${MACHINE_ARCH:C/mipse[lb]/mips/:C/armeb/arm/:C/powerpc64/powerpc/}
+MACHINE_CPUARCH?=${MACHINE_ARCH:C/mips(n32|64)?(el)?/mips/:C/armeb/arm/:C/powerpc64/powerpc/}
AWK?= awk
KMODLOAD?= /sbin/kldload
diff --git a/sys/mips/atheros/std.ar71xx b/sys/mips/atheros/std.ar71xx
index b437719..2ba920c 100644
--- a/sys/mips/atheros/std.ar71xx
+++ b/sys/mips/atheros/std.ar71xx
@@ -4,5 +4,5 @@
files "../atheros/files.ar71xx"
-machine mips mipseb
+machine mips mips
cpu CPU_MIPS4KC
diff --git a/sys/mips/cavium/std.octeon1 b/sys/mips/cavium/std.octeon1
index a99c6df..8f8a54a 100644
--- a/sys/mips/cavium/std.octeon1
+++ b/sys/mips/cavium/std.octeon1
@@ -5,5 +5,5 @@
# $FreeBSD$
#
files "../cavium/files.octeon1"
-machine mips mips64eb
+machine mips mips64
cpu CPU_CNMIPS
diff --git a/sys/mips/conf/AR71XX_BASE b/sys/mips/conf/AR71XX_BASE
index 4e5a794..65d01254 100644
--- a/sys/mips/conf/AR71XX_BASE
+++ b/sys/mips/conf/AR71XX_BASE
@@ -7,7 +7,7 @@
# $FreeBSD$
#
-machine mips mipseb
+machine mips mips
ident AR71XX_BASE
cpu CPU_MIPS4KC
makeoptions KERNLOADADDR=0x80050000
diff --git a/sys/mips/conf/AR91XX_BASE b/sys/mips/conf/AR91XX_BASE
index 571f974..12e8d3f 100644
--- a/sys/mips/conf/AR91XX_BASE
+++ b/sys/mips/conf/AR91XX_BASE
@@ -10,7 +10,7 @@
# $FreeBSD$
#
-machine mips mipseb
+machine mips mips
ident AR91XX_BASE
cpu CPU_MIPS4KC
makeoptions KERNLOADADDR=0x80050000
diff --git a/sys/mips/conf/SWARM b/sys/mips/conf/SWARM
index 10d6a12..16766a4 100644
--- a/sys/mips/conf/SWARM
+++ b/sys/mips/conf/SWARM
@@ -6,7 +6,7 @@ include "std.SWARM"
ident SWARM
-machine mips mipseb
+machine mips mips
makeoptions ARCH_FLAGS="-mabi=32 -march=mips32"
makeoptions LDSCRIPT_NAME= ldscript.mips.cfe
diff --git a/sys/mips/conf/SWARM64 b/sys/mips/conf/SWARM64
index 30c59d0..5f69124 100644
--- a/sys/mips/conf/SWARM64
+++ b/sys/mips/conf/SWARM64
@@ -6,7 +6,7 @@ include "std.SWARM"
ident SWARM64
-machine mips mips64eb
+machine mips mips64
makeoptions ARCH_FLAGS="-mabi=64 -march=mips64"
makeoptions LDSCRIPT_NAME=ldscript.mips.cfe
makeoptions KERNLOADADDR=0xffffffff80001000
diff --git a/sys/mips/conf/SWARM64_SMP b/sys/mips/conf/SWARM64_SMP
index 708559f..b4cd666 100644
--- a/sys/mips/conf/SWARM64_SMP
+++ b/sys/mips/conf/SWARM64_SMP
@@ -9,7 +9,7 @@ ident SWARM64_SMP
options SMP
options PRINTF_BUFR_SIZE=128
-machine mips mips64eb
+machine mips mips64
makeoptions ARCH_FLAGS="-mabi=64 -march=mips64"
makeoptions LDSCRIPT_NAME=ldscript.mips.cfe
makeoptions KERNLOADADDR=0xffffffff80001000
diff --git a/sys/mips/conf/SWARM_SMP b/sys/mips/conf/SWARM_SMP
index a3ec092..d4f1541 100644
--- a/sys/mips/conf/SWARM_SMP
+++ b/sys/mips/conf/SWARM_SMP
@@ -9,7 +9,7 @@ ident SWARM_SMP
options SMP
options PRINTF_BUFR_SIZE=128
-machine mips mipseb
+machine mips mips
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 9c1de77..6105fa0 100644
--- a/sys/mips/conf/XLP
+++ b/sys/mips/conf/XLP
@@ -17,7 +17,7 @@
#
# $FreeBSD$
-machine mips mipseb
+machine mips mips
ident XLP
makeoptions KERNLOADADDR=0x80100000
diff --git a/sys/mips/conf/XLP64 b/sys/mips/conf/XLP64
index 165eb75..adefda5 100644
--- a/sys/mips/conf/XLP64
+++ b/sys/mips/conf/XLP64
@@ -17,7 +17,7 @@
#
# $FreeBSD$
-machine mips mips64eb
+machine mips mips64
ident XLP64
makeoptions ARCH_FLAGS="-march=mips64r2 -mabi=64"
diff --git a/sys/mips/conf/XLPN32 b/sys/mips/conf/XLPN32
index 74c3627..2b345f8 100644
--- a/sys/mips/conf/XLPN32
+++ b/sys/mips/conf/XLPN32
@@ -17,7 +17,7 @@
#
# $FreeBSD$
-machine mips mipsn32eb
+machine mips mipsn32
ident XLPN32
makeoptions ARCH_FLAGS="-march=mips64 -mabi=n32"
diff --git a/sys/mips/conf/XLR b/sys/mips/conf/XLR
index 98fd11a..df6bdff 100644
--- a/sys/mips/conf/XLR
+++ b/sys/mips/conf/XLR
@@ -45,7 +45,7 @@
#
# $FreeBSD$
-machine mips mipseb
+machine mips mips
ident XLR
include "../rmi/std.xlr"
diff --git a/sys/mips/conf/XLR64 b/sys/mips/conf/XLR64
index 6480c59..e137022 100644
--- a/sys/mips/conf/XLR64
+++ b/sys/mips/conf/XLR64
@@ -17,7 +17,7 @@
#
# $FreeBSD$
-machine mips mips64eb
+machine mips mips64
ident XLR64
include "../rmi/std.xlr"
diff --git a/sys/mips/conf/XLRN32 b/sys/mips/conf/XLRN32
index 605893e..c6f2602 100644
--- a/sys/mips/conf/XLRN32
+++ b/sys/mips/conf/XLRN32
@@ -17,7 +17,7 @@
#
# $FreeBSD$
-machine mips mipsn32eb
+machine mips mipsn32
ident XLRN32
include "../rmi/std.xlr"
diff --git a/sys/mips/include/param.h b/sys/mips/include/param.h
index bd6d800..c700a44 100644
--- a/sys/mips/include/param.h
+++ b/sys/mips/include/param.h
@@ -59,14 +59,14 @@
#ifndef MACHINE_ARCH
#if _BYTE_ORDER == _BIG_ENDIAN
#ifdef __mips_n64
-#define MACHINE_ARCH "mips64eb"
+#define MACHINE_ARCH "mips64"
#ifndef MACHINE_ARCH32
-#define MACHINE_ARCH32 "mipseb"
+#define MACHINE_ARCH32 "mips"
#endif
#elif defined(__mips_n32)
-#define MACHINE_ARCH "mipsn32eb"
+#define MACHINE_ARCH "mipsn32"
#else
-#define MACHINE_ARCH "mipseb"
+#define MACHINE_ARCH "mips"
#endif
#else
#ifdef __mips_n64
OpenPOWER on IntegriCloud