From f57516ac24201cf9548e908c2b905990c96524f7 Mon Sep 17 00:00:00 2001 From: Miod Vallat Date: Sat, 26 May 2012 17:10:08 +0000 Subject: Be more strict when specifying hpc child device attachments: specific onboard devices need only attach to hpc0 instead of hpc?. While there, remove hpc1 and hpc2 attachment from IP28 configurations, as these can not exist on Indigo2 systems. --- sys/arch/sgi/conf/GENERIC-IP22 | 8 ++++---- sys/arch/sgi/conf/GENERIC-IP28 | 14 ++++++-------- sys/arch/sgi/conf/RAMDISK-IP22 | 4 ++-- sys/arch/sgi/conf/RAMDISK-IP28 | 10 ++++------ 4 files changed, 16 insertions(+), 20 deletions(-) diff --git a/sys/arch/sgi/conf/GENERIC-IP22 b/sys/arch/sgi/conf/GENERIC-IP22 index fb05082ad5b..ac0e8ec1a0e 100644 --- a/sys/arch/sgi/conf/GENERIC-IP22 +++ b/sys/arch/sgi/conf/GENERIC-IP22 @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC-IP22,v 1.12 2012/05/18 20:31:40 miod Exp $ +# $OpenBSD: GENERIC-IP22,v 1.13 2012/05/26 17:10:07 miod Exp $ # # THIS KERNEL IS FOR INDIGO (IP20), INDY (IP22) AND INDIGO2 (IP24) SYSTEMS ONLY. # @@ -59,9 +59,9 @@ dpclock0 at hpc0 # IP20 dsclock0 at hpc0 # IP22/24 sq* at hpc? # On-board Ethernet or E++ adapter wdsc* at hpc? # On-board SCSI or GIO32 SCSI adapter -#haltwo* at hpc? # Indy/Indigo2 Audio -panel* at hpc? # Indy front panel buttons -pckbc* at hpc? # Indy/Indigo2 keyboard and mouse +#haltwo* at hpc0 # Indy/Indigo2 Audio +panel* at hpc0 # Indy front panel buttons +pckbc* at hpc0 # Indy/Indigo2 keyboard and mouse zs0 at hpc0 zs1 at hpc0 diff --git a/sys/arch/sgi/conf/GENERIC-IP28 b/sys/arch/sgi/conf/GENERIC-IP28 index 106b036eac0..8d0771c1bb4 100644 --- a/sys/arch/sgi/conf/GENERIC-IP28 +++ b/sys/arch/sgi/conf/GENERIC-IP28 @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC-IP28,v 1.1 2012/05/25 11:31:04 miod Exp $ +# $OpenBSD: GENERIC-IP28,v 1.2 2012/05/26 17:10:07 miod Exp $ # # THIS KERNEL IS FOR POWER INDIGO2 R10000 (IP28) SYSTEMS ONLY. # @@ -44,15 +44,13 @@ gio0 at imc0 eisa0 at imc0 hpc0 at gio? addr 0x1fb80000 -hpc1 at gio? addr 0x1fb00000 -hpc2 at gio? addr 0x1f980000 dsclock0 at hpc0 -sq* at hpc? # On-board Ethernet or E++ adapter -wdsc* at hpc? # On-board SCSI or GIO32 SCSI adapter -#haltwo* at hpc? # Audio -panel* at hpc? # front panel buttons -pckbc* at hpc? # keyboard and mouse +sq* at hpc? # On-board Ethernet +wdsc* at hpc? # On-board SCSI +#haltwo* at hpc0 # Audio +panel* at hpc0 # front panel buttons +pckbc* at hpc0 # keyboard and mouse zs0 at hpc0 zstty* at zs0 # Serial ports diff --git a/sys/arch/sgi/conf/RAMDISK-IP22 b/sys/arch/sgi/conf/RAMDISK-IP22 index 8a72fa0a3f5..959ad7a5b70 100644 --- a/sys/arch/sgi/conf/RAMDISK-IP22 +++ b/sys/arch/sgi/conf/RAMDISK-IP22 @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK-IP22,v 1.9 2012/05/18 20:31:40 miod Exp $ +# $OpenBSD: RAMDISK-IP22,v 1.10 2012/05/26 17:10:07 miod Exp $ # # THIS KERNEL IS FOR INDIGO (IP20), INDY (IP22) AND INDIGO2 (IP24) SYSTEMS ONLY. @@ -67,7 +67,7 @@ dpclock0 at hpc0 # IP20 dsclock0 at hpc0 # IP22/24 sq* at hpc? # On-board Ethernet or E++ adapter wdsc* at hpc? # On-board SCSI or GIO32 SCSI adapter -pckbc* at hpc? # Indy/Indigo2 keyboard and mouse +pckbc* at hpc0 # Indy/Indigo2 keyboard and mouse zs0 at hpc0 zs1 at hpc0 diff --git a/sys/arch/sgi/conf/RAMDISK-IP28 b/sys/arch/sgi/conf/RAMDISK-IP28 index caf6b79c8d4..6ee95d4c8b4 100644 --- a/sys/arch/sgi/conf/RAMDISK-IP28 +++ b/sys/arch/sgi/conf/RAMDISK-IP28 @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK-IP28,v 1.1 2012/05/25 11:31:04 miod Exp $ +# $OpenBSD: RAMDISK-IP28,v 1.2 2012/05/26 17:10:07 miod Exp $ # # THIS KERNEL IS FOR POWER INDIGO2 R10000 (IP28) SYSTEMS ONLY. @@ -52,13 +52,11 @@ gio0 at imc0 eisa0 at imc0 hpc0 at gio? addr 0x1fb80000 -hpc1 at gio? addr 0x1fb00000 -hpc2 at gio? addr 0x1f980000 dsclock0 at hpc0 -sq* at hpc? # On-board Ethernet or E++ adapter -wdsc* at hpc? # On-board SCSI or GIO32 SCSI adapter -pckbc* at hpc? # keyboard and mouse +sq* at hpc? # On-board Ethernet +wdsc* at hpc? # On-board SCSI +pckbc* at hpc0 # keyboard and mouse zs0 at hpc0 zstty* at zs0 # Serial ports -- cgit v1.2.3