From 1e0de6572503fbb9a457fb54f1db495c5ea1dc63 Mon Sep 17 00:00:00 2001
From: David Abdurachmanov <davidlt@rivosinc.com>
Date: Tue, 15 Aug 2023 08:08:11 +0300
Subject: [PATCH] Update riscv64 configs

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
---
 kernel-riscv64-debug-fedora.config | 9 +++++----
 kernel-riscv64-fedora.config       | 9 +++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/kernel-riscv64-debug-fedora.config b/kernel-riscv64-debug-fedora.config
index 19b1d62e7..371833c8d 100644
--- a/kernel-riscv64-debug-fedora.config
+++ b/kernel-riscv64-debug-fedora.config
@@ -401,7 +401,6 @@ CONFIG_ATOMIC64_SELFTEST=y
 CONFIG_ATP=m
 CONFIG_AUDITSYSCALL=y
 CONFIG_AUDIT=y
-CONFIG_AUTOFS4_FS=y
 CONFIG_AUTOFS_FS=y
 CONFIG_AUXDISPLAY=y
 CONFIG_AX25_DAMA_SLAVE=y
@@ -1023,6 +1022,7 @@ CONFIG_CPU_LITTLE_ENDIAN=y
 CONFIG_CPUMASK_KUNIT_TEST=m
 CONFIG_CPUMASK_OFFSTACK=y
 CONFIG_CPUSETS=y
+CONFIG_CPU_SRSO=y
 # CONFIG_CPU_THERMAL is not set
 # CONFIG_CRAMFS is not set
 # CONFIG_CRAMFS_MTD is not set
@@ -1048,7 +1048,8 @@ CONFIG_CROS_EC_MKBP_PROXIMITY=m
 CONFIG_CROS_EC_RPMSG=m
 CONFIG_CROS_EC_SENSORHUB=m
 CONFIG_CROS_EC_TYPEC=m
-# CONFIG_CROS_HPS_I2C is not set
+CONFIG_CROS_EC_UART=m
+CONFIG_CROS_HPS_I2C=m
 CONFIG_CROS_KBD_LED_BACKLIGHT=m
 CONFIG_CROS_KUNIT=m
 CONFIG_CROSS_MEMORY_ATTACH=y
@@ -2057,6 +2058,7 @@ CONFIG_GAMEPORT_NS558=m
 # CONFIG_GCC_PLUGIN_STACKLEAK is not set
 # CONFIG_GCOV_KERNEL is not set
 # CONFIG_GDB_SCRIPTS is not set
+# CONFIG_GDS_FORCE_MITIGATION is not set
 # CONFIG_GENERIC_ADC_BATTERY is not set
 # CONFIG_GENERIC_ADC_THERMAL is not set
 # CONFIG_GENERIC_CPU is not set
@@ -2373,8 +2375,7 @@ CONFIG_HYPERV_STORAGE=m
 # CONFIG_HYPERV_TESTING is not set
 CONFIG_HYPERV_UTILS=m
 CONFIG_HYPERV_VSOCKETS=m
-CONFIG_HZ=100
-# CONFIG_HZ_1000 is not set
+CONFIG_HZ_1000=y
 CONFIG_HZ_100=y
 # CONFIG_HZ_200 is not set
 # CONFIG_HZ_250 is not set
diff --git a/kernel-riscv64-fedora.config b/kernel-riscv64-fedora.config
index f3407e0a9..f24407bfd 100644
--- a/kernel-riscv64-fedora.config
+++ b/kernel-riscv64-fedora.config
@@ -399,7 +399,6 @@ CONFIG_ATOMIC64_SELFTEST=y
 CONFIG_ATP=m
 CONFIG_AUDITSYSCALL=y
 CONFIG_AUDIT=y
-CONFIG_AUTOFS4_FS=y
 CONFIG_AUTOFS_FS=y
 CONFIG_AUXDISPLAY=y
 CONFIG_AX25_DAMA_SLAVE=y
@@ -1021,6 +1020,7 @@ CONFIG_CPU_LITTLE_ENDIAN=y
 CONFIG_CPUMASK_KUNIT_TEST=m
 CONFIG_CPUMASK_OFFSTACK=y
 CONFIG_CPUSETS=y
+CONFIG_CPU_SRSO=y
 # CONFIG_CPU_THERMAL is not set
 # CONFIG_CRAMFS is not set
 # CONFIG_CRAMFS_MTD is not set
@@ -1046,7 +1046,8 @@ CONFIG_CROS_EC_MKBP_PROXIMITY=m
 CONFIG_CROS_EC_RPMSG=m
 CONFIG_CROS_EC_SENSORHUB=m
 CONFIG_CROS_EC_TYPEC=m
-# CONFIG_CROS_HPS_I2C is not set
+CONFIG_CROS_EC_UART=m
+CONFIG_CROS_HPS_I2C=m
 CONFIG_CROS_KBD_LED_BACKLIGHT=m
 CONFIG_CROS_KUNIT=m
 CONFIG_CROSS_MEMORY_ATTACH=y
@@ -2038,6 +2039,7 @@ CONFIG_GAMEPORT_NS558=m
 # CONFIG_GCC_PLUGIN_STACKLEAK is not set
 # CONFIG_GCOV_KERNEL is not set
 # CONFIG_GDB_SCRIPTS is not set
+# CONFIG_GDS_FORCE_MITIGATION is not set
 # CONFIG_GENERIC_ADC_BATTERY is not set
 # CONFIG_GENERIC_ADC_THERMAL is not set
 # CONFIG_GENERIC_CPU is not set
@@ -2354,8 +2356,7 @@ CONFIG_HYPERV_STORAGE=m
 # CONFIG_HYPERV_TESTING is not set
 CONFIG_HYPERV_UTILS=m
 CONFIG_HYPERV_VSOCKETS=m
-CONFIG_HZ=100
-# CONFIG_HZ_1000 is not set
+CONFIG_HZ_1000=y
 CONFIG_HZ_100=y
 # CONFIG_HZ_200 is not set
 # CONFIG_HZ_250 is not set