ANDROID: db845c: drop gki_modules_list to use all gki modules by default

with the db845c mac80211.ko and cfg80211.ko dropped,
and related kernel configs removed.
especially if CONFIG_NL80211_TESTMODE=y is not removed,
the following error will be reported:
    [    1.993280][    T1] init: Loading module /lib/modules/ath10k_core.ko with args ''
    [    2.004838][    T1] ath10k_core: disagrees about version of symbol ieee80211_alloc_hw_nm
    [    2.013029][    T1] ath10k_core: Unknown symbol ieee80211_alloc_hw_nm (err -22)
    [    2.070362][    T1] init: Failed to insmod '/lib/modules/ath10k_core.ko' with args '': Invalid t
    [    2.079933][    T1] init: LoadWithAliases was unable to load ath10k_core
    [    2.087752][    T1] init: Failed to load kernel modules

Fixes: b519faae30 ("ANDROID: ABI: gki_defconfig: disable cfg80211 and mac80211")
Test: boot the db845c_dist build to homescreen

Change-Id: I84b5a60a9bfed83c65fdae3a68e726779a6fb679
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
This commit is contained in:
Yongqin Liu
2022-11-25 01:17:17 +08:00
committed by Yifan Hong
parent f5ea8b2710
commit 32a7bc01f8
2 changed files with 0 additions and 19 deletions

View File

@@ -65,18 +65,6 @@ define_db845c(
"arch/arm64/boot/dts/qcom/qrb5165-rb5.dtb",
"arch/arm64/boot/dts/qcom/sdm845-db845c.dtb",
],
gki_modules_list = [
# keep sorted
"//common:kernel_aarch64/can.ko",
"//common:kernel_aarch64/can-bcm.ko",
"//common:kernel_aarch64/can-dev.ko",
"//common:kernel_aarch64/can-gw.ko",
"//common:kernel_aarch64/can-raw.ko",
"//common:kernel_aarch64/libarc4.ko",
"//common:kernel_aarch64/rfkill.ko",
"//common:kernel_aarch64/slcan.ko",
"//common:kernel_aarch64/vcan.ko",
],
module_outs = [
# keep sorted
"crypto/michael_mic.ko",
@@ -211,13 +199,11 @@ define_db845c(
"drivers/usb/typec/qcom-pmic-typec.ko",
"drivers/watchdog/pm8916_wdt.ko",
"drivers/watchdog/qcom-wdt.ko",
"net/mac80211/mac80211.ko",
"net/qrtr/ns.ko",
"net/qrtr/qrtr.ko",
"net/qrtr/qrtr-mhi.ko",
"net/qrtr/qrtr-smd.ko",
"net/qrtr/qrtr-tun.ko",
"net/wireless/cfg80211.ko",
"sound/soc/codecs/snd-soc-dmic.ko",
"sound/soc/codecs/snd-soc-hdmi-codec.ko",
"sound/soc/codecs/snd-soc-lpass-va-macro.ko",

View File

@@ -1,9 +1,4 @@
# CONFIG_MODULE_SIG_ALL is not set
CONFIG_CFG80211=m
CONFIG_NL80211_TESTMODE=y
# CONFIG_CFG80211_DEFAULT_PS is not set
# CONFIG_CFG80211_CRDA_SUPPORT is not set
CONFIG_MAC80211=m
CONFIG_QRTR=m
CONFIG_QRTR_TUN=m
CONFIG_SCSI_UFS_QCOM=m