svn commit: r338347 - in head: sys/conf sys/modules tools/build/options

[Warner Losh]

Author: imp
Date: Tue Aug 28 14:46:49 2018
New Revision: 338347
URL: https://svnweb.freebsd.org/changeset/base/338347

Log:
  Put building of drm and drm2 modules behind options.
  
  Make the building of drm dependent on MK_MODULE_DRM and the building
  of module drm2 on MK_MODULE_DRM2. The defaults are unchanged.
  
  Approved by: re@ (gjb)
  Differential Review: https://reviews.freebsd.org/D16894

Added:
  head/tools/build/options/WITHOUT_MODULE_DRM   (contents, props changed)
  head/tools/build/options/WITHOUT_MODULE_DRM2   (contents, props changed)
  head/tools/build/options/WITH_MODULE_DRM   (contents, props changed)
  head/tools/build/options/WITH_MODULE_DRM2   (contents, props changed)
Modified:
  head/sys/conf/kern.opts.mk
  head/sys/modules/Makefile

Modified: head/sys/conf/kern.opts.mk
==============================================================================
--- head/sys/conf/kern.opts.mk	Tue Aug 28 14:33:04 2018	(r338346)
+++ head/sys/conf/kern.opts.mk	Tue Aug 28 14:46:49 2018	(r338347)
@@ -38,6 +38,8 @@ __DEFAULT_YES_OPTIONS = \
     IPSEC_SUPPORT \
     ISCSI \
     KERNEL_SYMBOLS \
+    MODULE_DRM \
+    MODULE_DRM2 \
     NETGRAPH \
     PF \
     SOURCELESS_HOST \

Modified: head/sys/modules/Makefile
==============================================================================
--- head/sys/modules/Makefile	Tue Aug 28 14:33:04 2018	(r338346)
+++ head/sys/modules/Makefile	Tue Aug 28 14:46:49 2018	(r338347)
@@ -583,8 +583,12 @@ _cpuctl=	cpuctl
 _cpufreq=	cpufreq
 _cs=		cs
 _dpms=		dpms
+.if ${MK_MODULE_DRM} != "no"
 _drm=		drm
+.endif
+.if ${MK_MODULE_DRM2} != "no"
 _drm2=		drm2
+.endif
 _ed=		ed
 _em=		em
 _ena=		ena
@@ -781,7 +785,9 @@ _cardbus=	cardbus
 _cbb=		cbb
 _cfi=		cfi
 _cpufreq=	cpufreq
+.if ${MK_MODULE_DRM} != "no"
 _drm=		drm
+.endif
 _exca=		exca
 _ffec=		ffec
 _nvd=		nvd
@@ -791,7 +797,9 @@ _wi=		wi
 .endif
 
 .if ${MACHINE_ARCH} == "powerpc64"
+.if ${MK_MODULE_DRM2} != "no"
 _drm2=		drm2
+.endif
 _ipmi=		ipmi
 .endif
 .if ${MACHINE_ARCH} == "powerpc64" || ${MACHINE_ARCH} == "powerpc"

Added: head/tools/build/options/WITHOUT_MODULE_DRM
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/tools/build/options/WITHOUT_MODULE_DRM	Tue Aug 28 14:46:49 2018	(r338347)
@@ -0,0 +1,3 @@
+.\" $FreeBSD$
+Disable creation of old drm video modules.
+

Added: head/tools/build/options/WITHOUT_MODULE_DRM2
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/tools/build/options/WITHOUT_MODULE_DRM2	Tue Aug 28 14:46:49 2018	(r338347)
@@ -0,0 +1,2 @@
+.\" $FreeBSD$
+Disable creation of old drm2 video modules.

Added: head/tools/build/options/WITH_MODULE_DRM
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/tools/build/options/WITH_MODULE_DRM	Tue Aug 28 14:46:49 2018	(r338347)
@@ -0,0 +1,2 @@
+.\" $FreeBSD$
+Enable creation of old drm video modules.

Added: head/tools/build/options/WITH_MODULE_DRM2
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/tools/build/options/WITH_MODULE_DRM2	Tue Aug 28 14:46:49 2018	(r338347)
@@ -0,0 +1,2 @@
+.\" $FreeBSD$
+Enable creation of old drm2 video modules.