svn commit: r349488 - stable/12/sys/riscv/conf

[Mitchell Horne]

Author: mhorne
Date: Fri Jun 28 00:56:26 2019
New Revision: 349488
URL: https://svnweb.freebsd.org/changeset/base/349488

Log:
  MFC r348839:
  Clean up some GENERIC options
  
  Approved by:	markj (mentor)

Modified:
  stable/12/sys/riscv/conf/GENERIC
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/riscv/conf/GENERIC
==============================================================================
--- stable/12/sys/riscv/conf/GENERIC	Fri Jun 28 00:53:27 2019	(r349487)
+++ stable/12/sys/riscv/conf/GENERIC	Fri Jun 28 00:56:26 2019	(r349488)
@@ -22,12 +22,8 @@ cpu		RISCV
 ident		GENERIC
 
 makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
-# makeoptions	WITH_CTF=1		# Run ctfconvert(1) for DTrace support
+makeoptions	WITH_CTF=1		# Run ctfconvert(1) for DTrace support
 
-# FIXME: linker error. "--relax and -r may not be used together"
-makeoptions	WITHOUT_MODULES="usb otusfw mwlfw ispfw mwlfw ralfw rtwnfw"
-# makeoptions	NO_MODULES
-
 options 	SCHED_ULE		# ULE scheduler
 options 	PREEMPTION		# Enable kernel thread preemption
 options 	VIMAGE			# Subsystem virtualization, e.g. VNET
@@ -53,11 +49,11 @@ options 	CD9660			# ISO 9660 Filesystem
 options 	PROCFS			# Process filesystem (requires PSEUDOFS)
 options 	PSEUDOFS		# Pseudo-filesystem framework
 options 	GEOM_PART_GPT		# GUID Partition Tables.
-# options 	GEOM_RAID		# Soft RAID functionality.
+options 	GEOM_RAID		# Soft RAID functionality.
 options 	GEOM_LABEL		# Provides labelization
 options 	SCSI_DELAY=5000		# Delay (in ms) before probing SCSI
 options 	KTRACE			# ktrace(1) support
-# options 	STACK			# stack(9) support
+options 	STACK			# stack(9) support
 options 	SYSVSHM			# SYSV-style shared memory
 options 	SYSVMSG			# SYSV-style message queues
 options 	SYSVSEM			# SYSV-style semaphores