diff --git a/configs/fedora/generic/riscv/CONFIG_SPI b/configs/fedora/generic/riscv/CONFIG_SPI
new file mode 100644
index 000000000..5616bfc48
--- /dev/null
+++ b/configs/fedora/generic/riscv/CONFIG_SPI
@@ -0,0 +1 @@
+CONFIG_SPI=y
diff --git a/configs/fedora/generic/riscv/CONFIG_SPI_SIFIVE b/configs/fedora/generic/riscv/CONFIG_SPI_SIFIVE
new file mode 100644
index 000000000..db9fb1b77
--- /dev/null
+++ b/configs/fedora/generic/riscv/CONFIG_SPI_SIFIVE
@@ -0,0 +1 @@
+CONFIG_SPI_SIFIVE=y
diff --git a/kernel-riscv64-debug.config b/kernel-riscv64-debug.config
index e8b826185..6f0c07b91 100644
--- a/kernel-riscv64-debug.config
+++ b/kernel-riscv64-debug.config
@@ -5046,7 +5046,6 @@ CONFIG_SPARSEMEM_MANUAL=y
 CONFIG_SPI_FSL_LPSPI=m
 # CONFIG_SPI_FSL_SPI is not set
 # CONFIG_SPI_GPIO is not set
-# CONFIG_SPI is not set
 # CONFIG_SPI_LM70_LLP is not set
 # CONFIG_SPI_LOOPBACK_TEST is not set
 # CONFIG_SPI_MEM is not set
@@ -5057,13 +5056,14 @@ CONFIG_SPI_FSL_LPSPI=m
 # CONFIG_SPI_PXA2XX is not set
 # CONFIG_SPI_ROCKCHIP is not set
 # CONFIG_SPI_SC18IS602 is not set
-# CONFIG_SPI_SIFIVE is not set
+CONFIG_SPI_SIFIVE=y
 # CONFIG_SPI_SLAVE is not set
 # CONFIG_SPI_SPIDEV is not set
 # CONFIG_SPI_TLE62X0 is not set
 # CONFIG_SPI_TOPCLIFF_PCH is not set
 # CONFIG_SPI_XCOMM is not set
 # CONFIG_SPI_XILINX is not set
+CONFIG_SPI=y
 # CONFIG_SPI_ZYNQMP_GQSPI is not set
 # CONFIG_SPMI is not set
 # CONFIG_SPS30 is not set
diff --git a/kernel-riscv64.config b/kernel-riscv64.config
index 0d8300d44..b6967f5e0 100644
--- a/kernel-riscv64.config
+++ b/kernel-riscv64.config
@@ -5023,7 +5023,6 @@ CONFIG_SPARSEMEM_MANUAL=y
 CONFIG_SPI_FSL_LPSPI=m
 # CONFIG_SPI_FSL_SPI is not set
 # CONFIG_SPI_GPIO is not set
-# CONFIG_SPI is not set
 # CONFIG_SPI_LM70_LLP is not set
 # CONFIG_SPI_LOOPBACK_TEST is not set
 # CONFIG_SPI_MEM is not set
@@ -5034,13 +5033,14 @@ CONFIG_SPI_FSL_LPSPI=m
 # CONFIG_SPI_PXA2XX is not set
 # CONFIG_SPI_ROCKCHIP is not set
 # CONFIG_SPI_SC18IS602 is not set
-# CONFIG_SPI_SIFIVE is not set
+CONFIG_SPI_SIFIVE=y
 # CONFIG_SPI_SLAVE is not set
 # CONFIG_SPI_SPIDEV is not set
 # CONFIG_SPI_TLE62X0 is not set
 # CONFIG_SPI_TOPCLIFF_PCH is not set
 # CONFIG_SPI_XCOMM is not set
 # CONFIG_SPI_XILINX is not set
+CONFIG_SPI=y
 # CONFIG_SPI_ZYNQMP_GQSPI is not set
 # CONFIG_SPMI is not set
 # CONFIG_SPS30 is not set