svn commit: r215270 - in head/sys/mips: adm5120 alchemy atheros
cavium conf idt sentry5 sibyte
Warner Losh
imp at FreeBSD.org
Sat Nov 13 22:34:12 UTC 2010
Author: imp
Date: Sat Nov 13 22:34:12 2010
New Revision: 215270
URL: http://svn.freebsd.org/changeset/base/215270
Log:
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.
Added:
head/sys/mips/atheros/std.ar71xx (contents, props changed)
head/sys/mips/sentry5/std.sentry5 (contents, props changed)
head/sys/mips/sibyte/std.sibyte (contents, props changed)
Modified:
head/sys/mips/adm5120/std.adm5120
head/sys/mips/alchemy/std.alchemy
head/sys/mips/cavium/std.octeon1
head/sys/mips/conf/ADM5120
head/sys/mips/conf/ALCHEMY
head/sys/mips/conf/AR71XX
head/sys/mips/conf/DEFAULTS
head/sys/mips/conf/MALTA
head/sys/mips/conf/MALTA64
head/sys/mips/conf/OCTEON1
head/sys/mips/conf/OCTEON1-32
head/sys/mips/conf/QEMU
head/sys/mips/conf/SENTRY5
head/sys/mips/conf/SWARM
head/sys/mips/conf/SWARM64
head/sys/mips/conf/SWARM64_SMP
head/sys/mips/conf/SWARM_SMP
head/sys/mips/conf/XLR
head/sys/mips/conf/XLR64
head/sys/mips/conf/XLRN32
head/sys/mips/conf/std.SWARM
head/sys/mips/idt/std.idt
Modified: head/sys/mips/adm5120/std.adm5120
==============================================================================
--- head/sys/mips/adm5120/std.adm5120 Sat Nov 13 22:22:18 2010 (r215269)
+++ head/sys/mips/adm5120/std.adm5120 Sat Nov 13 22:34:12 2010 (r215270)
@@ -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
Modified: head/sys/mips/alchemy/std.alchemy
==============================================================================
--- head/sys/mips/alchemy/std.alchemy Sat Nov 13 22:22:18 2010 (r215269)
+++ head/sys/mips/alchemy/std.alchemy Sat Nov 13 22:34:12 2010 (r215270)
@@ -4,5 +4,6 @@
files "../alchemy/files.alchemy"
+machine mips mipsel
cpu CPU_MIPS4KC
options ISA_MIPS32
Added: head/sys/mips/atheros/std.ar71xx
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/mips/atheros/std.ar71xx Sat Nov 13 22:34:12 2010 (r215270)
@@ -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
Modified: head/sys/mips/cavium/std.octeon1
==============================================================================
--- head/sys/mips/cavium/std.octeon1 Sat Nov 13 22:22:18 2010 (r215269)
+++ head/sys/mips/cavium/std.octeon1 Sat Nov 13 22:34:12 2010 (r215270)
@@ -5,3 +5,5 @@
# $FreeBSD$
#
files "../cavium/files.octeon1"
+machine mips mips64eb
+cpu CPU_CNMIPS
Modified: head/sys/mips/conf/ADM5120
==============================================================================
--- head/sys/mips/conf/ADM5120 Sat Nov 13 22:22:18 2010 (r215269)
+++ head/sys/mips/conf/ADM5120 Sat Nov 13 22:34:12 2010 (r215270)
@@ -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=""
Modified: head/sys/mips/conf/ALCHEMY
==============================================================================
--- head/sys/mips/conf/ALCHEMY Sat Nov 13 22:22:18 2010 (r215269)
+++ head/sys/mips/conf/ALCHEMY Sat Nov 13 22:34:12 2010 (r215270)
@@ -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=""
Modified: head/sys/mips/conf/AR71XX
==============================================================================
--- head/sys/mips/conf/AR71XX Sat Nov 13 22:22:18 2010 (r215269)
+++ head/sys/mips/conf/AR71XX Sat Nov 13 22:34:12 2010 (r215270)
@@ -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=""
Modified: head/sys/mips/conf/DEFAULTS
==============================================================================
--- head/sys/mips/conf/DEFAULTS Sat Nov 13 22:22:18 2010 (r215269)
+++ head/sys/mips/conf/DEFAULTS Sat Nov 13 22:34:12 2010 (r215270)
@@ -3,8 +3,6 @@
#
# $FreeBSD$
-machine mips
-
device mem
device uart_ns8250
Modified: head/sys/mips/conf/MALTA
==============================================================================
--- head/sys/mips/conf/MALTA Sat Nov 13 22:22:18 2010 (r215269)
+++ head/sys/mips/conf/MALTA Sat Nov 13 22:34:12 2010 (r215270)
@@ -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
Modified: head/sys/mips/conf/MALTA64
==============================================================================
--- head/sys/mips/conf/MALTA64 Sat Nov 13 22:22:18 2010 (r215269)
+++ head/sys/mips/conf/MALTA64 Sat Nov 13 22:34:12 2010 (r215270)
@@ -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
Modified: head/sys/mips/conf/OCTEON1
==============================================================================
--- head/sys/mips/conf/OCTEON1 Sat Nov 13 22:22:18 2010 (r215269)
+++ head/sys/mips/conf/OCTEON1 Sat Nov 13 22:34:12 2010 (r215270)
@@ -18,7 +18,6 @@
#
# $FreeBSD$
-machine mips
cpu CPU_CNMIPS
ident OCTEON1
@@ -27,7 +26,6 @@ makeoptions LDSCRIPT_NAME=ldscript.mips.
# Don't build any modules yet.
makeoptions MODULES_OVERRIDE=""
-makeoptions TARGET_BIG_ENDIAN=defined
makeoptions KERNLOADADDR=0xffffffff80100000
include "../cavium/std.octeon1"
Modified: head/sys/mips/conf/OCTEON1-32
==============================================================================
--- head/sys/mips/conf/OCTEON1-32 Sat Nov 13 22:22:18 2010 (r215269)
+++ head/sys/mips/conf/OCTEON1-32 Sat Nov 13 22:34:12 2010 (r215270)
@@ -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.
Modified: head/sys/mips/conf/QEMU
==============================================================================
--- head/sys/mips/conf/QEMU Sat Nov 13 22:22:18 2010 (r215269)
+++ head/sys/mips/conf/QEMU Sat Nov 13 22:34:12 2010 (r215270)
@@ -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=""
Modified: head/sys/mips/conf/SENTRY5
==============================================================================
--- head/sys/mips/conf/SENTRY5 Sat Nov 13 22:22:18 2010 (r215269)
+++ head/sys/mips/conf/SENTRY5 Sat Nov 13 22:34:12 2010 (r215270)
@@ -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 fr
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:
Modified: head/sys/mips/conf/SWARM
==============================================================================
--- head/sys/mips/conf/SWARM Sat Nov 13 22:22:18 2010 (r215269)
+++ head/sys/mips/conf/SWARM Sat Nov 13 22:34:12 2010 (r215270)
@@ -6,6 +6,7 @@ include std.SWARM
ident SWARM
+machine mips mipseb
options ISA_MIPS32
makeoptions ARCH_FLAGS="-mabi=32 -march=mips32"
Modified: head/sys/mips/conf/SWARM64
==============================================================================
--- head/sys/mips/conf/SWARM64 Sat Nov 13 22:22:18 2010 (r215269)
+++ head/sys/mips/conf/SWARM64 Sat Nov 13 22:34:12 2010 (r215270)
@@ -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
Modified: head/sys/mips/conf/SWARM64_SMP
==============================================================================
--- head/sys/mips/conf/SWARM64_SMP Sat Nov 13 22:22:18 2010 (r215269)
+++ head/sys/mips/conf/SWARM64_SMP Sat Nov 13 22:34:12 2010 (r215270)
@@ -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
Modified: head/sys/mips/conf/SWARM_SMP
==============================================================================
--- head/sys/mips/conf/SWARM_SMP Sat Nov 13 22:22:18 2010 (r215269)
+++ head/sys/mips/conf/SWARM_SMP Sat Nov 13 22:34:12 2010 (r215270)
@@ -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"
Modified: head/sys/mips/conf/XLR
==============================================================================
--- head/sys/mips/conf/XLR Sat Nov 13 22:22:18 2010 (r215269)
+++ head/sys/mips/conf/XLR Sat Nov 13 22:34:12 2010 (r215270)
@@ -45,7 +45,7 @@
#
# $FreeBSD$
-machine mips
+machine mips mipseb
cpu CPU_RMI
ident XLR
Modified: head/sys/mips/conf/XLR64
==============================================================================
--- head/sys/mips/conf/XLR64 Sat Nov 13 22:22:18 2010 (r215269)
+++ head/sys/mips/conf/XLR64 Sat Nov 13 22:34:12 2010 (r215270)
@@ -17,7 +17,7 @@
#
# $FreeBSD$
-machine mips
+machine mips mips64eb
cpu CPU_RMI
ident XLR64
Modified: head/sys/mips/conf/XLRN32
==============================================================================
--- head/sys/mips/conf/XLRN32 Sat Nov 13 22:22:18 2010 (r215269)
+++ head/sys/mips/conf/XLRN32 Sat Nov 13 22:34:12 2010 (r215270)
@@ -17,7 +17,7 @@
#
# $FreeBSD$
-machine mips
+machine mips mipseb
cpu CPU_RMI
ident XLRN32
Modified: head/sys/mips/conf/std.SWARM
==============================================================================
--- head/sys/mips/conf/std.SWARM Sat Nov 13 22:22:18 2010 (r215269)
+++ head/sys/mips/conf/std.SWARM Sat Nov 13 22:34:12 2010 (r215270)
@@ -2,8 +2,8 @@
# $FreeBSD$
#
-files "../sibyte/files.sibyte"
hints "SWARM.hints"
+include "../sibyte/std.sibyte"
options CFE
options CFE_CONSOLE
Modified: head/sys/mips/idt/std.idt
==============================================================================
--- head/sys/mips/idt/std.idt Sat Nov 13 22:22:18 2010 (r215269)
+++ head/sys/mips/idt/std.idt Sat Nov 13 22:34:12 2010 (r215270)
@@ -3,4 +3,5 @@
files "../idt/files.idt"
+machine mips mipsel
options ISA_MIPS32
Added: head/sys/mips/sentry5/std.sentry5
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/mips/sentry5/std.sentry5 Sat Nov 13 22:34:12 2010 (r215270)
@@ -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"
+
Added: head/sys/mips/sibyte/std.sibyte
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/mips/sibyte/std.sibyte Sat Nov 13 22:34:12 2010 (r215270)
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+files "../sibyte/files.sibyte"
More information about the svn-src-all
mailing list