From 5659cc62f17da2013b9727a6311d62ae985ce7d4 Mon Sep 17 00:00:00 2001 From: Ramji Jiyani Date: Mon, 24 Oct 2022 20:49:35 +0000 Subject: [PATCH] ANDROID: GKI: Convert cfg/mac80211 as modules Bug: 232431151 Test: TH Signed-off-by: Ramji Jiyani Change-Id: I46dd381c9eb0d758e9808865692415651626941e --- BUILD.bazel | 10 ++++++++++ android/gki_aarch64_modules | 2 ++ android/gki_system_dlkm_modules | 4 +++- arch/arm64/configs/gki_defconfig | 2 ++ arch/x86/configs/gki_defconfig | 2 ++ 5 files changed, 19 insertions(+), 1 deletion(-) diff --git a/BUILD.bazel b/BUILD.bazel index ad3b3b6a2ab5..02e24babb346 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -37,6 +37,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", ], "kmi_symbol_list": "android/abi_gki_aarch64", "additional_kmi_symbol_lists": _aarch64_additional_kmi_symbol_lists, @@ -46,6 +48,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 @@ -56,6 +60,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", ], "kmi_symbol_list": "android/abi_gki_aarch64", "additional_kmi_symbol_lists": _aarch64_additional_kmi_symbol_lists, @@ -66,6 +72,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 @@ -74,6 +82,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", ], }, }) diff --git a/android/gki_aarch64_modules b/android/gki_aarch64_modules index 3d8888cbb39a..f593d452cb69 100644 --- a/android/gki_aarch64_modules +++ b/android/gki_aarch64_modules @@ -1,2 +1,4 @@ mm/zsmalloc.ko drivers/block/zram/zram.ko +net/wireless/cfg80211.ko +net/mac80211/mac80211.ko diff --git a/android/gki_system_dlkm_modules b/android/gki_system_dlkm_modules index 83e76f59600e..f593d452cb69 100644 --- a/android/gki_system_dlkm_modules +++ b/android/gki_system_dlkm_modules @@ -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 diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 631d7c6ea0b5..19100e3fb2ec 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -280,6 +280,8 @@ CONFIG_BT_HCIUART=y CONFIG_BT_HCIUART_LL=y CONFIG_BT_HCIUART_BCM=y CONFIG_BT_HCIUART_QCA=y +CONFIG_CFG80211=m +CONFIG_MAC80211=m CONFIG_RFKILL=y CONFIG_NFC=y CONFIG_PCI=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 40bd1398c636..35bef48028e4 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -261,6 +261,8 @@ CONFIG_BT_HCIUART=y CONFIG_BT_HCIUART_LL=y CONFIG_BT_HCIUART_BCM=y CONFIG_BT_HCIUART_QCA=y +CONFIG_CFG80211=m +CONFIG_MAC80211=m CONFIG_RFKILL=y CONFIG_NFC=y CONFIG_PCI=y