Retire the GENERICSF kernel config.

Now that hw.machine_arch handles soft-float vs hard-float there is no
longer a reason for this config.

Submitted by:	mhorne (kern.mk hunk)
Reviewed by:	imp (earlier version), kp
Sponsored by:	DARPA
Differential Revision:	https://reviews.freebsd.org/D24544

sys/conf/Makefile.riscv

@@ -19,7 +19,7 @@
 #
 
 # Which version of config(8) is required.
-%VERSREQ=	600017
+%VERSREQ=	600012
 
 .if !defined(S)
 S=	../../..

sys/conf/kern.mk

@@ -150,11 +150,7 @@ INLINE_LIMIT?=	8000
 # 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

sys/riscv/conf/GENERICSF

@@ -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