1 files changed, 41 insertions, 29 deletions

diff --git a/hw/riscv/Kconfig b/hw/riscv/Kconfig
index 28947ef3e0..2df978fe8d 100644
--- a/hw/riscv/Kconfig
+++ b/hw/riscv/Kconfig
@@ -1,50 +1,62 @@
-config HTIF
+config IBEX
     bool
 
-config HART
+config MICROCHIP_PFSOC
     bool
+    select CADENCE_SDHCI
+    select MCHP_PFSOC_MMUART
+    select MSI_NONBROKEN
+    select SIFIVE_CLINT
+    select SIFIVE_PDMA
+    select SIFIVE_PLIC
+    select UNIMP
 
-config IBEX
+config OPENTITAN
     bool
+    select IBEX
+    select UNIMP
 
-config SIFIVE
+config RISCV_VIRT
     bool
+    imply PCI_DEVICES
+    imply TEST_DEVICES
+    select GOLDFISH_RTC
     select MSI_NONBROKEN
+    select PCI
+    select PCI_EXPRESS_GENERIC_BRIDGE
+    select PFLASH_CFI01
+    select SERIAL
+    select SIFIVE_CLINT
+    select SIFIVE_PLIC
+    select SIFIVE_TEST
+    select VIRTIO_MMIO
 
 config SIFIVE_E
     bool
-    select HART
-    select SIFIVE
+    select MSI_NONBROKEN
+    select SIFIVE_CLINT
+    select SIFIVE_GPIO
+    select SIFIVE_PLIC
+    select SIFIVE_UART
+    select SIFIVE_E_PRCI
     select UNIMP
 
 config SIFIVE_U
     bool
     select CADENCE
-    select HART
-    select SIFIVE
+    select MSI_NONBROKEN
+    select SIFIVE_CLINT
+    select SIFIVE_GPIO
+    select SIFIVE_PDMA
+    select SIFIVE_PLIC
+    select SIFIVE_UART
+    select SIFIVE_U_OTP
+    select SIFIVE_U_PRCI
     select UNIMP
 
 config SPIKE
     bool
-    select HART
     select HTIF
-    select SIFIVE
-
-config OPENTITAN
-    bool
-    select IBEX
-    select HART
-    select UNIMP
-
-config RISCV_VIRT
-    bool
-    imply PCI_DEVICES
-    imply TEST_DEVICES
-    select PCI
-    select HART
-    select SERIAL
-    select GOLDFISH_RTC
-    select VIRTIO_MMIO
-    select PCI_EXPRESS_GENERIC_BRIDGE
-    select PFLASH_CFI01
-    select SIFIVE
+    select MSI_NONBROKEN
+    select SIFIVE_CLINT
+    select SIFIVE_PLIC