svn commit: r184194 - in head/sys: conf mips/conf

[Marcel Moolenaar]

Author: marcel
Date: Thu Oct 23 02:16:38 2008
New Revision: 184194
URL: http://svn.freebsd.org/changeset/base/184194

Log:
  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.

Added:
  head/sys/mips/conf/DEFAULTS   (contents, props changed)
Modified:
  head/sys/conf/files.mips
  head/sys/mips/conf/ADM5120
  head/sys/mips/conf/IDT
  head/sys/mips/conf/MALTA
  head/sys/mips/conf/QEMU
  head/sys/mips/conf/SENTRY5

Modified: head/sys/conf/files.mips
==============================================================================
--- head/sys/conf/files.mips	Thu Oct 23 01:51:55 2008	(r184193)
+++ head/sys/conf/files.mips	Thu Oct 23 02:16:38 2008	(r184194)
@@ -71,10 +71,10 @@ mips/mips/stack_machdep.c	optional	ddb |
 mips/mips/support.S		standard
 mips/mips/swtch.S		standard
 mips/mips/uio_machdep.c		standard
-geom/geom_bsd.c			standard
-geom/geom_bsd_enc.c		standard
-geom/geom_mbr.c			standard
-geom/geom_mbr_enc.c		standard
+geom/geom_bsd.c			optional	geom_bsd
+geom/geom_bsd_enc.c		optional	geom_bsd
+geom/geom_mbr.c			optional	geom_mbr
+geom/geom_mbr_enc.c		optional	geom_mbr
 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" \
 	no-implicit-rule

Modified: head/sys/mips/conf/ADM5120
==============================================================================
--- head/sys/mips/conf/ADM5120	Thu Oct 23 01:51:55 2008	(r184193)
+++ head/sys/mips/conf/ADM5120	Thu Oct 23 02:16:38 2008	(r184194)
@@ -17,7 +17,6 @@
 #
 # $FreeBSD$
 
-machine		mips
 ident		ADM5120
 
 #makeoptions	ARCH_FLAGS=-march=mips32
@@ -66,5 +65,3 @@ device		loop
 device		ether
 device		uart
 # device		md
-# device		mem
-# device		uart_ns8250

Added: head/sys/mips/conf/DEFAULTS
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sys/mips/conf/DEFAULTS	Thu Oct 23 02:16:38 2008	(r184194)
@@ -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

Modified: head/sys/mips/conf/IDT
==============================================================================
--- head/sys/mips/conf/IDT	Thu Oct 23 01:51:55 2008	(r184193)
+++ head/sys/mips/conf/IDT	Thu Oct 23 02:16:38 2008	(r184194)
@@ -1,6 +1,5 @@
 # $FreeBSD$
 
-machine		mips
 cpu		CPU_MIPS4KC
 ident		RB532
 
@@ -38,7 +37,6 @@ device		miibus
 device		vr
 device		kr
 device		uart
-device		uart_ns8250
 device		md
 
 # Wireless NIC cards

Modified: head/sys/mips/conf/MALTA
==============================================================================
--- head/sys/mips/conf/MALTA	Thu Oct 23 01:51:55 2008	(r184193)
+++ head/sys/mips/conf/MALTA	Thu Oct 23 02:16:38 2008	(r184194)
@@ -17,7 +17,6 @@
 #
 # $FreeBSD$
 
-machine		mips
 ident		MALTA
 
 #makeoptions	ARCH_FLAGS=-march=mips32
@@ -66,6 +65,4 @@ device		ether
 device		le
 device		miibus
 device		md
-device		mem
 device		uart
-device		uart_ns8250

Modified: head/sys/mips/conf/QEMU
==============================================================================
--- head/sys/mips/conf/QEMU	Thu Oct 23 01:51:55 2008	(r184193)
+++ head/sys/mips/conf/QEMU	Thu Oct 23 02:16:38 2008	(r184194)
@@ -17,7 +17,6 @@
 #
 # $FreeBSD$
 
-machine		mips
 cpu		CPU_MIPS32
 ident		QEMU
 
@@ -53,5 +52,4 @@ options		_KPOSIX_PRIORITY_SCHEDULING #Po
 
 device		loop
 device		ether
-device		mem
 device		md

Modified: head/sys/mips/conf/SENTRY5
==============================================================================
--- head/sys/mips/conf/SENTRY5	Thu Oct 23 01:51:55 2008	(r184193)
+++ head/sys/mips/conf/SENTRY5	Thu Oct 23 02:16:38 2008	(r184194)
@@ -24,7 +24,6 @@
 #   will be necessary to support multi-user boot.
 #
 
-machine		mips
 ident		SENTRY5
 cpu		CPU_MIPS4KC
 options		CPU_NOFPU
@@ -91,9 +90,7 @@ device		ehci			# EHCI PCI->USB interface
 
 # XXX notyet; need to be auto probed children of siba_cc.
 #device		uart
-#device		uart_ns8250
 
 device		loop
 device		ether
 device		md
-device		mem