diff options
| -rw-r--r-- | sys/arch/amd64/conf/GENERIC | 5 | ||||
| -rw-r--r-- | sys/arch/amd64/conf/GENERIC.MP | 6 | ||||
| -rw-r--r-- | sys/arch/amd64/conf/RAMDISK | 15 | ||||
| -rw-r--r-- | sys/arch/amd64/conf/RAMDISK_CD | 7 |
4 files changed, 19 insertions, 14 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC index a9304f94916..0db10338629 100644 --- a/sys/arch/amd64/conf/GENERIC +++ b/sys/arch/amd64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.250 2008/12/01 23:48:46 todd Exp $ +# $OpenBSD: GENERIC,v 1.251 2008/12/22 16:35:28 deraadt Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -32,6 +32,7 @@ mainbus0 at root bios0 at mainbus? cpu0 at mainbus? +ioapic* at mainbus? isa0 at mainbus0 isa0 at pcib? isa0 at amdpcib? @@ -48,6 +49,7 @@ acpicpu* at acpi? acpiec* at acpi? acpiprt* at acpi? acpitz* at acpi? +acpimadt0 at acpi? acpithinkpad* at acpi? ipmi0 at mainbus? disable # IPMI @@ -56,6 +58,7 @@ option PCIVERBOSE option USBVERBOSE pchb* at pci? # PCI-Host bridges +aapic* at pci? # AMD 8131 IO apic ppb* at pci? # PCI-PCI bridges pci* at ppb? pci* at pchb? diff --git a/sys/arch/amd64/conf/GENERIC.MP b/sys/arch/amd64/conf/GENERIC.MP index 805c23c1ba1..90d5f98b88d 100644 --- a/sys/arch/amd64/conf/GENERIC.MP +++ b/sys/arch/amd64/conf/GENERIC.MP @@ -1,11 +1,7 @@ -# $OpenBSD: GENERIC.MP,v 1.9 2008/12/21 18:49:46 kettenis Exp $ +# $OpenBSD: GENERIC.MP,v 1.10 2008/12/22 16:35:28 deraadt Exp $ include "arch/amd64/conf/GENERIC" option MULTIPROCESSOR cpu* at mainbus? -ioapic* at mainbus? - -aapic* at pci? # AMD 8131 IO apic -acpimadt0 at acpi? diff --git a/sys/arch/amd64/conf/RAMDISK b/sys/arch/amd64/conf/RAMDISK index d5e6093a535..d21211e9254 100644 --- a/sys/arch/amd64/conf/RAMDISK +++ b/sys/arch/amd64/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.47 2008/11/22 10:32:20 deraadt Exp $ +# $OpenBSD: RAMDISK,v 1.48 2008/12/22 16:35:28 deraadt Exp $ machine amd64 # architecture, used by config; REQUIRED @@ -42,9 +42,11 @@ acpi0 at bios? #acpicpu* at acpi? #acpiec* at acpi? acpiprt* at acpi? +acpimadt0 at acpi? #acpitz* at acpi? -cpu* at mainbus0 +cpu0 at mainbus0 +ioapic* at mainbus? isa0 at mainbus0 #isa0 at pcib? pci* at mainbus0 @@ -52,6 +54,7 @@ pci* at mainbus0 option PCIVERBOSE pchb* at pci? # PCI-Host bridges +aapic* at pci? # AMD 8131 IO apic ppb* at pci? # PCI-PCI bridges pci* at ppb? pci* at pchb? @@ -140,8 +143,8 @@ scsibus* at mpi? #scsibus* at gdt? #aac* at pci? # Adaptec FSA RAID controllers #scsibus* at aac? -ami* at pci? # AMI MegaRAID controllers -scsibus* at ami? +#ami* at pci? # AMI MegaRAID controllers +#scsibus* at ami? mfi* at pci? # LSI MegaRAID SAS controllers scsibus* at mfi? #cac* at pci? # Compaq Smart ARRAY [234]* RAID controllers @@ -215,7 +218,7 @@ re* at pci? # Realtek 8169/8169S/8110S #epic* at pci? # SMC EPIC/100 ethernet #tl* at pci? # Compaq Thunderlan ethernet #vr* at pci? # VIA Rhine ethernet -dc* at pci? # 21143, "tulip" clone ethernet +#dc* at pci? # 21143, "tulip" clone ethernet #sis* at pci? # SiS 900/7016 ethernet #wb* at pci? # Winbond W89C840F ethernet #ti* at pci? # Alteon Tigon 1Gb ethernet @@ -250,7 +253,7 @@ nsphyter* at mii? # NS and compatible PHYs #sqphy* at mii? # Seeq 8x220 PHYs rlphy* at mii? # RealTek 8139 internal PHYs #mtdphy* at mii? # Myson MTD972 PHYs -dcphy* at mii? # Digital Clone PHYs +#dcphy* at mii? # Digital Clone PHYs #acphy* at mii? # Altima AC101 PHYs #amphy* at mii? # AMD 79C873 PHYs #tqphy* at mii? # TDK 78Q212x PHYs diff --git a/sys/arch/amd64/conf/RAMDISK_CD b/sys/arch/amd64/conf/RAMDISK_CD index 25be8294744..601a6037d37 100644 --- a/sys/arch/amd64/conf/RAMDISK_CD +++ b/sys/arch/amd64/conf/RAMDISK_CD @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK_CD,v 1.92 2008/11/21 18:28:21 deraadt Exp $ +# $OpenBSD: RAMDISK_CD,v 1.93 2008/12/22 16:35:28 deraadt Exp $ machine amd64 # architecture, used by config; REQUIRED @@ -45,9 +45,11 @@ acpi0 at bios? #acpicpu* at acpi? #acpiec* at acpi? acpiprt* at acpi? +acpimadt0 at acpi? #acpitz* at acpi? -cpu* at mainbus0 +cpu0 at mainbus0 +ioapic* at mainbus? isa0 at mainbus0 #isa0 at pcib? pci* at mainbus0 @@ -55,6 +57,7 @@ pci* at mainbus0 option PCIVERBOSE pchb* at pci? # PCI-Host bridges +aapic* at pci? # AMD 8131 IO apic ppb* at pci? # PCI-PCI bridges pci* at ppb? pci* at pchb? |