From 8714ab102f9cc4a9b2c92e84e0e006a1b07dd0c5 Mon Sep 17 00:00:00 2001 From: johns Date: Thu, 26 Feb 1998 10:50:31 +0000 Subject: Backout of cpu init changes, breaks on sun4m currently.. --- sys/arch/sparc/conf/FLOPPY | 3 ++- sys/arch/sparc/conf/GENERIC | 3 ++- sys/arch/sparc/conf/GENERIC_SCSI3 | 3 ++- sys/arch/sparc/conf/RAMDISK | 1 + sys/arch/sparc/conf/SUN4 | 3 ++- sys/arch/sparc/conf/SUN4C | 1 + sys/arch/sparc/conf/SUN4M | 3 ++- 7 files changed, 12 insertions(+), 5 deletions(-) diff --git a/sys/arch/sparc/conf/FLOPPY b/sys/arch/sparc/conf/FLOPPY index 3e0a63af435..51f71498957 100644 --- a/sys/arch/sparc/conf/FLOPPY +++ b/sys/arch/sparc/conf/FLOPPY @@ -1,4 +1,4 @@ -# $OpenBSD: FLOPPY,v 1.17 1998/02/26 08:05:46 jason Exp $ +# $OpenBSD: FLOPPY,v 1.18 1998/02/26 10:50:10 johns Exp $ # $NetBSD: GENERIC,v 1.28.2.1 1996/07/02 23:55:22 jtc Exp $ # Machine architecture; required by config(8) @@ -98,6 +98,7 @@ config bsd swap generic # Main bus and CPU .. all systems. mainbus0 at root +cpu0 at mainbus0 # Bus types found on SPARC systems. sbus0 at mainbus0 # sun4c diff --git a/sys/arch/sparc/conf/GENERIC b/sys/arch/sparc/conf/GENERIC index 1edb8e7e5f8..bc4ad0330a7 100644 --- a/sys/arch/sparc/conf/GENERIC +++ b/sys/arch/sparc/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.20 1998/02/26 08:05:47 jason Exp $ +# $OpenBSD: GENERIC,v 1.21 1998/02/26 10:50:13 johns Exp $ # $NetBSD: GENERIC,v 1.48 1997/08/23 19:19:01 mjacob Exp $ # Machine architecture; required by config(8) @@ -30,6 +30,7 @@ config bsd swap generic # Main bus and CPU .. all systems. mainbus0 at root +cpu0 at mainbus0 # Bus types found on SPARC systems. sbus0 at mainbus0 # sun4c diff --git a/sys/arch/sparc/conf/GENERIC_SCSI3 b/sys/arch/sparc/conf/GENERIC_SCSI3 index aa7be47e9a4..c4acb848b5e 100644 --- a/sys/arch/sparc/conf/GENERIC_SCSI3 +++ b/sys/arch/sparc/conf/GENERIC_SCSI3 @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC_SCSI3,v 1.18 1998/02/26 08:05:48 jason Exp $ +# $OpenBSD: GENERIC_SCSI3,v 1.19 1998/02/26 10:50:18 johns Exp $ # $NetBSD: GENERIC,v 1.28.2.1 1996/07/02 23:55:22 jtc Exp $ # Machine architecture; required by config(8) @@ -30,6 +30,7 @@ config bsd swap generic # Main bus and CPU .. all systems. mainbus0 at root +cpu0 at mainbus0 # Bus types found on SPARC systems. sbus0 at mainbus0 # sun4c diff --git a/sys/arch/sparc/conf/RAMDISK b/sys/arch/sparc/conf/RAMDISK index 8618ed3637f..3b0b8b23519 100644 --- a/sys/arch/sparc/conf/RAMDISK +++ b/sys/arch/sparc/conf/RAMDISK @@ -53,6 +53,7 @@ config bsd root on rd0a # Main bus and CPU .. all systems. mainbus0 at root +cpu0 at mainbus0 # Bus types found on SPARC systems. sbus0 at mainbus0 # sun4c diff --git a/sys/arch/sparc/conf/SUN4 b/sys/arch/sparc/conf/SUN4 index 098e1a2f82e..abc105ceb07 100644 --- a/sys/arch/sparc/conf/SUN4 +++ b/sys/arch/sparc/conf/SUN4 @@ -1,4 +1,4 @@ -# $OpenBSD: SUN4,v 1.15 1998/02/26 08:05:51 jason Exp $ +# $OpenBSD: SUN4,v 1.16 1998/02/26 10:50:24 johns Exp $ # $NetBSD: GENERIC,v 1.28.2.1 1996/07/02 23:55:22 jtc Exp $ # Machine architecture; required by config(8) @@ -24,6 +24,7 @@ config bsd swap generic # Main bus and CPU .. all systems. mainbus0 at root +cpu0 at mainbus0 # Bus types found on SPARC systems. obio0 at mainbus0 # sun4 and sun4m diff --git a/sys/arch/sparc/conf/SUN4C b/sys/arch/sparc/conf/SUN4C index 0d758fc70e9..ee1e5d80873 100644 --- a/sys/arch/sparc/conf/SUN4C +++ b/sys/arch/sparc/conf/SUN4C @@ -54,6 +54,7 @@ maxusers 16 # estimated number of users config bsd swap generic mainbus0 at root +cpu0 at mainbus0 sbus0 at mainbus0 #obio0 at mainbus0 diff --git a/sys/arch/sparc/conf/SUN4M b/sys/arch/sparc/conf/SUN4M index 3b69ea2937d..ef5a896a5eb 100644 --- a/sys/arch/sparc/conf/SUN4M +++ b/sys/arch/sparc/conf/SUN4M @@ -1,4 +1,4 @@ -# $OpenBSD: SUN4M,v 1.16 1998/02/26 08:05:54 jason Exp $ +# $OpenBSD: SUN4M,v 1.17 1998/02/26 10:50:30 johns Exp $ # $NetBSD: GENERIC,v 1.28.2.1 1996/07/02 23:55:22 jtc Exp $ # Machine architecture; required by config(8) @@ -25,6 +25,7 @@ config bsd swap generic # Main bus and CPU .. all systems. mainbus0 at root +cpu0 at mainbus0 # Bus types found on SPARC systems. obio0 at mainbus0 # sun4 and sun4m -- cgit v1.2.3