diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2016-08-06 09:50:56 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2016-08-06 09:50:56 +0000 |
| commit | 6718712b7fab343432a5e7d4e1799c0debf58e81 (patch) | |
| tree | a57cb113d8c4de75dc7d015a1c1dd44eb9da5580 /sys/arch/armv7 | |
| parent | db74dad6c4a9e720798266bc3a05e5b43b3384e9 (diff) | |
Disable edma(4). It isn't currently used and is getting in the way of
future changes as it establishes an interrupt but hasn't been converted
to attach with the fdt.
ok kettenis@
Diffstat (limited to 'sys/arch/armv7')
| -rw-r--r-- | sys/arch/armv7/conf/GENERIC | 4 | ||||
| -rw-r--r-- | sys/arch/armv7/conf/RAMDISK | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/armv7/conf/GENERIC b/sys/arch/armv7/conf/GENERIC index a2ef41e94cb..b8d069dd49d 100644 --- a/sys/arch/armv7/conf/GENERIC +++ b/sys/arch/armv7/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.39 2016/08/06 00:54:02 jsg Exp $ +# $OpenBSD: GENERIC,v 1.40 2016/08/06 09:50:55 jsg Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -62,7 +62,7 @@ omapid* at omap? # OMAP on-chip devices intc* at omap? # OMAP3 interrupt controller -edma* at omap? # OMAP3 dma controller +#edma* at omap? # OMAP3 dma controller prcm* at omap? # power/clock controller sitaracm* at omap? # sitara control module omdog* at fdt? # watchdog timer diff --git a/sys/arch/armv7/conf/RAMDISK b/sys/arch/armv7/conf/RAMDISK index 4c95f492564..a97e95e2069 100644 --- a/sys/arch/armv7/conf/RAMDISK +++ b/sys/arch/armv7/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.36 2016/08/06 00:54:02 jsg Exp $ +# $OpenBSD: RAMDISK,v 1.37 2016/08/06 09:50:55 jsg Exp $ machine armv7 arm @@ -61,7 +61,7 @@ omapid* at omap? # OMAP on-chip devices intc* at omap? # OMAP3 interrupt controller -edma* at omap? # OMAP3 dma controller +#edma* at omap? # OMAP3 dma controller prcm* at omap? # power/clock controller sitaracm* at omap? # sitara control module omdog* at fdt? # watchdog timer |