[src/sommerfeld_i386mp_1]: src/sys/arch/i386/conf Sync with -current. From Ma...

[fvdl <fvdl%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8877e1c4ea3b
branches:  sommerfeld_i386mp_1
changeset: 482458:8877e1c4ea3b
user:      fvdl <fvdl%NetBSD.org@localhost>
date:      Tue Dec 11 21:52:05 2001 +0000

description:
Sync with -current. From Martin Husemann.

diffstat:

 sys/arch/i386/conf/files.i386 |  56 +++++++++++++++++++++---------------------
 1 files changed, 28 insertions(+), 28 deletions(-)

diffs (119 lines):

diff -r 4eb00bd1a1d3 -r 8877e1c4ea3b sys/arch/i386/conf/files.i386
--- a/sys/arch/i386/conf/files.i386     Sun Dec 09 23:05:58 2001 +0000
+++ b/sys/arch/i386/conf/files.i386     Tue Dec 11 21:52:05 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.i386,v 1.147.2.18 2001/09/22 23:00:58 sommerfeld Exp $
+#      $NetBSD: files.i386,v 1.147.2.19 2001/12/11 21:52:05 fvdl Exp $
 #
 # new style config file for i386 architecture
 #
@@ -9,54 +9,54 @@
 maxusers 2 16 128
 
 # APM options
-defopt opt_apm.h       APM_DISABLE APM_FORCE_64K_SEGMENTS APM_NO_IDLE
+defflag        opt_apm.h       APM_DISABLE APM_FORCE_64K_SEGMENTS APM_NO_IDLE
                        APM_NO_STANDBY APM_V10_ONLY APM_NO_V12 APMDEBUG
-                       APMDEBUG_VALUE APM_POWER_PRINT APM_DISABLE_INTERRUPTS
-                       APM_ALLOW_BOGUS_SEGMENTS
+                       APM_POWER_PRINT APM_ALLOW_BOGUS_SEGMENTS
+defparam opt_apm.h     APMDEBUG_VALUE APM_DISABLE_INTERRUPTS
 
 # Processor type options.
-defopt opt_cputype.h   I386_CPU I486_CPU I586_CPU I686_CPU
+defflag        opt_cputype.h   I386_CPU I486_CPU I586_CPU I686_CPU
 
 # delay before cpu_reset() for reboot.
-defopt CPURESET_DELAY
+defparam       CPURESET_DELAY
 
 # VM86 emulation
-defopt VM86
+defflag        VM86
 
 # Floating point emulation
-defopt MATH_EMULATE
+defflag        MATH_EMULATE
 
 # User-settable LDT (used by WINE)
-defopt USER_LDT
+defflag        USER_LDT
 
 # Speed hack; make NOPs dummies (might break on some machines)
-defopt DUMMY_NOPS
+defflag        DUMMY_NOPS
 
 # Performance counter support
-defopt PERFCTRS
+defflag        PERFCTRS
 
 # MTRR support
-defopt MTRR
+defflag        MTRR
 
 # X server support in console drivers
-defopt opt_xserver.h   XSERVER XSERVER_DDB
+defflag        opt_xserver.h   XSERVER XSERVER_DDB
 
 # The REAL{BASE,EXT}MEM options
-defopt opt_realmem.h   REALBASEMEM REALEXTMEM
+defparam       opt_realmem.h   REALBASEMEM REALEXTMEM
 
 # understand boot device passed by pre-1.3 bootblocks
-defopt COMPAT_OLDBOOT
+defflag        COMPAT_OLDBOOT
 
-defopt opt_mpbios.h MPVERBOSE MPDEBUG
+defflag        opt_mpbios.h MPVERBOSE MPDEBUG
 
 # PCI BIOS options
-defopt opt_pcibios.h   PCIBIOS PCIBIOSVERBOSE
-       PCIBIOS_ADDR_FIXUP PCIBIOS_BUS_FIXUP
-       PCIBIOS_INTR_FIXUP PCIBIOS_INTR_FIXUP_FORCE
-       PCIBIOS_INTR_GUESS PCIBIOS_IRQS_HINT PCIINTR_DEBUG
+defflag        opt_pcibios.h   PCIBIOS PCIBIOSVERBOSE
+defflag        opt_pcibios.h   PCIBIOS_ADDR_FIXUP PCIBIOS_BUS_FIXUP
+                       PCIBIOS_INTR_FIXUP PCIBIOS_INTR_FIXUP_FORCE
+                       PCIBIOS_INTR_GUESS PCIBIOS_IRQS_HINT PCIINTR_DEBUG
 
 # Large page size
-defopt LARGEPAGES
+defflag        LARGEPAGES
 
 file   arch/i386/i386/autoconf.c
 file   arch/i386/i386/bus_machdep.c
@@ -172,7 +172,7 @@
 file   arch/i386/pci/ali1543.c         pcibios & pcibios_intr_fixup
 file   arch/i386/pci/pci_bus_fixup.c   pcibios & pcibios_bus_fixup
 file   arch/i386/pci/pci_addr_fixup.c  pcibios & pcibios_addr_fixup
-defopt PCI_CONF_MODE
+defparam       PCI_CONF_MODE
 file   arch/i386/pci/pciide_machdep.c  pciide
 file   arch/i386/pci/pcic_pci_machdep.c        pcic_pci
 
@@ -421,9 +421,9 @@
 # XXX this needs to be done very late, so it's done here.  This feels
 # like a kludge, but it might be for the best.
 
-defopt PCIC_ISA_ALLOC_IOBASE
-defopt PCIC_ISA_ALLOC_IOSIZE
-defopt PCIC_ISA_INTR_ALLOC_MASK
+defparam       PCIC_ISA_ALLOC_IOBASE
+defparam       PCIC_ISA_ALLOC_IOSIZE
+defparam       PCIC_ISA_INTR_ALLOC_MASK
 
 device pcic: pcmciabus
 file   dev/ic/i82365.c                 pcic
@@ -452,9 +452,9 @@
 # XXX this needs to be done very late, so it's done here.  This feels
 # like a kludge, but it might be for the best.
 
-defopt TCIC_ISA_ALLOC_IOBASE
-defopt TCIC_ISA_ALLOC_IOSIZE
-defopt TCIC_ISA_INTR_ALLOC_MASK
+defparam       TCIC_ISA_ALLOC_IOBASE
+defparam       TCIC_ISA_ALLOC_IOSIZE
+defparam       TCIC_ISA_INTR_ALLOC_MASK
 
 device tcic: pcmciabus
 file   dev/ic/tcic2.c                  tcic