Add mips/conf/DEFAULTS and populate it with:

machine arm
        device  mem
	device  uart_ns8250
        options GEOM_BSD
        options GEOM_MBR

Remove the first three from all kernel configuration files
(sometimes commented-out) and change geom_bsd and geom_mbr
from standard to optional.
This commit is contained in:
marcel 2008-10-23 02:16:38 +00:00
parent 0b89118840
commit ea4a9c9585
7 changed files with 17 additions and 17 deletions

View File

@ -71,10 +71,10 @@ mips/mips/stack_machdep.c optional ddb | stack
mips/mips/support.S standard mips/mips/support.S standard
mips/mips/swtch.S standard mips/mips/swtch.S standard
mips/mips/uio_machdep.c standard mips/mips/uio_machdep.c standard
geom/geom_bsd.c standard geom/geom_bsd.c optional geom_bsd
geom/geom_bsd_enc.c standard geom/geom_bsd_enc.c optional geom_bsd
geom/geom_mbr.c standard geom/geom_mbr.c optional geom_mbr
geom/geom_mbr_enc.c standard geom/geom_mbr_enc.c optional geom_mbr
hal.o optional ath_hal \ hal.o optional ath_hal \
compile-with "ATH_HAL_CPU=mips; ATH_ENDIAN=`if ([ x${TARGET_BIG_ENDIAN} = x ]); then echo le; else echo be; fi;`; uudecode < $S/contrib/dev/ath/public/$$ATH_HAL_CPU-$$ATH_ENDIAN-elf.hal.o.uu" \ compile-with "ATH_HAL_CPU=mips; ATH_ENDIAN=`if ([ x${TARGET_BIG_ENDIAN} = x ]); then echo le; else echo be; fi;`; uudecode < $S/contrib/dev/ath/public/$$ATH_HAL_CPU-$$ATH_ENDIAN-elf.hal.o.uu" \
no-implicit-rule no-implicit-rule

View File

@ -17,7 +17,6 @@
# #
# $FreeBSD$ # $FreeBSD$
machine mips
ident ADM5120 ident ADM5120
#makeoptions ARCH_FLAGS=-march=mips32 #makeoptions ARCH_FLAGS=-march=mips32
@ -66,5 +65,3 @@ device loop
device ether device ether
device uart device uart
# device md # device md
# device mem
# device uart_ns8250

13
sys/mips/conf/DEFAULTS Normal file
View File

@ -0,0 +1,13 @@
#
# DEFAULTS -- Default kernel configuration file for FreeBSD/mips
#
# $FreeBSD$
machine mips
device mem
device uart_ns8250
options GEOM_BSD
options GEOM_MBR

View File

@ -1,6 +1,5 @@
# $FreeBSD$ # $FreeBSD$
machine mips
cpu CPU_MIPS4KC cpu CPU_MIPS4KC
ident RB532 ident RB532
@ -38,7 +37,6 @@ device miibus
device vr device vr
device kr device kr
device uart device uart
device uart_ns8250
device md device md
# Wireless NIC cards # Wireless NIC cards

View File

@ -17,7 +17,6 @@
# #
# $FreeBSD$ # $FreeBSD$
machine mips
ident MALTA ident MALTA
#makeoptions ARCH_FLAGS=-march=mips32 #makeoptions ARCH_FLAGS=-march=mips32
@ -66,6 +65,4 @@ device ether
device le device le
device miibus device miibus
device md device md
device mem
device uart device uart
device uart_ns8250

View File

@ -17,7 +17,6 @@
# #
# $FreeBSD$ # $FreeBSD$
machine mips
cpu CPU_MIPS32 cpu CPU_MIPS32
ident QEMU ident QEMU
@ -53,5 +52,4 @@ options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
device loop device loop
device ether device ether
device mem
device md device md

View File

@ -24,7 +24,6 @@
# will be necessary to support multi-user boot. # will be necessary to support multi-user boot.
# #
machine mips
ident SENTRY5 ident SENTRY5
cpu CPU_MIPS4KC cpu CPU_MIPS4KC
options CPU_NOFPU options CPU_NOFPU
@ -91,9 +90,7 @@ device ehci # EHCI PCI->USB interface (USB 2.0)
# XXX notyet; need to be auto probed children of siba_cc. # XXX notyet; need to be auto probed children of siba_cc.
#device uart #device uart
#device uart_ns8250
device loop device loop
device ether device ether
device md device md
device mem