cnss2: Make changes to support WLAN DDK for all modules

To be in line with upstream changes on bazel, create separate defconfig
files for each module instead.

Change-Id: Ic2c24f8d8c207b51a0a5b4b9d1088601bc91765c
CRs-Fixed: 3539620

build/pineapple_consolidate_defconfig → cnss2/pineapple_consolidate_defconfig

@@ -1,12 +1,11 @@
-CONFIG_CNSS2=y
+CONFIG_CNSS2=m
 CONFIG_CNSS_OUT_OF_TREE=y
 CONFIG_CNSS2_QMI=y
-CONFIG_CNSS_QMI_SVC=y
-CONFIG_CNSS_GENL=y
+CONFIG_CNSS_QMI_SVC=m
 CONFIG_BUS_AUTO_SUSPEND=y
 CONFIG_CNSS2_SSR_DRIVER_DUMP=y
 CONFIG_CNSS_HW_SECURE_DISABLE=y
 CONFIG_CNSS2_SMMU_DB_SUPPORT=y
-CONFIG_CNSS_PLAT_IPC_QMI_SVC=y
-CONFIG_WCNSS_MEM_PRE_ALLOC=y
-CONFIG_CNSS_UTILS=y
+CONFIG_CNSS_PLAT_IPC_QMI_SVC=m
+CONFIG_WCNSS_MEM_PRE_ALLOC=m
+CONFIG_CNSS2_DEBUG=y

build/pineapple_gki_defconfig → cnss2/pineapple_gki_defconfig

@@ -1,12 +1,11 @@
-CONFIG_CNSS2=y
+CONFIG_CNSS2=m
 CONFIG_CNSS_OUT_OF_TREE=y
 CONFIG_CNSS2_QMI=y
-CONFIG_CNSS_QMI_SVC=y
-CONFIG_CNSS_GENL=y
+CONFIG_CNSS_QMI_SVC=m
 CONFIG_BUS_AUTO_SUSPEND=y
 CONFIG_CNSS2_SSR_DRIVER_DUMP=y
 CONFIG_CNSS_HW_SECURE_DISABLE=y
 CONFIG_CNSS2_SMMU_DB_SUPPORT=y
-CONFIG_CNSS_PLAT_IPC_QMI_SVC=y
-CONFIG_WCNSS_MEM_PRE_ALLOC=y
-CONFIG_CNSS_UTILS=y
+CONFIG_CNSS_PLAT_IPC_QMI_SVC=m
+CONFIG_WCNSS_MEM_PRE_ALLOC=m
+CONFIG_CNSS2_DEBUG=y

cnss_genl/pineapple_consolidate_defconfig

@@ -0,0 +1,2 @@
+CONFIG_CNSS_GENL=m
+CONFIG_CNSS_OUT_OF_TREE=y

cnss_genl/pineapple_gki_defconfig

@@ -0,0 +1,2 @@
+CONFIG_CNSS_GENL=m
+CONFIG_CNSS_OUT_OF_TREE=y

cnss_prealloc/pineapple_consolidate_defconfig

@@ -0,0 +1,2 @@
+CONFIG_WCNSS_MEM_PRE_ALLOC=m
+CONFIG_CNSS_OUT_OF_TREE=y

cnss_prealloc/pineapple_gki_defconfig

@@ -0,0 +1,2 @@
+CONFIG_WCNSS_MEM_PRE_ALLOC=m
+CONFIG_CNSS_OUT_OF_TREE=y

cnss_utils/pineapple_consolidate_defconfig

@@ -0,0 +1,4 @@
+CONFIG_CNSS_UTILS=m
+CONFIG_CNSS_QMI_SVC=m
+CONFIG_CNSS_PLAT_IPC_QMI_SVC=m
+CONFIG_CNSS_OUT_OF_TREE=y

cnss_utils/pineapple_gki_defconfig

@@ -0,0 +1,4 @@
+CONFIG_CNSS_UTILS=m
+CONFIG_CNSS_QMI_SVC=m
+CONFIG_CNSS_PLAT_IPC_QMI_SVC=m
+CONFIG_CNSS_OUT_OF_TREE=y

