Index: sys/conf/Makefile.riscv
===================================================================
--- sys/conf/Makefile.riscv
+++ sys/conf/Makefile.riscv
@@ -19,7 +19,7 @@
 #
 
 # Which version of config(8) is required.
-%VERSREQ=	600017
+%VERSREQ=	600012
 
 .if !defined(S)
 S=	../../..
Index: sys/conf/kern.mk
===================================================================
--- sys/conf/kern.mk
+++ sys/conf/kern.mk
@@ -150,11 +150,7 @@
 # code model as "medium" and "medany" respectively.
 #
 .if ${MACHINE_CPUARCH} == "riscv"
-.if ${MACHINE_ARCH:Mriscv*sf}
-CFLAGS+=	-march=rv64imac
-.else
 CFLAGS+=	-march=rv64imafdc
-.endif
 CFLAGS+=	-mabi=lp64
 CFLAGS.clang+=	-mcmodel=medium
 CFLAGS.gcc+=	-mcmodel=medany
Index: sys/riscv/conf/GENERICSF
===================================================================
--- sys/riscv/conf/GENERICSF
+++ /dev/null
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-# Just like generic, but with a riscv64sf MACHINE_ARCH. Override machine set in
-# DEFAULTS.
-machine riscv riscv64sf
-
-include		"GENERIC"
-ident		GENERICSF
-nooptions	FPE			# for systems without FPE