d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Warner Losh 2010-11-13 22:34:12 +00:00
parent 13ec45d644
commit 161b83b959
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=215270
25 changed files with 50 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/mips/adm5120/std.adm5120
View File

@ -1,11 +1,13 @@
# $FreeBSD$ # $FreeBSD$
#
# Standard include file for ADM5120 # Standard include file for ADM5120
files "../adm5120/files.adm5120" files "../adm5120/files.adm5120"
machine mips mipsel
cpu CPU_MIPS4KC cpu CPU_MIPS4KC
options ISA_MIPS32 options ISA_MIPS32
# device admpci # device admpci
device admsw device admsw
device pci device pci

1
sys/mips/alchemy/std.alchemy
View File

@ -4,5 +4,6 @@
files "../alchemy/files.alchemy" files "../alchemy/files.alchemy"
machine mips mipsel
cpu CPU_MIPS4KC cpu CPU_MIPS4KC
options ISA_MIPS32 options ISA_MIPS32

9
sys/mips/atheros/std.ar71xx Normal file
View File

@ -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

2
sys/mips/cavium/std.octeon1
View File

@ -5,3 +5,5 @@
# $FreeBSD$ # $FreeBSD$
# #
files "../cavium/files.octeon1" files "../cavium/files.octeon1"
machine mips mips64eb
cpu CPU_CNMIPS

3
sys/mips/conf/ADM5120
View File

@ -19,9 +19,6 @@
ident ADM5120 ident ADM5120
#makeoptions ARCH_FLAGS=-march=mips32
makeoptions MIPS_LITTLE_ENDIAN=defined
# Don't build any modules yet. # Don't build any modules yet.
makeoptions MODULES_OVERRIDE="" makeoptions MODULES_OVERRIDE=""

3
sys/mips/conf/ALCHEMY
View File

@ -19,9 +19,6 @@
ident ALCHEMY ident ALCHEMY
makeoptions ARCH_FLAGS=-march=mips32
makeoptions MIPS_LITTLE_ENDIAN=defined
# Don't build any modules yet. # Don't build any modules yet.
makeoptions MODULES_OVERRIDE="" makeoptions MODULES_OVERRIDE=""

5
sys/mips/conf/AR71XX
View File

@ -5,14 +5,11 @@
# #
ident AR71XX ident AR71XX
cpu CPU_MIPS4KC
options ISA_MIPS32
makeoptions TARGET_BIG_ENDIAN
makeoptions KERNLOADADDR=0x80050000 makeoptions KERNLOADADDR=0x80050000
options HZ=1000 options HZ=1000
files "../atheros/files.ar71xx"
hints "AR71XX.hints" hints "AR71XX.hints"
include "../atheros/std.ar71xx"
makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols
#makeoptions MODULES_OVERRIDE="" #makeoptions MODULES_OVERRIDE=""

2
sys/mips/conf/DEFAULTS
View File

@ -3,8 +3,6 @@
# #
# $FreeBSD$ # $FreeBSD$
machine mips
device mem device mem
device uart_ns8250 device uart_ns8250

4
sys/mips/conf/MALTA
View File

@ -19,8 +19,8 @@
ident MALTA ident MALTA
#makeoptions ARCH_FLAGS=-march=mips32 machine mips mipsel # Malta supports both, so it isn't in std.malta
makeoptions MIPS_LITTLE_ENDIAN=defined
makeoptions KERNLOADADDR=0x80100000 makeoptions KERNLOADADDR=0x80100000
options YAMON options YAMON

3
sys/mips/conf/MALTA64
View File

@ -19,8 +19,9 @@
ident MALTA ident MALTA
machine mips mips64el # Malta supports both, so it isn't in std.malta
makeoptions ARCH_FLAGS="-march=mips64 -mabi=64" makeoptions ARCH_FLAGS="-march=mips64 -mabi=64"
makeoptions MIPS_LITTLE_ENDIAN=defined
makeoptions LDSCRIPT_NAME= ldscript.mips.mips64 makeoptions LDSCRIPT_NAME= ldscript.mips.mips64
options YAMON options YAMON

