diff --git a/kernel-riscv64-debug-fedora.config b/kernel-riscv64-debug-fedora.config
index f7cd1c0b0..40ff57abb 100644
--- a/kernel-riscv64-debug-fedora.config
+++ b/kernel-riscv64-debug-fedora.config
@@ -270,6 +270,7 @@ CONFIG_ARCH_RV64I=y
 CONFIG_ARCH_SIFIVE=y
 # CONFIG_ARCH_SPARX5 is not set
 CONFIG_ARCH_STARFIVE=y
+# CONFIG_ARCH_SUNXI is not set
 CONFIG_ARCH_VIRT=y
 # CONFIG_ARCNET is not set
 CONFIG_ARM64_AMU_EXTN=y
@@ -4828,6 +4829,7 @@ CONFIG_PWRSEQ_SIMPLE=m
 # CONFIG_QCOM_IPCC is not set
 # CONFIG_QCOM_LMH is not set
 # CONFIG_QCOM_OCMEM is not set
+# CONFIG_QCOM_PMIC_GLINK is not set
 # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
 # CONFIG_QCOM_SCM is not set
 # CONFIG_QCOM_SPM is not set
@@ -5051,6 +5053,7 @@ CONFIG_RISCV_BASE_PMU=y
 CONFIG_RISCV_INTC=y
 CONFIG_RISCV_ISA_C=y
 CONFIG_RISCV_ISA_SVPBMT=y
+CONFIG_RISCV_ISA_ZBB=y
 CONFIG_RISCV_ISA_ZICBOM=y
 CONFIG_RISCV_PLIC=y
 CONFIG_RISCV_PMU_LEGACY=y
@@ -5717,6 +5720,7 @@ CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_DEV_BUS=y
 CONFIG_SERIAL_DEV_CTRL_TTYPORT=y
 # CONFIG_SERIAL_EARLYCON_RISCV_SBI is not set
+# CONFIG_SERIAL_EARLYCON_SEMIHOST is not set
 # CONFIG_SERIAL_FSL_LINFLEXUART is not set
 # CONFIG_SERIAL_FSL_LPUART is not set
 # CONFIG_SERIAL_IMX_EARLYCON is not set
@@ -6439,7 +6443,11 @@ CONFIG_SND_VX222=m
 # CONFIG_SND_XEN_FRONTEND is not set
 CONFIG_SND_YMFPCI=m
 CONFIG_SNET_VDPA=m
+CONFIG_SOC_MICROCHIP_POLARFIRE=y
+CONFIG_SOC_SIFIVE=y
+CONFIG_SOC_STARFIVE=y
 # CONFIG_SOC_TI is not set
+CONFIG_SOC_VIRT=y
 CONFIG_SOFTLOCKUP_DETECTOR=y
 CONFIG_SOFT_WATCHDOG=m
 CONFIG_SOLARIS_X86_PARTITION=y
diff --git a/kernel-riscv64-fedora.config b/kernel-riscv64-fedora.config
index 13c65d35b..f1c212d67 100644
--- a/kernel-riscv64-fedora.config
+++ b/kernel-riscv64-fedora.config
@@ -270,6 +270,7 @@ CONFIG_ARCH_RV64I=y
 CONFIG_ARCH_SIFIVE=y
 # CONFIG_ARCH_SPARX5 is not set
 CONFIG_ARCH_STARFIVE=y
+# CONFIG_ARCH_SUNXI is not set
 CONFIG_ARCH_VIRT=y
 # CONFIG_ARCNET is not set
 CONFIG_ARM64_AMU_EXTN=y
@@ -4799,6 +4800,7 @@ CONFIG_PWRSEQ_SIMPLE=m
 # CONFIG_QCOM_IPCC is not set
 # CONFIG_QCOM_LMH is not set
 # CONFIG_QCOM_OCMEM is not set
+# CONFIG_QCOM_PMIC_GLINK is not set
 # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
 # CONFIG_QCOM_SCM is not set
 # CONFIG_QCOM_SPM is not set
@@ -5022,6 +5024,7 @@ CONFIG_RISCV_BASE_PMU=y
 CONFIG_RISCV_INTC=y
 CONFIG_RISCV_ISA_C=y
 CONFIG_RISCV_ISA_SVPBMT=y
+CONFIG_RISCV_ISA_ZBB=y
 CONFIG_RISCV_ISA_ZICBOM=y
 CONFIG_RISCV_PLIC=y
 CONFIG_RISCV_PMU_LEGACY=y
@@ -5688,6 +5691,7 @@ CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_DEV_BUS=y
 CONFIG_SERIAL_DEV_CTRL_TTYPORT=y
 # CONFIG_SERIAL_EARLYCON_RISCV_SBI is not set
+# CONFIG_SERIAL_EARLYCON_SEMIHOST is not set
 # CONFIG_SERIAL_FSL_LINFLEXUART is not set
 # CONFIG_SERIAL_FSL_LPUART is not set
 # CONFIG_SERIAL_IMX_EARLYCON is not set
@@ -6408,7 +6412,11 @@ CONFIG_SND_VX222=m
 # CONFIG_SND_XEN_FRONTEND is not set
 CONFIG_SND_YMFPCI=m
 CONFIG_SNET_VDPA=m
+CONFIG_SOC_MICROCHIP_POLARFIRE=y
+CONFIG_SOC_SIFIVE=y
+CONFIG_SOC_STARFIVE=y
 # CONFIG_SOC_TI is not set
+CONFIG_SOC_VIRT=y
 CONFIG_SOFTLOCKUP_DETECTOR=y
 CONFIG_SOFT_WATCHDOG=m
 CONFIG_SOLARIS_X86_PARTITION=y