Page MenuHomeFreeBSD
Files F97617156

D42910.diff
No OneTemporary
Actions

D42910.diff
View Options

diff --git a/sys/riscv/conf/GENERIC b/sys/riscv/conf/GENERIC
--- a/sys/riscv/conf/GENERIC
+++ b/sys/riscv/conf/GENERIC
@@ -142,11 +142,9 @@
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 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 @@
# 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
--- /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
--- /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
--- a/sys/riscv/sifive/std.sifive
+++ /dev/null
@@ -1,2 +0,0 @@
-
-files "../sifive/files.sifive"

File Metadata

Mime Type
text/plain
Expires
Tue, Oct 1, 9:38 AM (21 h, 58 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
13243548
Default Alt Text
D42910.diff (2 KB)

Event Timeline