2
sys/mips/conf/OCTEON1
View File

@ -18,7 +18,6 @@
# #
# $FreeBSD$ # $FreeBSD$
machine mips
cpu CPU_CNMIPS cpu CPU_CNMIPS
ident OCTEON1 ident OCTEON1
@ -27,7 +26,6 @@ makeoptions LDSCRIPT_NAME=ldscript.mips.octeon1.64
# Don't build any modules yet. # Don't build any modules yet.
makeoptions MODULES_OVERRIDE="" makeoptions MODULES_OVERRIDE=""
makeoptions TARGET_BIG_ENDIAN=defined
makeoptions KERNLOADADDR=0xffffffff80100000 makeoptions KERNLOADADDR=0xffffffff80100000
include "../cavium/std.octeon1" include "../cavium/std.octeon1"

6
sys/mips/conf/OCTEON1-32
View File

@ -17,18 +17,16 @@
# #
# $FreeBSD$ # $FreeBSD$
machine mips ident OCTEON1-32
cpu CPU_CNMIPS
ident OCTEON1
# Don't build any modules yet. # Don't build any modules yet.
makeoptions MODULES_OVERRIDE="" makeoptions MODULES_OVERRIDE=""
makeoptions TARGET_BIG_ENDIAN=defined
makeoptions ARCH_FLAGS="-march=octeon" makeoptions ARCH_FLAGS="-march=octeon"
makeoptions LDSCRIPT_NAME=ldscript.mips.octeon1.32 makeoptions LDSCRIPT_NAME=ldscript.mips.octeon1.32
makeoptions KERNLOADADDR=0x81000000 makeoptions KERNLOADADDR=0x81000000
include "../cavium/std.octeon1" include "../cavium/std.octeon1"
machine mips mipseb
hints "OCTEON1.hints" #Default places to look for devices. hints "OCTEON1.hints" #Default places to look for devices.

4
sys/mips/conf/QEMU
View File

@ -20,10 +20,6 @@
cpu CPU_MIPS32 cpu CPU_MIPS32
ident QEMU 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. # Don't build any modules yet.
makeoptions MODULES_OVERRIDE="" makeoptions MODULES_OVERRIDE=""

15
sys/mips/conf/SENTRY5
View File

@ -25,14 +25,9 @@
# #
ident SENTRY5 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 # XXX only siba should be hardwired for now; we will use
# bus enumeration there # bus enumeration there
files "../sentry5/files.sentry5"
hints "SENTRY5.hints" hints "SENTRY5.hints"
# sentry5 normally ships with cfe firmware; use the console for now # sentry5 normally ships with cfe firmware; use the console for now
@ -40,8 +35,6 @@ options CFE
options CFE_CONSOLE options CFE_CONSOLE
options ALT_BREAK_TO_DEBUGGER 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 DEBUG=-g #Build kernel with gdb(1) debug symbols
makeoptions MODULES_OVERRIDE="" makeoptions MODULES_OVERRIDE=""
@ -56,18 +49,18 @@ options PSEUDOFS #Pseudo-filesystem framework
options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
# Debugging for use in -current # Debugging for use in -current
#options DEADLKRES #options DEADLKRES
options INVARIANTS options INVARIANTS
options INVARIANT_SUPPORT options INVARIANT_SUPPORT
#options BUS_DEBUG #options BUS_DEBUG
#makeoptions BUS_DEBUG #makeoptions BUS_DEBUG
device siba # Sonics SiliconBackplane device siba # Sonics SiliconBackplane
device pci # siba_pcib device pci # siba_pcib
# device bfe # XXX will build both pci and siba # device bfe # XXX will build both pci and siba
# device miibus # attachments # device miibus # attachments
# pci devices # pci devices
# notyet: # notyet:

