diff options
-rw-r--r-- | sys/conf/NOTES | 13 | ||||
-rw-r--r-- | sys/conf/options.i386 | 3 | ||||
-rw-r--r-- | sys/i386/conf/LINT | 13 | ||||
-rw-r--r-- | sys/i386/conf/NOTES | 13 | ||||
-rw-r--r-- | sys/i386/conf/SMP-GENERIC | 13 | ||||
-rw-r--r-- | sys/i386/conf/options.i386 | 3 |
6 files changed, 9 insertions, 49 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES index a79b943..5aeeec2 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -2,7 +2,7 @@ # LINT -- config file for checking all the sources, tries to pull in # as much of the source tree as it can. # -# $Id: LINT,v 1.352 1997/07/20 05:27:59 bde Exp $ +# $Id: LINT,v 1.353 1997/07/25 11:53:19 phk Exp $ # # NB: You probably don't want to try running a kernel built from this # file. Instead, you should start from GENERIC, and add options from @@ -71,9 +71,6 @@ config kernel root on wd0 dumps on wd0 # NAPIC sets the number of IO APICs on the motherboard, defaults to 1. # NINTR sets the total number of INTs provided by the motherboard. # -# SMP_TIMER_NC is for motherboards that claim 8254 connectivity to the IO APIC, -# when in fact it is NOT connected. -# # Notes: # # An SMP kernel will ONLY run on an Intel MP spec. qualified motherboard. @@ -89,7 +86,7 @@ options SMP # Symmetric MultiProcessor Kernel options APIC_IO # Symmetric (APIC) I/O # Optional, these are the defaults plus 1: -options NCPU=3 # number of CPUs +options NCPU=5 # number of CPUs options NBUS=5 # number of busses options NAPIC=2 # number of IO APICs options NINTR=25 # number of INTs @@ -98,12 +95,6 @@ options NINTR=25 # number of INTs # Rogue SMP hardware: # -# Tyan Tomcat II: -#options SMP_TIMER_NC # 8254 NOT connected to APIC - -# SuperMicro P6DNE: -#options SMP_TIMER_NC # 8254 NOT connected to APIC - # Bridged PCI cards: # # The MP tables of most of the current generation MP motherboards diff --git a/sys/conf/options.i386 b/sys/conf/options.i386 index f9c2fde..c094a07 100644 --- a/sys/conf/options.i386 +++ b/sys/conf/options.i386 @@ -1,4 +1,4 @@ -# $Id: options.i386,v 1.50 1997/07/13 15:26:54 bde Exp $ +# $Id: options.i386,v 1.51 1997/07/25 11:53:20 phk Exp $ BOUNCEPAGES opt_bounce.h USER_LDT @@ -39,7 +39,6 @@ NCPU opt_smp.h NBUS opt_smp.h NAPIC opt_smp.h NINTR opt_smp.h -SMP_TIMER_NC opt_smp.h AHC_TAGENABLE opt_aic7xxx.h AHC_SCBPAGING_ENABLE opt_aic7xxx.h diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT index a79b943..5aeeec2 100644 --- a/sys/i386/conf/LINT +++ b/sys/i386/conf/LINT @@ -2,7 +2,7 @@ # LINT -- config file for checking all the sources, tries to pull in # as much of the source tree as it can. # -# $Id: LINT,v 1.352 1997/07/20 05:27:59 bde Exp $ +# $Id: LINT,v 1.353 1997/07/25 11:53:19 phk Exp $ # # NB: You probably don't want to try running a kernel built from this # file. Instead, you should start from GENERIC, and add options from @@ -71,9 +71,6 @@ config kernel root on wd0 dumps on wd0 # NAPIC sets the number of IO APICs on the motherboard, defaults to 1. # NINTR sets the total number of INTs provided by the motherboard. # -# SMP_TIMER_NC is for motherboards that claim 8254 connectivity to the IO APIC, -# when in fact it is NOT connected. -# # Notes: # # An SMP kernel will ONLY run on an Intel MP spec. qualified motherboard. @@ -89,7 +86,7 @@ options SMP # Symmetric MultiProcessor Kernel options APIC_IO # Symmetric (APIC) I/O # Optional, these are the defaults plus 1: -options NCPU=3 # number of CPUs +options NCPU=5 # number of CPUs options NBUS=5 # number of busses options NAPIC=2 # number of IO APICs options NINTR=25 # number of INTs @@ -98,12 +95,6 @@ options NINTR=25 # number of INTs # Rogue SMP hardware: # -# Tyan Tomcat II: -#options SMP_TIMER_NC # 8254 NOT connected to APIC - -# SuperMicro P6DNE: -#options SMP_TIMER_NC # 8254 NOT connected to APIC - # Bridged PCI cards: # # The MP tables of most of the current generation MP motherboards diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index a79b943..5aeeec2 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -2,7 +2,7 @@ # LINT -- config file for checking all the sources, tries to pull in # as much of the source tree as it can. # -# $Id: LINT,v 1.352 1997/07/20 05:27:59 bde Exp $ +# $Id: LINT,v 1.353 1997/07/25 11:53:19 phk Exp $ # # NB: You probably don't want to try running a kernel built from this # file. Instead, you should start from GENERIC, and add options from @@ -71,9 +71,6 @@ config kernel root on wd0 dumps on wd0 # NAPIC sets the number of IO APICs on the motherboard, defaults to 1. # NINTR sets the total number of INTs provided by the motherboard. # -# SMP_TIMER_NC is for motherboards that claim 8254 connectivity to the IO APIC, -# when in fact it is NOT connected. -# # Notes: # # An SMP kernel will ONLY run on an Intel MP spec. qualified motherboard. @@ -89,7 +86,7 @@ options SMP # Symmetric MultiProcessor Kernel options APIC_IO # Symmetric (APIC) I/O # Optional, these are the defaults plus 1: -options NCPU=3 # number of CPUs +options NCPU=5 # number of CPUs options NBUS=5 # number of busses options NAPIC=2 # number of IO APICs options NINTR=25 # number of INTs @@ -98,12 +95,6 @@ options NINTR=25 # number of INTs # Rogue SMP hardware: # -# Tyan Tomcat II: -#options SMP_TIMER_NC # 8254 NOT connected to APIC - -# SuperMicro P6DNE: -#options SMP_TIMER_NC # 8254 NOT connected to APIC - # Bridged PCI cards: # # The MP tables of most of the current generation MP motherboards diff --git a/sys/i386/conf/SMP-GENERIC b/sys/i386/conf/SMP-GENERIC index 6c1fee8..278c4a5 100644 --- a/sys/i386/conf/SMP-GENERIC +++ b/sys/i386/conf/SMP-GENERIC @@ -11,7 +11,7 @@ # device lines is present in the ./LINT configuration file. If you are # in doubt as to the purpose or necessity of a line, check first in LINT. # -# $Id: SMP-GENERIC,v 1.5 1997/07/18 22:00:17 fsmp Exp $ +# $Id: SMP-GENERIC,v 1.1 1997/07/26 00:54:07 smp Exp smp $ machine "i386" # SMP does NOT support 386/486 CPUs. @@ -33,17 +33,6 @@ options APIC_IO # Symmetric (APIC) I/O #options NAPIC=1 # number of IO APICs #options NINTR=24 # number of INTs -# -# HEADS UP: SMP_TIMER_NC currently not usable, -# following comments will be removed shortly. -# - -# Tyan Tomcat II: -#options SMP_TIMER_NC # 8254 NOT connected to APIC - -# SuperMicro P6DNxxx: -#options SMP_TIMER_NC # 8254 NOT connected to APIC - # Lets always enable the kernel debugger for SMP. options DDB diff --git a/sys/i386/conf/options.i386 b/sys/i386/conf/options.i386 index f9c2fde..c094a07 100644 --- a/sys/i386/conf/options.i386 +++ b/sys/i386/conf/options.i386 @@ -1,4 +1,4 @@ -# $Id: options.i386,v 1.50 1997/07/13 15:26:54 bde Exp $ +# $Id: options.i386,v 1.51 1997/07/25 11:53:20 phk Exp $ BOUNCEPAGES opt_bounce.h USER_LDT @@ -39,7 +39,6 @@ NCPU opt_smp.h NBUS opt_smp.h NAPIC opt_smp.h NINTR opt_smp.h -SMP_TIMER_NC opt_smp.h AHC_TAGENABLE opt_aic7xxx.h AHC_SCBPAGING_ENABLE opt_aic7xxx.h |