feat(0001-refactor-cn913x-defconfig-cleanup.patch_and_cn913x_additions.cfg): remove mac80211, cfg80211 and qrtr from standard Linux kernel config. Use the counterparts from meta-netmodule-wlan layer.

This commit is contained in:
Holger Dihlmann 2023-10-25 10:42:30 +02:00
parent 3eeedd8412
commit a757360a2d
2 changed files with 6 additions and 3 deletions

View File

@ -11,7 +11,7 @@ diff --git a/arch/arm64/configs/cn9130-netmodule_defconfig b/arch/arm64/configs/
index 0e7b656a4fa3..88fe7e96ff2e 100644 index 0e7b656a4fa3..88fe7e96ff2e 100644
--- a/arch/arm64/configs/cn9130-netmodule_defconfig --- a/arch/arm64/configs/cn9130-netmodule_defconfig
+++ b/arch/arm64/configs/cn9130-netmodule_defconfig +++ b/arch/arm64/configs/cn9130-netmodule_defconfig
@@ -1,818 +1,4365 @@ @@ -1,818 +1,4368 @@
+# +#
+# General setup +# General setup
+# +#
@ -1327,6 +1327,7 @@ index 0e7b656a4fa3..88fe7e96ff2e 100644
+CONFIG_NET_SWITCHDEV=y +CONFIG_NET_SWITCHDEV=y
+# CONFIG_NET_L3_MASTER_DEV is not set +# CONFIG_NET_L3_MASTER_DEV is not set
CONFIG_QRTR=m CONFIG_QRTR=m
+# CONFIG_QRTR is not set
CONFIG_QRTR_SMD=m CONFIG_QRTR_SMD=m
CONFIG_QRTR_TUN=m CONFIG_QRTR_TUN=m
+# CONFIG_NET_NCSI is not set +# CONFIG_NET_NCSI is not set
@ -1460,6 +1461,7 @@ index 0e7b656a4fa3..88fe7e96ff2e 100644
+# CONFIG_MCTP is not set +# CONFIG_MCTP is not set
+CONFIG_WIRELESS=y +CONFIG_WIRELESS=y
CONFIG_CFG80211=m CONFIG_CFG80211=m
+# CONFIG_CFG80211 is not set
+# CONFIG_NL80211_TESTMODE is not set +# CONFIG_NL80211_TESTMODE is not set
+# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set +# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
+CONFIG_CFG80211_REQUIRE_SIGNED_REGDB=y +CONFIG_CFG80211_REQUIRE_SIGNED_REGDB=y
@ -1469,6 +1471,7 @@ index 0e7b656a4fa3..88fe7e96ff2e 100644
+CONFIG_CFG80211_CRDA_SUPPORT=y +CONFIG_CFG80211_CRDA_SUPPORT=y
+# CONFIG_CFG80211_WEXT is not set +# CONFIG_CFG80211_WEXT is not set
CONFIG_MAC80211=m CONFIG_MAC80211=m
+# CONFIG_MAC80211 is not set
+CONFIG_MAC80211_HAS_RC=y +CONFIG_MAC80211_HAS_RC=y
+CONFIG_MAC80211_RC_MINSTREL=y +CONFIG_MAC80211_RC_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y +CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y

View File

@ -17,8 +17,8 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
CONFIG_ACPI_CPPC_CPUFREQ=y CONFIG_ACPI_CPPC_CPUFREQ=y
CONFIG_ARM_ARMADA_8K_CPUFREQ=y CONFIG_ARM_ARMADA_8K_CPUFREQ=y
CONFIG_MICROSEMI_PHY=y CONFIG_MICROSEMI_PHY=y
CONFIG_QRTR_MHI=m # CONFIG_QRTR_MHI is not set
CONFIG_MHI_BUS=m # CONFIG_MHI_BUS is not set
CONFIG_ATH11K=m CONFIG_ATH11K=m
CONFIG_ATH11K_AHB=m CONFIG_ATH11K_AHB=m
CONFIG_ATH11K_PCI=m CONFIG_ATH11K_PCI=m