Merge "Niobe: Enable kernel configs to support wlan compilation"

arch/arm64/configs/vendor/niobe_GKI.config

@@ -9,6 +9,7 @@ CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT=y
 CONFIG_ARM_SMMU_QCOM=m
 # CONFIG_ARM_SMMU_QCOM_DEBUG is not set
 # CONFIG_ARM_SMMU_SELFTEST is not set
+CONFIG_CFG80211=m
 CONFIG_COMMON_CLK_QCOM=m
 CONFIG_EDAC_QCOM=m
 CONFIG_EDAC_QCOM_LLCC_PANIC_ON_UE=y
@@ -25,6 +26,12 @@ CONFIG_IOMMU_IO_PGTABLE_FAST=y
 CONFIG_IPC_LOGGING=m
 CONFIG_IPC_LOG_MINIDUMP_BUFFERS=16
 CONFIG_LOCALVERSION="-gki"
+CONFIG_MAC80211=m
+CONFIG_MEM_SHARE_QMI_SERVICE=m
+CONFIG_MHI_BUS=m
+CONFIG_MHI_BUS_MISC=y
+CONFIG_MHI_SATELLITE=m
+CONFIG_MHI_UCI=m
 # CONFIG_MODULE_SIG_ALL is not set
 CONFIG_MSM_BOOT_STATS=m
 CONFIG_MSM_CORE_HANG_DETECT=m
@@ -33,6 +40,7 @@ CONFIG_MSM_QMP=m
 CONFIG_MSM_TMECOM_QMP=m
 CONFIG_NOP_USB_XCEIV=m
 CONFIG_NVMEM_QCOM_QFPROM=m
+CONFIG_PCI_MSM=m
 CONFIG_PHY_QCOM_UFS=m
 CONFIG_PHY_QCOM_UFS_QRBTC_SDM845=m
 # CONFIG_PHY_QCOM_UFS_V3 is not set
@@ -75,6 +83,7 @@ CONFIG_QCOM_LLCC=m
 CONFIG_QCOM_LLCC_PMU=m
 CONFIG_QCOM_MDT_LOADER=m
 CONFIG_QCOM_MEMLAT=m
+CONFIG_QCOM_MEMORY_DUMP_V2=m
 CONFIG_QCOM_MEM_BUF=m
 CONFIG_QCOM_MEM_BUF_DEV=m
 CONFIG_QCOM_PDC=m
@@ -84,6 +93,7 @@ CONFIG_QCOM_Q6V5_COMMON=m
 CONFIG_QCOM_Q6V5_PAS=m
 # CONFIG_QCOM_QFPROM_SYS is not set
 CONFIG_QCOM_QMI_HELPERS=m
+CONFIG_QCOM_RAMDUMP=m
 CONFIG_QCOM_RPMH=m
 CONFIG_QCOM_RPROC_COMMON=m
 CONFIG_QCOM_SCM=m

arch/arm64/configs/vendor/niobe_consolidate.config

@@ -1,6 +1,7 @@
 CONFIG_ATOMIC64_SELFTEST=m
 CONFIG_CMA_DEBUG=y
 CONFIG_CMA_DEBUGFS=y
+CONFIG_CNSS2_DEBUG=y
 CONFIG_DEBUG_PAGEALLOC=y
 CONFIG_DEBUG_PAGEALLOC_ENABLE_DEFAULT=y
 CONFIG_DEBUG_SPINLOCK=y

niobe.bzl

@@ -8,6 +8,9 @@ def define_niobe():
     _niobe_in_tree_modules = [
         # keep sorted
         # TODO: Need to add GKI modules
+        "drivers/bus/mhi/devices/mhi_dev_satellite.ko",
+        "drivers/bus/mhi/devices/mhi_dev_uci.ko",
+        "drivers/bus/mhi/host/mhi.ko",
         "drivers/clk/qcom/camcc-niobe.ko",
         "drivers/clk/qcom/clk-dummy.ko",
         "drivers/clk/qcom/clk-qcom.ko",
@@ -42,6 +45,7 @@ def define_niobe():
         "drivers/mailbox/msm_qmp.ko",
         "drivers/mailbox/qcom-ipcc.ko",
         "drivers/nvmem/nvmem_qfprom.ko",
+        "drivers/pci/controller/pci-msm-drv.ko",
         "drivers/perf/qcom_llcc_pmu.ko",
         "drivers/phy/qualcomm/phy-qcom-ufs.ko",
         "drivers/phy/qualcomm/phy-qcom-ufs-qmp-v4.ko",
@@ -76,8 +80,12 @@ def define_niobe():
         "drivers/soc/qcom/mdt_loader.ko",
         "drivers/soc/qcom/mem_buf/mem_buf.ko",
         "drivers/soc/qcom/mem_buf/mem_buf_dev.ko",
+        "drivers/soc/qcom/memory_dump_v2.ko",
+        "drivers/soc/qcom/memshare/heap_mem_ext_v01.ko",
+        "drivers/soc/qcom/memshare/msm_memshare.ko",
         "drivers/soc/qcom/qcom_aoss.ko",
         "drivers/soc/qcom/qcom_cpucp.ko",
+        "drivers/soc/qcom/qcom_ramdump.ko",
         "drivers/soc/qcom/qcom_rpmh.ko",
         "drivers/soc/qcom/qmi_helpers.ko",
         "drivers/soc/qcom/secure_buffer.ko",
@@ -91,8 +99,10 @@ def define_niobe():
         "drivers/usb/phy/phy-generic.ko",
         "drivers/usb/phy/phy-qcom-emu.ko",
         "kernel/trace/qcom_ipc_logging.ko",
+        "net/mac80211/mac80211.ko",
         "net/qrtr/qrtr.ko",
         "net/qrtr/qrtr-smd.ko",
+        "net/wireless/cfg80211.ko",
     ]
 
     _niobe_consolidate_in_tree_modules = _niobe_in_tree_modules + [