summaryrefslogtreecommitdiffstats
path: root/sys/conf
diff options
context:
space:
mode:
authorian <ian@FreeBSD.org>2016-03-21 23:32:13 +0000
committerian <ian@FreeBSD.org>2016-03-21 23:32:13 +0000
commitb959fde0c8403a39510a464a1e53b56484b817b4 (patch)
treec56f287faa2c6ff305a28b7a1d165e09c00a840b /sys/conf
parent3f881fc554f737ccca46fe61b2e5b001bbf02822 (diff)
downloadFreeBSD-src-b959fde0c8403a39510a464a1e53b56484b817b4.zip
FreeBSD-src-b959fde0c8403a39510a464a1e53b56484b817b4.tar.gz
Build the zfs module on armv6, but not on older arm.
There have been reports in the past that zfs works on armv6, and now people are wanting to test it again, so let's give them something to work with.
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/kern.opts.mk3
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/conf/kern.opts.mk b/sys/conf/kern.opts.mk
index d1d2d04..17915ff 100644
--- a/sys/conf/kern.opts.mk
+++ b/sys/conf/kern.opts.mk
@@ -65,9 +65,8 @@ __DEFAULT_NO_OPTIONS:= ${__DEFAULT_NO_OPTIONS:NFAST_DEPEND}
# Things that don't work based on the CPU
.if ${MACHINE_CPUARCH} == "arm"
-BROKEN_OPTIONS+= ZFS
. if ${MACHINE_ARCH:Marmv6*} == ""
-BROKEN_OPTIONS+= CDDL
+BROKEN_OPTIONS+= CDDL ZFS
. endif
.endif
OpenPOWER on IntegriCloud