1
sys/mips/conf/SWARM
View File

@ -6,6 +6,7 @@ include std.SWARM
ident SWARM ident SWARM
machine mips mipseb
options ISA_MIPS32 options ISA_MIPS32
makeoptions ARCH_FLAGS="-mabi=32 -march=mips32" makeoptions ARCH_FLAGS="-mabi=32 -march=mips32"

1
sys/mips/conf/SWARM64
View File

@ -6,6 +6,7 @@ include std.SWARM
ident SWARM64 ident SWARM64
machine mips mips64eb
makeoptions ARCH_FLAGS="-mabi=64 -march=mips64" makeoptions ARCH_FLAGS="-mabi=64 -march=mips64"
makeoptions LDSCRIPT_NAME=ldscript.mips.64.cfe makeoptions LDSCRIPT_NAME=ldscript.mips.64.cfe
makeoptions KERNLOADADDR=0xffffffff80001000 makeoptions KERNLOADADDR=0xffffffff80001000

1
sys/mips/conf/SWARM64_SMP
View File

@ -9,6 +9,7 @@ ident SWARM64_SMP
options SMP options SMP
options PRINTF_BUFR_SIZE=128 options PRINTF_BUFR_SIZE=128
machine mips mips64eb
makeoptions ARCH_FLAGS="-mabi=64 -march=mips64" makeoptions ARCH_FLAGS="-mabi=64 -march=mips64"
makeoptions LDSCRIPT_NAME=ldscript.mips.64.cfe makeoptions LDSCRIPT_NAME=ldscript.mips.64.cfe
makeoptions KERNLOADADDR=0xffffffff80001000 makeoptions KERNLOADADDR=0xffffffff80001000

1
sys/mips/conf/SWARM_SMP
View File

@ -9,6 +9,7 @@ ident SWARM_SMP
options SMP options SMP
options PRINTF_BUFR_SIZE=128 options PRINTF_BUFR_SIZE=128
machine mips mipseb
options ISA_MIPS32 options ISA_MIPS32
makeoptions ARCH_FLAGS="-mabi=32 -march=mips32" makeoptions ARCH_FLAGS="-mabi=32 -march=mips32"

2
sys/mips/conf/XLR
View File

@ -45,7 +45,7 @@
# #
# $FreeBSD$ # $FreeBSD$
machine mips machine mips mipseb
cpu CPU_RMI cpu CPU_RMI
ident XLR ident XLR

2
sys/mips/conf/XLR64
View File

@ -17,7 +17,7 @@
# #
# $FreeBSD$ # $FreeBSD$
machine mips machine mips mips64eb
cpu CPU_RMI cpu CPU_RMI
ident XLR64 ident XLR64

2
sys/mips/conf/XLRN32
View File

@ -17,7 +17,7 @@
# #
# $FreeBSD$ # $FreeBSD$
machine mips machine mips mipseb
cpu CPU_RMI cpu CPU_RMI
ident XLRN32 ident XLRN32

2
sys/mips/conf/std.SWARM
View File

@ -2,8 +2,8 @@
# $FreeBSD$ # $FreeBSD$
# #
files "../sibyte/files.sibyte"
hints "SWARM.hints" hints "SWARM.hints"
include "../sibyte/std.sibyte"
options CFE options CFE
options CFE_CONSOLE options CFE_CONSOLE

1
sys/mips/idt/std.idt
View File

@ -3,4 +3,5 @@
files "../idt/files.idt" files "../idt/files.idt"
machine mips mipsel
options ISA_MIPS32 options ISA_MIPS32

11
sys/mips/sentry5/std.sentry5 Normal file
View File

@ -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"

3
sys/mips/sibyte/std.sibyte Normal file
View File

@ -0,0 +1,3 @@
# $FreeBSD$
files "../sibyte/files.sibyte"