diff --git a/kernel-riscv64-debug-fedora.config b/kernel-riscv64-debug-fedora.config
index 718cd4621..7bae7ed1c 100644
--- a/kernel-riscv64-debug-fedora.config
+++ b/kernel-riscv64-debug-fedora.config
@@ -840,10 +840,10 @@ CONFIG_CRC32_SLICEBY8=y
 CONFIG_CRC32=y
 CONFIG_CRC4=m
 CONFIG_CRC64=m
-CONFIG_CRC7=m
+CONFIG_CRC7=y
 CONFIG_CRC8=m
 CONFIG_CRC_CCITT=y
-CONFIG_CRC_ITU_T=m
+CONFIG_CRC_ITU_T=y
 CONFIG_CRC_T10DIF=y
 # CONFIG_CROS_EC_DEBUGFS is not set
 CONFIG_CROS_EC_ISHTP=m
@@ -1671,9 +1671,9 @@ CONFIG_GIGASET_M105=m
 # CONFIG_GLOB_SELFTEST is not set
 # CONFIG_GNSS is not set
 # CONFIG_GOLDFISH_AUDIO is not set
-# CONFIG_GOLDFISH is not set
 # CONFIG_GOLDFISH_PIPE is not set
 # CONFIG_GOLDFISH_TTY is not set
+CONFIG_GOLDFISH=y
 # CONFIG_GOOGLE_FIRMWARE is not set
 CONFIG_GP2AP002=m
 # CONFIG_GP2AP020A00F is not set
@@ -2882,7 +2882,7 @@ CONFIG_MFD_AT91_USART=m
 # CONFIG_MFD_AXP20X is not set
 # CONFIG_MFD_BCM590XX is not set
 CONFIG_MFD_BD9571MWV=m
-CONFIG_MFD_CORE=y
+CONFIG_MFD_CORE=m
 # CONFIG_MFD_CPCAP is not set
 # CONFIG_MFD_CROS_EC is not set
 # CONFIG_MFD_CS5535 is not set
@@ -3746,8 +3746,8 @@ CONFIG_NLS_MAC_TURKISH=m
 CONFIG_NLS_UTF8=m
 CONFIG_NLS=y
 # CONFIG_NOA1305 is not set
-CONFIG_NO_HZ_FULL=y
-# CONFIG_NO_HZ_IDLE is not set
+# CONFIG_NO_HZ_FULL is not set
+CONFIG_NO_HZ_IDLE=y
 CONFIG_NO_HZ=y
 CONFIG_NOP_USB_XCEIV=m
 CONFIG_NORTEL_HERMES=m
@@ -4234,7 +4234,7 @@ CONFIG_REALTEK_PHY=y
 # CONFIG_REED_SOLOMON_TEST is not set
 # CONFIG_REFCOUNT_FULL is not set
 CONFIG_REGMAP_I2C=m
-CONFIG_REGMAP_SPI=y
+CONFIG_REGMAP_SPI=m
 CONFIG_REGMAP=y
 # CONFIG_REGULATOR_88PG86X is not set
 # CONFIG_REGULATOR_ACT8865 is not set
@@ -4336,7 +4336,7 @@ CONFIG_ROMFS_BACKED_BY_BLOCK=y
 CONFIG_ROMFS_FS=m
 CONFIG_ROSE=m
 CONFIG_RPCSEC_GSS_KRB5=m
-CONFIG_RPMSG_CHAR=y
+CONFIG_RPMSG_CHAR=m
 # CONFIG_RPMSG_QCOM_GLINK_RPM is not set
 # CONFIG_RPMSG_QCOM_GLINK_SMEM is not set
 CONFIG_RPMSG_VIRTIO=m
@@ -5140,7 +5140,7 @@ CONFIG_SND_SOC_ES7134=m
 # CONFIG_SND_SOC_ES7241 is not set
 # CONFIG_SND_SOC_ES8316 is not set
 CONFIG_SND_SOC_ES8328_I2C=m
-# CONFIG_SND_SOC_ES8328 is not set
+CONFIG_SND_SOC_ES8328=m
 CONFIG_SND_SOC_ES8328_SPI=m
 # CONFIG_SND_SOC_FSL_ASOC_CARD is not set
 # CONFIG_SND_SOC_FSL_ASRC is not set
@@ -5403,7 +5403,7 @@ CONFIG_STMMAC_ETH=m
 # CONFIG_STMMAC_PCI is not set
 # CONFIG_STMMAC_PLATFORM is not set
 # CONFIG_STMMAC_SELFTESTS is not set
-CONFIG_STRICT_DEVMEM=y
+# CONFIG_STRICT_DEVMEM is not set
 CONFIG_STRICT_KERNEL_RWX=y
 # CONFIG_STRING_SELFTEST is not set
 CONFIG_STRIP_ASM_SYMS=y
@@ -5573,7 +5573,7 @@ CONFIG_TI_ADS1015=m
 # CONFIG_TI_ADS7950 is not set
 CONFIG_TI_ADS8344=m
 # CONFIG_TI_ADS8688 is not set
-# CONFIG_TICK_CPU_ACCOUNTING is not set
+CONFIG_TICK_CPU_ACCOUNTING=y
 # CONFIG_TI_CPSW_PHY_SEL is not set
 # CONFIG_TI_DAC082S085 is not set
 # CONFIG_TI_DAC5571 is not set
