ANDROID: GKI: Convert cfg/mac80211 as modules

Bug: 232431151
Test: TH
Signed-off-by: Ramji Jiyani <ramjiyani@google.com>
Change-Id: I46dd381c9eb0d758e9808865692415651626941e
(cherry picked from commit 5659cc62f17da2013b9727a6311d62ae985ce7d4)
This commit is contained in:
Ramji Jiyani 2022-10-24 20:49:35 +00:00 committed by Todd Kjos
parent 68ff963c1e
commit e750789ab3
4 changed files with 17 additions and 5 deletions

View File

@ -24,6 +24,8 @@ define_common_kernels(target_configs = {
"module_implicit_outs": [
"drivers/block/zram/zram.ko",
"mm/zsmalloc.ko",
"net/wireless/cfg80211.ko",
"net/mac80211/mac80211.ko",
],
},
# Sync with build.config.gki.aarch64.16k
@ -31,6 +33,8 @@ define_common_kernels(target_configs = {
"module_implicit_outs": [
"drivers/block/zram/zram.ko",
"mm/zsmalloc.ko",
"net/wireless/cfg80211.ko",
"net/mac80211/mac80211.ko",
],
},
# Sync with build.config.gki-debug.aarch64
@ -38,6 +42,8 @@ define_common_kernels(target_configs = {
"module_implicit_outs": [
"drivers/block/zram/zram.ko",
"mm/zsmalloc.ko",
"net/wireless/cfg80211.ko",
"net/mac80211/mac80211.ko",
],
},
# Sync with build.config.gki.x86_64
@ -46,6 +52,8 @@ define_common_kernels(target_configs = {
"module_implicit_outs": [
"drivers/block/zram/zram.ko",
"mm/zsmalloc.ko",
"net/wireless/cfg80211.ko",
"net/mac80211/mac80211.ko",
],
},
# Sync with build.config.gki-debug.x86_64
@ -54,6 +62,8 @@ define_common_kernels(target_configs = {
"module_implicit_outs": [
"drivers/block/zram/zram.ko",
"mm/zsmalloc.ko",
"net/wireless/cfg80211.ko",
"net/mac80211/mac80211.ko",
],
},
})

View File

@ -1,2 +1,4 @@
drivers/block/zram/zram.ko
mm/zsmalloc.ko
drivers/block/zram/zram.ko
net/wireless/cfg80211.ko
net/mac80211/mac80211.ko

View File

@ -263,11 +263,11 @@ CONFIG_BT_HCIUART=y
CONFIG_BT_HCIUART_LL=y
CONFIG_BT_HCIUART_BCM=y
CONFIG_BT_HCIUART_QCA=y
CONFIG_CFG80211=y
CONFIG_CFG80211=m
CONFIG_NL80211_TESTMODE=y
# CONFIG_CFG80211_DEFAULT_PS is not set
# CONFIG_CFG80211_CRDA_SUPPORT is not set
CONFIG_MAC80211=y
CONFIG_MAC80211=m
CONFIG_RFKILL=y
CONFIG_NFC=y
CONFIG_PCI=y

View File

@ -253,11 +253,11 @@ CONFIG_BT_HCIUART=y
CONFIG_BT_HCIUART_LL=y
CONFIG_BT_HCIUART_BCM=y
CONFIG_BT_HCIUART_QCA=y
CONFIG_CFG80211=y
CONFIG_CFG80211=m
CONFIG_NL80211_TESTMODE=y
# CONFIG_CFG80211_DEFAULT_PS is not set
# CONFIG_CFG80211_CRDA_SUPPORT is not set
CONFIG_MAC80211=y
CONFIG_MAC80211=m
CONFIG_RFKILL=y
CONFIG_NFC=y
CONFIG_PCI=y