diff options
| author |   aoyama <aoyama@openbsd.org> | 2020-06-07 22:54:58 +0000 |
|---|---|---|
| committer | aoyama <aoyama@openbsd.org> | 2020-06-07 22:54:58 +0000 |
| commit | ad8b4f37c346a73a456510b62d130b34ece415a1 (patch) | |
| tree | 415d37042347ca7f0e211e0adc48937501632584 | |
| parent | Implement delay(9). (diff) | |
| download | wireguard-openbsd-ad8b4f37c346a73a456510b62d130b34ece415a1.tar.xz wireguard-openbsd-ad8b4f37c346a73a456510b62d130b34ece415a1.zip | |
Skip probing cbus(4/luna88k) and xp(4/luna88k) in RAMDISK kernel, they
are not necessary in install/upgrade process.
| -rw-r--r-- | sys/arch/luna88k/conf/files.luna88k | 4 | ||||
| -rw-r--r-- | sys/arch/luna88k/luna88k/mainbus.c | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/sys/arch/luna88k/conf/files.luna88k b/sys/arch/luna88k/conf/files.luna88k index 46c9578f309..3bb8471d466 100644 --- a/sys/arch/luna88k/conf/files.luna88k +++ b/sys/arch/luna88k/conf/files.luna88k @@ -1,4 +1,4 @@ -# $OpenBSD: files.luna88k,v 1.31 2019/12/30 12:16:12 aoyama Exp $ +# $OpenBSD: files.luna88k,v 1.32 2020/06/07 22:54:58 aoyama Exp $ # maxpartitions 16 @@ -66,7 +66,7 @@ file arch/luna88k/dev/mb89352.c spc device cbus {[port = -1], [size = 0], [iomem = -1], [iosiz = 0], [int = -1]} attach cbus at mainbus -file arch/luna88k/cbus/cbus.c +file arch/luna88k/cbus/cbus.c cbus needs-flag device pcex attach pcex at cbus diff --git a/sys/arch/luna88k/luna88k/mainbus.c b/sys/arch/luna88k/luna88k/mainbus.c index be6f852290b..0045a143535 100644 --- a/sys/arch/luna88k/luna88k/mainbus.c +++ b/sys/arch/luna88k/luna88k/mainbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mainbus.c,v 1.15 2017/11/03 09:07:54 aoyama Exp $ */ +/* $OpenBSD: mainbus.c,v 1.16 2020/06/07 22:54:58 aoyama Exp $ */ /* $NetBSD: mainbus.c,v 1.2 2000/01/07 05:13:08 nisimura Exp $ */ /*- @@ -41,7 +41,9 @@ #include <machine/cmmu.h> #include <machine/cpu.h> +#include "cbus.h" #include "lcd.h" +#include "xp.h" static const struct mainbus_attach_args devs[] = { { "clock", 0x45000000, 6, LUNA_88K|LUNA_88K2 }, /* Mostek/Dallas TimeKeeper */ @@ -50,11 +52,15 @@ static const struct mainbus_attach_args devs[] = { #endif { "le", 0xf1000000, 4, LUNA_88K|LUNA_88K2 }, /* Am7990 */ { "sio", 0x51000000, 5, LUNA_88K|LUNA_88K2 }, /* uPD7201A */ +#if NXP > 0 { "xp", 0x71000000, 1, LUNA_88K|LUNA_88K2 }, /* HD647180XP */ +#endif { "fb", 0xc1100000, -1, LUNA_88K|LUNA_88K2 }, /* BrookTree RAMDAC */ { "spc", 0xe1000000, 3, LUNA_88K|LUNA_88K2 }, /* MB89352 */ { "spc", 0xe1000040, 3, LUNA_88K2 }, /* ditto, LUNA-88K2 only */ +#if NCBUS > 0 { "cbus", 0x91000000, 4, LUNA_88K2 }, /* PC-9801 extension slot */ +#endif }; void mainbus_attach(struct device *, struct device *, void *); |