diff --git a/kernel-riscv64-fedora.config b/kernel-riscv64-fedora.config
index 92aa94bf9..15775c435 100644
--- a/kernel-riscv64-fedora.config
+++ b/kernel-riscv64-fedora.config
@@ -839,10 +839,10 @@ CONFIG_CRC32_SLICEBY8=y
 CONFIG_CRC32=y
 CONFIG_CRC4=m
 CONFIG_CRC64=m
-CONFIG_CRC7=m
+CONFIG_CRC7=y
 CONFIG_CRC8=m
 CONFIG_CRC_CCITT=y
-CONFIG_CRC_ITU_T=m
+CONFIG_CRC_ITU_T=y
 CONFIG_CRC_T10DIF=y
 # CONFIG_CROS_EC_DEBUGFS is not set
 CONFIG_CROS_EC_ISHTP=m
@@ -1654,9 +1654,9 @@ CONFIG_GIGASET_M105=m
 # CONFIG_GLOB_SELFTEST is not set
 # CONFIG_GNSS is not set
 # CONFIG_GOLDFISH_AUDIO is not set
-# CONFIG_GOLDFISH is not set
 # CONFIG_GOLDFISH_PIPE is not set
 # CONFIG_GOLDFISH_TTY is not set
+CONFIG_GOLDFISH=y
 # CONFIG_GOOGLE_FIRMWARE is not set
 CONFIG_GP2AP002=m
 # CONFIG_GP2AP020A00F is not set
@@ -2862,7 +2862,7 @@ CONFIG_MFD_AT91_USART=m
 # CONFIG_MFD_AXP20X is not set
 # CONFIG_MFD_BCM590XX is not set
 CONFIG_MFD_BD9571MWV=m
-CONFIG_MFD_CORE=y
+CONFIG_MFD_CORE=m
 # CONFIG_MFD_CPCAP is not set
 # CONFIG_MFD_CROS_EC is not set
 # CONFIG_MFD_CS5535 is not set
@@ -3726,8 +3726,8 @@ CONFIG_NLS_MAC_TURKISH=m
 CONFIG_NLS_UTF8=m
 CONFIG_NLS=y
 # CONFIG_NOA1305 is not set
-CONFIG_NO_HZ_FULL=y
-# CONFIG_NO_HZ_IDLE is not set
+# CONFIG_NO_HZ_FULL is not set
+CONFIG_NO_HZ_IDLE=y
 CONFIG_NO_HZ=y
 CONFIG_NOP_USB_XCEIV=m
 CONFIG_NORTEL_HERMES=m
@@ -4214,7 +4214,7 @@ CONFIG_REALTEK_PHY=y
 # CONFIG_REED_SOLOMON_TEST is not set
 # CONFIG_REFCOUNT_FULL is not set
 CONFIG_REGMAP_I2C=m
-CONFIG_REGMAP_SPI=y
+CONFIG_REGMAP_SPI=m
 CONFIG_REGMAP=y
 # CONFIG_REGULATOR_88PG86X is not set
 # CONFIG_REGULATOR_ACT8865 is not set
@@ -4316,7 +4316,7 @@ CONFIG_ROMFS_BACKED_BY_BLOCK=y
 CONFIG_ROMFS_FS=m
 CONFIG_ROSE=m
 CONFIG_RPCSEC_GSS_KRB5=m
-CONFIG_RPMSG_CHAR=y
+CONFIG_RPMSG_CHAR=m
 # CONFIG_RPMSG_QCOM_GLINK_RPM is not set
 # CONFIG_RPMSG_QCOM_GLINK_SMEM is not set
 CONFIG_RPMSG_VIRTIO=m
@@ -5119,7 +5119,7 @@ CONFIG_SND_SOC_ES7134=m
 # CONFIG_SND_SOC_ES7241 is not set
 # CONFIG_SND_SOC_ES8316 is not set
 CONFIG_SND_SOC_ES8328_I2C=m
-# CONFIG_SND_SOC_ES8328 is not set
+CONFIG_SND_SOC_ES8328=m
 CONFIG_SND_SOC_ES8328_SPI=m
 # CONFIG_SND_SOC_FSL_ASOC_CARD is not set
 # CONFIG_SND_SOC_FSL_ASRC is not set
@@ -5382,7 +5382,7 @@ CONFIG_STMMAC_ETH=m
 # CONFIG_STMMAC_PCI is not set
 # CONFIG_STMMAC_PLATFORM is not set
 # CONFIG_STMMAC_SELFTESTS is not set
-CONFIG_STRICT_DEVMEM=y
+# CONFIG_STRICT_DEVMEM is not set
 CONFIG_STRICT_KERNEL_RWX=y
 # CONFIG_STRING_SELFTEST is not set
 CONFIG_STRIP_ASM_SYMS=y
@@ -5552,7 +5552,7 @@ CONFIG_TI_ADS1015=m
 # CONFIG_TI_ADS7950 is not set
 CONFIG_TI_ADS8344=m
 # CONFIG_TI_ADS8688 is not set
-# CONFIG_TICK_CPU_ACCOUNTING is not set
+CONFIG_TICK_CPU_ACCOUNTING=y
 # CONFIG_TI_CPSW_PHY_SEL is not set
 # CONFIG_TI_DAC082S085 is not set
 # CONFIG_TI_DAC5571 is not set