diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2015-05-24 08:01:47 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2015-05-24 08:01:47 +0000 |
| commit | e2c608feb80b76c2b9ccc7ed1344ef193716b42d (patch) | |
| tree | 9bda74d1b496666d32c720e7a5957640f873fdb0 /sys | |
| parent | a73babbe75323f3b1bdd6629e17c8980720261b8 (diff) | |
Add udl(4) and uvideo(4) to armv7 GENERIC. Tested on my sabre lite (imx).
enable udl firmware and COMPAT_RAW_KBD to make udl useable with X.
ok jsg@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/armv7/conf/GENERIC | 11 | ||||
| -rw-r--r-- | sys/dev/microcode/udl/Makefile | 3 |
2 files changed, 11 insertions, 3 deletions
diff --git a/sys/arch/armv7/conf/GENERIC b/sys/arch/armv7/conf/GENERIC index 06421c0f097..fee06812ee3 100644 --- a/sys/arch/armv7/conf/GENERIC +++ b/sys/arch/armv7/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.1 2015/05/20 01:44:20 jsg Exp $ +# $OpenBSD: GENERIC,v 1.2 2015/05/24 08:01:46 matthieu Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -18,7 +18,7 @@ maxusers 32 # estimated number of users option CPU_ARMv7 # Support the ARMv7 #option WSDISPLAY_COMPAT_USL # VT handling -#option WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes +option WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes option WSDISPLAY_DEFAULTSCREENS=1 #option WSDISPLAY_COMPAT_PCVT # emulate some ioctls @@ -150,6 +150,10 @@ udsbr* at uhub? # D-Link DSB-R100 radio radio* at udsbr? # USB radio ugen* at uhub? # USB Generic driver rum* at uhub? # Ralink RT2501USB/RT2601USB +uvideo* at uhub? # USB Video +video* at uvideo? +udl* at uhub? # DisplayLink USB displays +wsdisplay* at udl? atphy* at mii? # Attansic F1 PHYs rgephy* at mii? # Realtek 8169S/8110S PHY @@ -178,3 +182,6 @@ owctr* at onewire? # Counter device # Pseudo-Devices pseudo-device hotplug 1 # devices hot plugging + +# mouse & keyboard multiplexor pseudo-devices +pseudo-device wsmux 2 diff --git a/sys/dev/microcode/udl/Makefile b/sys/dev/microcode/udl/Makefile index d8e315c853c..07e76d38254 100644 --- a/sys/dev/microcode/udl/Makefile +++ b/sys/dev/microcode/udl/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2013/03/25 17:40:12 deraadt Exp $ +# $OpenBSD: Makefile,v 1.4 2015/05/24 08:01:46 matthieu Exp $ NOPROG= NOMAN= @@ -7,6 +7,7 @@ CC=${HOSTCC} # USB capable systems only .if (${MACHINE_ARCH} == "powerpc" || \ ${MACHINE} == "alpha" || ${MACHINE} == "amd64" || \ + ${MACHINE} == "armv7" || \ ${MACHINE} == "armish" || ${MACHINE} == "hppa" || \ ${MACHINE} == "hppa64" || ${MACHINE} == "i386" || \ ${MACHINE} == "landisk" || ${MACHINE} == "loongson" || \ |