icnss2/pineapple_consolidate_defconfig

@@ -0,0 +1,7 @@
+CONFIG_ICNSS2=m
+CONFIG_ICNSS2_DEBUG=y
+CONFIG_ICNSS2_QMI=y
+CONFIG_CNSS_QMI_SVC=m
+CONFIG_CNSS_QCA6750=y
+CONFIG_CNSS_OUT_OF_TREE=y
+CONFIG_WCNSS_MEM_PRE_ALLOC=m

icnss2/pineapple_gki_defconfig

@@ -0,0 +1,7 @@
+CONFIG_ICNSS2=m
+CONFIG_ICNSS2_DEBUG=y
+CONFIG_ICNSS2_QMI=y
+CONFIG_CNSS_QMI_SVC=m
+CONFIG_CNSS_QCA6750=y
+CONFIG_CNSS_OUT_OF_TREE=y
+CONFIG_WCNSS_MEM_PRE_ALLOC=m

wlan_platform_modules.bzl

@@ -44,7 +44,7 @@ def _define_modules_for_target_variant(target, variant):
         ]),
         includes = ["cnss", "cnss_utils"],
         kconfig = "cnss2/Kconfig",
-        defconfig = "build/{}_defconfig".format(tv),
+        defconfig = "cnss2/{}_defconfig".format(tv),
         conditional_srcs =  {
             "CONFIG_CNSS2_QMI": {
                 True: [
@@ -84,7 +84,7 @@ def _define_modules_for_target_variant(target, variant):
         ]),
         includes = ["icnss2", "cnss_utils"],
         kconfig = "icnss2/Kconfig",
-        defconfig = "build/{}_defconfig".format(tv),
+        defconfig = "icnss2/{}_defconfig".format(tv),
         conditional_srcs = {
             "CONFIG_ICNSS2_QMI": {
                 True: [
@@ -109,7 +109,7 @@ def _define_modules_for_target_variant(target, variant):
             "cnss_genl/cnss_nl.c",
         ],
         kconfig = "cnss_genl/Kconfig",
-        defconfig = "build/{}_defconfig".format(tv),
+        defconfig = "cnss_genl/{}_defconfig".format(tv),
         out = "cnss_nl.ko",
         kernel_build = "//msm-kernel:{}".format(tv),
         deps = [
@@ -126,7 +126,7 @@ def _define_modules_for_target_variant(target, variant):
         ]),
         includes = ["cnss_utils"],
         kconfig = "cnss_prealloc/Kconfig",
-        defconfig = "build/{}_defconfig".format(tv),
+        defconfig = "cnss_prealloc/{}_defconfig".format(tv),
         out = "cnss_prealloc.ko",
         kernel_build = "//msm-kernel:{}".format(tv),
         deps = [
@@ -142,7 +142,7 @@ def _define_modules_for_target_variant(target, variant):
             "cnss_utils/*.h"
         ]),
         kconfig = "cnss_utils/Kconfig",
-        defconfig = "build/{}_defconfig".format(tv),
+        defconfig = "cnss_utils/{}_defconfig".format(tv),
         out = "cnss_utils.ko",
         kernel_build = "//msm-kernel:{}".format(tv),
         deps = [
@@ -159,7 +159,7 @@ def _define_modules_for_target_variant(target, variant):
             "cnss_utils/*.h"
         ]),
         kconfig = "cnss_utils/Kconfig",
-        defconfig = "build/{}_defconfig".format(tv),
+        defconfig = "cnss_utils/{}_defconfig".format(tv),
         out = "wlan_firmware_service.ko",
         kernel_build = "//msm-kernel:{}".format(tv),
         deps = ["//msm-kernel:all_headers"],
@@ -173,7 +173,7 @@ def _define_modules_for_target_variant(target, variant):
             "cnss_utils/*.h"
         ]),
         kconfig = "cnss_utils/Kconfig",
-        defconfig = "build/{}_defconfig".format(tv),
+        defconfig = "cnss_utils/{}_defconfig".format(tv),
         out = "cnss_plat_ipc_qmi_svc.ko",
         kernel_build = "//msm-kernel:{}".format(tv),
         deps = ["//msm-kernel:all_headers"],