diff options
| author | peter <peter@FreeBSD.org> | 2003-11-19 18:11:27 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2003-11-19 18:11:27 +0000 |
| commit | 404972795aba8ce758e0efe5d88506ff889e20b4 (patch) | |
| tree | faacf24ee649c653fa2d65dc3ac8c816f91697ab /sys/amd64/conf | |
| parent | 6b53de4a19d011a2c9ab346ed0d6aff3726f5ef1 (diff) | |
| download | FreeBSD-src-404972795aba8ce758e0efe5d88506ff889e20b4.zip FreeBSD-src-404972795aba8ce758e0efe5d88506ff889e20b4.tar.gz | |
Sync with i386.
- turn on SMP in generic
- add 'device atpic' - this is unconditional on i386, but certain nvidia
based systems need to disable acpi because the reference bios seems to be
hosed. If acpi is disabled, we won't find the apic. amd64 has the
mptable code in a seperate compile option as well.
- turn sym back on, it doesn't fail to compile anymore.
Approved by: re
Diffstat (limited to 'sys/amd64/conf')
| -rw-r--r-- | sys/amd64/conf/GENERIC | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 234cefe..3d927fe 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -25,7 +25,7 @@ ident GENERIC #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 makeoptions NO_MODULES=not_yet options SCHED_4BSD #4BSD scheduler @@ -64,6 +64,11 @@ options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required options WITNESS #Enable checks to detect deadlocks and cycles options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed +# Make an SMP-capable kernel by default +options SMP # Symmetric MultiProcessor Kernel +# Workarounds for some known-to-be-broken chipsets (nVidia nForce3-Pro150) +device atpic # 8259A compatability + device acpi device isa device pci @@ -92,8 +97,7 @@ device amd # AMD 53C974 (Tekram DC-390(T)) device isp # Qlogic family device mpt # LSI-Logic MPT-Fusion #device ncr # NCR/Symbios Logic -#XXX #error unknown architecture -#device sym # NCR/Symbios Logic (newer chipsets + those of `ncr') +device sym # NCR/Symbios Logic (newer chipsets + those of `ncr') device trm # Tekram DC395U/UW/F DC315U adapters device adv # Advansys SCSI adapters |
