From bd79cafe70c8ce510110ba6488b0705bfddfdd33 Mon Sep 17 00:00:00 2001
From: Mitchell Horne <mhorne@FreeBSD.org>
Date: Tue, 5 Dec 2023 15:28:59 -0400
Subject: [PATCH] riscv: tweak SoC-specific conf organization

Hide some lines from the main GENERIC files by mimicking arm64's model.

I do not have any intention of creating a std.riscv or SIFIVE
configuration file at this time.

Reviewed by:	jrtc27
MFC after:	3 days
Sponsored by:	The FreeBSD Foundation
Differential Revision:	https://reviews.freebsd.org/D42910
---
 sys/riscv/conf/GENERIC       | 18 +++---------------
 sys/riscv/conf/std.allwinner |  7 +++++++
 sys/riscv/conf/std.sifive    | 15 +++++++++++++++
 sys/riscv/sifive/std.sifive  |  2 --
 4 files changed, 25 insertions(+), 17 deletions(-)
 create mode 100644 sys/riscv/conf/std.allwinner
 create mode 100644 sys/riscv/conf/std.sifive
 delete mode 100644 sys/riscv/sifive/std.sifive

diff --git a/sys/riscv/conf/GENERIC b/sys/riscv/conf/GENERIC
index fd871315b27..6fcb3f1a78b 100644
--- a/sys/riscv/conf/GENERIC
+++ b/sys/riscv/conf/GENERIC
@@ -142,11 +142,9 @@ device		vt
 device		kbdmux
 
 # RTC
-device		da9063_rtc	# Dialog Semiconductor DA9063 RTC
 device		goldfish_rtc	# QEMU RTC
 
 # Ethernet drivers
-device		cgem		# Cadence GEM Gigabit Ethernet device
 device		miibus		# MII bus support
 device		xae		# Xilinx AXI Ethernet MAC
 
@@ -161,9 +159,6 @@ device		gpio
 device		spibus
 device		spigen
 
-# Power management controllers
-device		da9063_pmic	# Dialog Semiconductor DA9063 PMIC
-
 # Uncomment for memory disk
 # options 	MD_ROOT
 # options 	MD_ROOT_SIZE=32768	# 32MB ram disk
@@ -209,18 +204,11 @@ device		bpf		# Berkeley packet filter
 
 # Flattened Device Tree
 options 	FDT
-makeoptions	MODULES_EXTRA+="dtb/sifive"
 
 # I2C support
 device		iicbus		# Bus support, required for iicoc below.
 device		iicoc		# OpenCores I2C controller support
 
-# Allwinner device drivers
-device		aw_wdog		# Allwinner Watchdog
-files		"../allwinner/files.allwinner"
-
-# SiFive device drivers
-device		fu740_pci_dw
-device		sifive_gpio
-device		sifive_spi
-include		"../sifive/std.sifive"
+# Include SoC specific configuration
+include		"std.allwinner"
+include		"std.sifive"
diff --git a/sys/riscv/conf/std.allwinner b/sys/riscv/conf/std.allwinner
new file mode 100644
index 00000000000..a781164d063
--- /dev/null
+++ b/sys/riscv/conf/std.allwinner
@@ -0,0 +1,7 @@
+#
+# Allwinner SoC support
+#
+
+device		aw_wdog		# Allwinner Watchdog
+
+files		"../allwinner/files.allwinner"
diff --git a/sys/riscv/conf/std.sifive b/sys/riscv/conf/std.sifive
new file mode 100644
index 00000000000..ab20b235c44
--- /dev/null
+++ b/sys/riscv/conf/std.sifive
@@ -0,0 +1,15 @@
+#
+# SiFive SoC support
+#
+
+device		cgem		# Cadence GEM Gigabit Ethernet device
+device		da9063_pmic	# Dialog Semiconductor DA9063 PMIC
+device		da9063_rtc	# Dialog Semiconductor DA9063 RTC
+device		fu740_pci_dw
+device		sifive_gpio
+device		sifive_spi
+
+# DTBs
+makeoptions	MODULES_EXTRA+="dtb/sifive"
+
+files		"../sifive/files.sifive"
diff --git a/sys/riscv/sifive/std.sifive b/sys/riscv/sifive/std.sifive
deleted file mode 100644
index 261085d98cf..00000000000
--- a/sys/riscv/sifive/std.sifive
+++ /dev/null
@@ -1,2 +0,0 @@
-
-files		"../sifive/files.sifive"