[Midnightbsd-cvs] src: i386/conf: update GENERIC to put it in line with amd64

[laffer1 at midnightbsd.org]

Log Message:
-----------
update GENERIC to put it in line with amd64

Modified Files:
--------------
    src/sys/i386/conf:
        DEFAULTS (r1.1 -> r1.2)
        GENERIC (r1.14 -> r1.15)

-------------- next part --------------
Index: GENERIC
===================================================================
RCS file: /home/cvs/src/sys/i386/conf/GENERIC,v
retrieving revision 1.14
retrieving revision 1.15
diff -L sys/i386/conf/GENERIC -L sys/i386/conf/GENERIC -u -r1.14 -r1.15
--- sys/i386/conf/GENERIC
+++ sys/i386/conf/GENERIC
@@ -18,7 +18,6 @@
 # $MidnightBSD$
 # $FreeBSD: src/sys/i386/conf/GENERIC,v 1.429.2.5 2006/01/23 14:19:36 marius Exp $
 
-machine		i386
 cpu		I586_CPU
 cpu		I686_CPU
 ident		GENERIC
@@ -26,14 +25,14 @@
 # To statically compile in device wiring instead of /boot/device.hints
 #hints		"GENERIC.hints"		# Default places to look for devices.
 
-#makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
+makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
 
 #options 	SCHED_ULE		# ULE scheduler
 options 	SCHED_4BSD		# 4BSD scheduler
 options 	PREEMPTION		# Enable kernel thread preemption
 options 	INET			# InterNETworking
 options 	INET6			# IPv6 communications protocols
-options		SCTP			# Stream Control Transmission Protocol
+options 	SCTP			# Stream Control Transmission Protocol
 options 	FFS			# Berkeley Fast Filesystem
 options 	SOFTUPDATES		# Enable FFS soft updates support
 options 	UFS_ACL			# Support for access control lists
@@ -49,9 +48,10 @@
 options 	GEOM_GPT		# GUID Partition Tables.
 options 	GEOM_LABEL		# Support for labels with ISO, UFS
 options 	COMPAT_43		# Compatible with BSD 4.3 [KEEP THIS!]
-options		COMPAT_43TTY
+options 	COMPAT_43TTY
 options 	COMPAT_FREEBSD4		# Compatible with FreeBSD4
 options 	COMPAT_FREEBSD5		# Compatible with FreeBSD5
+options 	COMPAT_FREEBSD6		# Compatible with FreeBSD6
 options 	SCSI_DELAY=5000		# Delay (in ms) before probing SCSI
 options 	KTRACE			# ktrace(1) support
 options 	SYSVSHM			# SYSV-style shared memory
@@ -60,8 +60,10 @@
 options 	_KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
 options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
 options 	ADAPTIVE_GIANT		# Giant mutex is adaptive.
-options		AUDIT
-options		SMP			# Support Multicore and Multiproccesor
+options 	AUDIT
+options 	STOP_NMI		# Stop CPUS using NMI instead of IPI
+
+options 	SMP			# Support Multicore and Multiproccesor
 					# systems.
 device		apic			# I/O APIC
 
@@ -148,8 +150,6 @@
 device		psm		# PS/2 mouse
 device		kbdmux		# Keyboard multiplexer
 
-device		kbdmux		# keyboard multiplexer
-
 device		vga		# VGA video card driver
 options		VESA		# Support Higher Resolutions.
 
@@ -218,6 +218,7 @@
 device		sis		# Silicon Integrated Systems SiS 900/SiS 7016
 device		sk		# SysKonnect SK-984x & SK-982x gigabit Ethernet
 device		ste		# Sundance ST201 (D-Link DFE-550TX)
+device		stge		# Sundance/Tamarack TC9021 gigabit Ethernet
 device		ti		# Alteon Networks Tigon I/II gigabit Ethernet
 device		tl		# Texas Instruments ThunderLAN
 device		tx		# SMC EtherPower II (83c170 ``EPIC'')
Index: DEFAULTS
===================================================================
RCS file: /home/cvs/src/sys/i386/conf/DEFAULTS,v
retrieving revision 1.1
retrieving revision 1.2
diff -L sys/i386/conf/DEFAULTS -L sys/i386/conf/DEFAULTS -u -r1.1 -r1.2
--- sys/i386/conf/DEFAULTS
+++ sys/i386/conf/DEFAULTS
@@ -1,13 +1,13 @@
 #
 # DEFAULTS -- Default kernel configuration file for FreeBSD/i386
 #
-# $FreeBSD: src/sys/i386/conf/DEFAULTS,v 1.1.2.1 2005/10/28 19:21:27 jhb Exp $
+# $FreeBSD: src/sys/i386/conf/DEFAULTS,v 1.10 2007/06/11 00:38:06 marcel Exp $
 
-# Not yet, this would break all existing configs
-#machine		i386
+machine		i386
 
 # Bus support.
 device		isa
+options		ISAPNP
 
 # Floating point support.
 device		npx
@@ -15,3 +15,13 @@
 # Pseudo devices.
 device		mem		# Memory and kernel memory devices
 device		io		# I/O device
+
+# UART chips on this platform
+device		uart_ns8250
+
+# Default partitioning schemes
+options 	GEOM_BSD
+options 	GEOM_MBR
+
+# KSE support went from being default to a kernel option
+options 	KSE