diff options
| -rw-r--r-- | sys/arch/arm/arm/conf.c | 5 | ||||
| -rw-r--r-- | sys/arch/arm/arm/openprom.c | 8 | ||||
| -rw-r--r-- | sys/arch/arm/conf/files.arm | 5 | ||||
| -rw-r--r-- | sys/arch/armv7/conf/GENERIC | 5 | ||||
| -rw-r--r-- | sys/arch/armv7/conf/RAMDISK | 3 | ||||
| -rw-r--r-- | sys/arch/armv7/conf/files.armv7 | 3 |
6 files changed, 20 insertions, 9 deletions
diff --git a/sys/arch/arm/arm/conf.c b/sys/arch/arm/arm/conf.c index 343dcd6f9cc..3d82f23cfb4 100644 --- a/sys/arch/arm/arm/conf.c +++ b/sys/arch/arm/arm/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.45 2016/05/21 21:24:36 kettenis Exp $ */ +/* $OpenBSD: conf.c,v 1.46 2016/05/23 00:05:34 deraadt Exp $ */ /* $NetBSD: conf.c,v 1.10 2002/04/19 01:04:38 wiz Exp $ */ /* @@ -257,6 +257,7 @@ struct bdevsw bdevsw[] = { #include "vscsi.h" #include "pppx.h" #include "fuse.h" +#include "openprom.h" #ifdef CONF_HAVE_GPIO #include "gpio.h" @@ -353,7 +354,7 @@ struct cdevsw cdevsw[] = { cdev_notdef(), /* 79: removed device */ cdev_notdef(), /* 80: removed device */ cdev_notdef(), /* 81: removed device */ - cdev_openprom_init(1,openprom), /* 82: /dev/openprom */ + cdev_openprom_init(NOPENPROM,openprom), /* 82: /dev/openprom */ cdev_notdef(), /* 83: removed device */ cdev_notdef(), /* 84: removed device */ cdev_notdef(), /* 85: removed device */ diff --git a/sys/arch/arm/arm/openprom.c b/sys/arch/arm/arm/openprom.c index db2793738e5..cfb8231a02a 100644 --- a/sys/arch/arm/arm/openprom.c +++ b/sys/arch/arm/arm/openprom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: openprom.c,v 1.1 2016/05/21 21:24:36 kettenis Exp $ */ +/* $OpenBSD: openprom.c,v 1.2 2016/05/23 00:05:34 deraadt Exp $ */ /* $NetBSD: openprom.c,v 1.4 2002/01/10 06:21:53 briggs Exp $ */ /* @@ -62,6 +62,12 @@ static int optionsnode; /* node ID of ROM's options */ static int openpromcheckid(int, int); static int openpromgetstr(int, char *, char **); +void openpromattach(int); + +void +openpromattach(int num) +{ +} int openpromopen(dev_t dev, int flags, int mode, struct proc *p) diff --git a/sys/arch/arm/conf/files.arm b/sys/arch/arm/conf/files.arm index d4cdcc3a811..867fd1bbcaa 100644 --- a/sys/arch/arm/conf/files.arm +++ b/sys/arch/arm/conf/files.arm @@ -1,4 +1,4 @@ -# $OpenBSD: files.arm,v 1.36 2016/05/02 08:15:55 patrick Exp $ +# $OpenBSD: files.arm,v 1.37 2016/05/23 00:05:35 deraadt Exp $ # $NetBSD: files.arm,v 1.76 2003/11/05 12:53:15 scw Exp $ # generic networking files @@ -82,6 +82,9 @@ file arch/arm/armv7/armv7_a4x_io.S cpu_armv7 file arch/arm/armv7/armv7_mutex.c cpu_armv7 file arch/arm/armv7/bus_space_asm_armv7.S cpu_armv7 +pseudo-device openprom +file arch/arm/arm/openprom.c openprom needs-flag + # arm library functions file arch/arm/arm/bcopy_page.S diff --git a/sys/arch/armv7/conf/GENERIC b/sys/arch/armv7/conf/GENERIC index ca5e91ca31a..ae5bf143dc7 100644 --- a/sys/arch/armv7/conf/GENERIC +++ b/sys/arch/armv7/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.11 2016/05/21 12:37:28 kettenis Exp $ +# $OpenBSD: GENERIC,v 1.12 2016/05/23 00:05:35 deraadt Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -264,7 +264,8 @@ owtemp* at onewire? # Temperature owctr* at onewire? # Counter device # Pseudo-Devices -pseudo-device hotplug 1 # devices hot plugging +pseudo-device openprom +pseudo-device hotplug 1 # devices hot plugging # mouse & keyboard multiplexor pseudo-devices pseudo-device wsmux 2 diff --git a/sys/arch/armv7/conf/RAMDISK b/sys/arch/armv7/conf/RAMDISK index c4cd8865940..17b6a440963 100644 --- a/sys/arch/armv7/conf/RAMDISK +++ b/sys/arch/armv7/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.10 2016/05/21 12:37:28 kettenis Exp $ +# $OpenBSD: RAMDISK,v 1.11 2016/05/23 00:05:35 deraadt Exp $ machine armv7 arm @@ -179,6 +179,7 @@ scsibus* at scsi? sd* at scsibus? cd* at scsibus? +pseudo-device openprom pseudo-device loop 1 pseudo-device bpfilter 1 pseudo-device rd 1 diff --git a/sys/arch/armv7/conf/files.armv7 b/sys/arch/armv7/conf/files.armv7 index 996f1357c99..02ee29cfc2f 100644 --- a/sys/arch/armv7/conf/files.armv7 +++ b/sys/arch/armv7/conf/files.armv7 @@ -1,4 +1,4 @@ -# $OpenBSD: files.armv7,v 1.18 2016/05/21 21:24:36 kettenis Exp $ +# $OpenBSD: files.armv7,v 1.19 2016/05/23 00:05:35 deraadt Exp $ maxpartitions 16 maxusers 2 8 64 @@ -26,7 +26,6 @@ file arch/armv7/armv7/armv7_machdep.c file arch/armv7/armv7/autoconf.c file arch/armv7/armv7/platform.c file arch/arm/arm/disksubr.c disk -file arch/arm/arm/openprom.c include "dev/sdmmc/files.sdmmc" |