summaryrefslogtreecommitdiff
path: root/sys/arch/amd64/conf
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2021-12-26 13:55:37 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2021-12-26 13:55:37 +0000
commite56aa27ecfe5f8b949623540c3b1a363b259305d (patch)
treef9d06b215c96baa02a12b201361367877039a84a /sys/arch/amd64/conf
parentfe88819cde51dc180b6aed3bf1240375032fd8a4 (diff)
Add address locators for the ACPI "bus" and use these to fix the order of
the com(4) devices to match the traditional order one the ISA bus. ok patrick@, anton@
Diffstat (limited to 'sys/arch/amd64/conf')
-rw-r--r--sys/arch/amd64/conf/GENERIC10
-rw-r--r--sys/arch/amd64/conf/RAMDISK6
-rw-r--r--sys/arch/amd64/conf/RAMDISK_CD8
3 files changed, 12 insertions, 12 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index ea3624ddc94..54274b1e80a 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.507 2021/12/20 14:54:37 hastings Exp $
+# $OpenBSD: GENERIC,v 1.508 2021/12/26 13:55:36 kettenis Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -65,10 +65,10 @@ amdgpio* at acpi?
aplgpio* at acpi?
bytgpio* at acpi?
chvgpio* at acpi?
-com0 at acpi?
-com1 at acpi?
-com2 at acpi?
-com3 at acpi?
+com0 at acpi? addr 0x3f8
+com1 at acpi? addr 0x2f8
+com2 at acpi? addr 0x3e8
+com3 at acpi? addr 0x2e8
com* at acpi?
glkgpio* at acpi?
pchgpio* at acpi?
diff --git a/sys/arch/amd64/conf/RAMDISK b/sys/arch/amd64/conf/RAMDISK
index 7141e7a7762..cfa1dcac4a2 100644
--- a/sys/arch/amd64/conf/RAMDISK
+++ b/sys/arch/amd64/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.84 2021/12/16 08:03:17 anton Exp $
+# $OpenBSD: RAMDISK,v 1.85 2021/12/26 13:55:36 kettenis Exp $
machine amd64
maxusers 4
@@ -34,8 +34,8 @@ acpipci* at acpi?
acpiprt* at acpi?
acpimadt0 at acpi?
#acpitz* at acpi?
-com0 at acpi?
-com1 at acpi?
+com0 at acpi? addr 0x3f8
+com1 at acpi? addr 0x2f8
com* at acpi?
mpbios0 at bios0
diff --git a/sys/arch/amd64/conf/RAMDISK_CD b/sys/arch/amd64/conf/RAMDISK_CD
index 6fa3436a835..4c5c5e90600 100644
--- a/sys/arch/amd64/conf/RAMDISK_CD
+++ b/sys/arch/amd64/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK_CD,v 1.196 2021/12/20 14:54:37 hastings Exp $
+# $OpenBSD: RAMDISK_CD,v 1.197 2021/12/26 13:55:36 kettenis Exp $
machine amd64
maxusers 4
@@ -51,9 +51,9 @@ bytgpio* at acpi?
sdhc* at acpi?
acpihve* at acpi?
chvgpio* at acpi?
-com0 at acpi?
-com1 at acpi?
-com2 at acpi?
+com0 at acpi? addr 0x3f8
+com1 at acpi? addr 0x2f8
+com2 at acpi? addr 0x3e8
com* at acpi?
glkgpio* at acpi?