From c090ab8d679cb66620e456c322539898c26a343f Mon Sep 17 00:00:00 2001
From: ColorfulRhino <131405023+ColorfulRhino@users.noreply.github.com>
Date: Mon, 1 Jul 2024 15:14:10 +0200
Subject: [PATCH] SpacemiT: Reqrite kernel configs for `legacy` and `current`

---
 config/kernel/linux-spacemit-6.1.config    |  7 ++++---
 config/kernel/linux-spacemit-legacy.config | 10 +++++++++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/config/kernel/linux-spacemit-6.1.config b/config/kernel/linux-spacemit-6.1.config
index cfb516d2d7f2..91641c5b1cb5 100644
--- a/config/kernel/linux-spacemit-6.1.config
+++ b/config/kernel/linux-spacemit-6.1.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/riscv 6.1.95 Kernel Configuration
+# Linux/riscv 6.1.96 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="riscv64-linux-gnu-gcc (Ubuntu 13.2.0-23ubuntu4) 13.2.0"
 CONFIG_CC_IS_GCC=y
@@ -2631,7 +2631,6 @@ CONFIG_WLAN=y
 CONFIG_WLAN_VENDOR_REALTEK=y
 # CONFIG_RTL8180 is not set
 # CONFIG_RTL8187 is not set
-CONFIG_RTL8852BS=m
 CONFIG_RTL_CARDS=m
 # CONFIG_RTL8192CE is not set
 # CONFIG_RTL8192SE is not set
@@ -2645,6 +2644,7 @@ CONFIG_RTL_CARDS=m
 # CONFIG_RTL8XXXU is not set
 # CONFIG_RTW88 is not set
 # CONFIG_RTW89 is not set
+CONFIG_RTL8852BS=m
 # CONFIG_WLAN_VENDOR_RSI is not set
 # CONFIG_WLAN_VENDOR_SILABS is not set
 # CONFIG_WLAN_VENDOR_ST is not set
@@ -5112,7 +5112,6 @@ CONFIG_DRM_SPACEMIT=y
 CONFIG_SPACEMIT_MIPI_PANEL=y
 CONFIG_DRM_LT8911EXB=y
 CONFIG_DRM_LT9711=y
-# CONFIG_POWERVR_ROGUE_NULLDRMDISP is not set
 CONFIG_POWERVR_ROGUE=y
 # CONFIG_DRM_LEGACY is not set
 CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
@@ -5535,7 +5534,9 @@ CONFIG_SND_SOC_I2C_AND_SPI=y
 # CONFIG_SND_SOC_DA7213 is not set
 # CONFIG_SND_SOC_DMIC is not set
 # CONFIG_SND_SOC_ES7134 is not set
+# CONFIG_SND_SOC_ES7210 is not set
 # CONFIG_SND_SOC_ES7241 is not set
+# CONFIG_SND_SOC_ES8156 is not set
 CONFIG_SND_SOC_ES8316=y
 CONFIG_SND_SOC_ES8326=y
 # CONFIG_SND_SOC_ES8328_I2C is not set
diff --git a/config/kernel/linux-spacemit-legacy.config b/config/kernel/linux-spacemit-legacy.config
index 5541ff60997c..36982b335516 100644
--- a/config/kernel/linux-spacemit-legacy.config
+++ b/config/kernel/linux-spacemit-legacy.config
@@ -11,6 +11,8 @@ CONFIG_AS_VERSION=24200
 CONFIG_LD_IS_BFD=y
 CONFIG_LD_VERSION=24200
 CONFIG_LLD_VERSION=0
+CONFIG_CC_CAN_LINK=y
+CONFIG_CC_CAN_LINK_STATIC=y
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
 CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y
 CONFIG_CC_HAS_ASM_INLINE=y
@@ -1182,6 +1184,7 @@ CONFIG_BRIDGE_EBT_SNAT=m
 CONFIG_BRIDGE_EBT_LOG=m
 CONFIG_BRIDGE_EBT_NFLOG=m
 CONFIG_BPFILTER=y
+CONFIG_BPFILTER_UMH=m
 # CONFIG_IP_DCCP is not set
 CONFIG_IP_SCTP=y
 # CONFIG_SCTP_DBG_OBJCNT is not set
@@ -2630,7 +2633,6 @@ CONFIG_WLAN=y
 CONFIG_WLAN_VENDOR_REALTEK=y
 # CONFIG_RTL8180 is not set
 # CONFIG_RTL8187 is not set
-CONFIG_RTL8852BS=m
 CONFIG_RTL_CARDS=m
 # CONFIG_RTL8192CE is not set
 # CONFIG_RTL8192SE is not set
@@ -2644,12 +2646,15 @@ CONFIG_RTL_CARDS=m
 # CONFIG_RTL8XXXU is not set
 # CONFIG_RTW88 is not set
 # CONFIG_RTW89 is not set
+CONFIG_RTL8852BS=m
+# CONFIG_RTL8852BE is not set
 # CONFIG_WLAN_VENDOR_RSI is not set
 # CONFIG_WLAN_VENDOR_SILABS is not set
 # CONFIG_WLAN_VENDOR_ST is not set
 # CONFIG_WLAN_VENDOR_TI is not set
 # CONFIG_WLAN_VENDOR_ZYDAS is not set
 # CONFIG_WLAN_VENDOR_QUANTENNA is not set
+# CONFIG_AIC_WLAN_SUPPORT is not set
 # CONFIG_MAC80211_HWSIM is not set
 # CONFIG_USB_NET_RNDIS_WLAN is not set
 # CONFIG_VIRT_WIFI is not set
@@ -5114,6 +5119,7 @@ CONFIG_DRM_PANEL_BRIDGE=y
 CONFIG_DRM_SPACEMIT=y
 CONFIG_SPACEMIT_MIPI_PANEL=y
 CONFIG_DRM_LT8911EXB=y
+CONFIG_DRM_LT9711=y
 # CONFIG_POWERVR_ROGUE_NULLDRMDISP is not set
 CONFIG_POWERVR_ROGUE=y
 # CONFIG_DRM_LEGACY is not set
@@ -5537,7 +5543,9 @@ CONFIG_SND_SOC_I2C_AND_SPI=y
 # CONFIG_SND_SOC_DA7213 is not set
 # CONFIG_SND_SOC_DMIC is not set
 # CONFIG_SND_SOC_ES7134 is not set
+# CONFIG_SND_SOC_ES7210 is not set
 # CONFIG_SND_SOC_ES7241 is not set
+# CONFIG_SND_SOC_ES8156 is not set
 CONFIG_SND_SOC_ES8316=y
 CONFIG_SND_SOC_ES8326=y
 # CONFIG_SND_SOC_ES8328_I2C is not set