svn commit: r297174 - head/sys/conf

[Ian Lepore]

Author: ian
Date: Mon Mar 21 23:32:13 2016
New Revision: 297174
URL: https://svnweb.freebsd.org/changeset/base/297174

Log:
  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.

Modified:
  head/sys/conf/kern.opts.mk

Modified: head/sys/conf/kern.opts.mk
==============================================================================
--- head/sys/conf/kern.opts.mk	Mon Mar 21 23:25:41 2016	(r297173)
+++ head/sys/conf/kern.opts.mk	Mon Mar 21 23:32:13 2016	(r297174)
@@ -65,9 +65,8 @@ __DEFAULT_NO_OPTIONS:=	${__DEFAULT_NO_OP
 
 # 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