Merge "build: Add support for Bazel to build modules in Blair"

BUILD.bazel

@@ -47,6 +47,8 @@ ddk_headers(
 
 load(":build/pineapple.bzl", "define_pineapple")
 load(":build/kalama.bzl", "define_kalama")
+load(":build/blair.bzl", "define_blair")
 
 define_kalama()
-define_pineapple()
+define_pineapple()
+define_blair()

EnableBazel.mk

@@ -34,4 +34,36 @@ LOCAL_MODULE_KO_DIRS += asoc/codecs/wcd938x/wcd938x_slave_dlkm.ko
 LOCAL_MODULE_KO_DIRS += asoc/codecs/wcd939x/wcd939x_dlkm.ko
 LOCAL_MODULE_KO_DIRS += asoc/codecs/wcd939x/wcd939x_slave_dlkm.ko
 LOCAL_MODULE_KO_DIRS += asoc/codecs/hdmi_dlkm.ko
+endif
+
+ifeq ($(call is-board-platform-in-list,blair),true)
+LOCAL_MODULE_DDK_BUILD := true
+
+LOCAL_MODULE_KO_DIRS := dsp/q6_notifier_dlkm.ko
+LOCAL_MODULE_KO_DIRS += dsp/spf_core_dlkm.ko
+LOCAL_MODULE_KO_DIRS += dsp/audpkt_ion_dlkm.ko
+LOCAL_MODULE_KO_DIRS += ipc/gpr_dlkm.ko
+LOCAL_MODULE_KO_DIRS += ipc/audio_pkt_dlkm.ko
+LOCAL_MODULE_KO_DIRS += dsp/q6_dlkm.ko
+LOCAL_MODULE_KO_DIRS += dsp/adsp_loader_dlkm.ko
+LOCAL_MODULE_KO_DIRS += dsp/audio_prm_dlkm.ko
+LOCAL_MODULE_KO_DIRS += dsp/q6_pdr_dlkm.ko
+LOCAL_MODULE_KO_DIRS += soc/pinctrl_lpi_dlkm.ko
+LOCAL_MODULE_KO_DIRS += soc/swr_dlkm.ko
+LOCAL_MODULE_KO_DIRS += soc/swr_ctrl_dlkm.ko
+LOCAL_MODULE_KO_DIRS += soc/snd_event_dlkm.ko
+LOCAL_MODULE_KO_DIRS += asoc/codecs/wcd_core_dlkm.ko
+LOCAL_MODULE_KO_DIRS += asoc/codecs/mbhc_dlkm.ko
+LOCAL_MODULE_KO_DIRS += asoc/codecs/wcd9xxx_dlkm.ko
+LOCAL_MODULE_KO_DIRS += asoc/codecs/stub_dlkm.ko
+LOCAL_MODULE_KO_DIRS += asoc/machine_dlkm.ko
+LOCAL_MODULE_KO_DIRS += asoc/codecs/bolero/bolero_cdc_dlkm.ko
+LOCAL_MODULE_KO_DIRS += asoc/codecs/bolero/va_macro_dlkm.ko
+LOCAL_MODULE_KO_DIRS += asoc/codecs/bolero/tx_macro_dlkm.ko
+LOCAL_MODULE_KO_DIRS += asoc/codecs/bolero/rx_macro_dlkm.ko
+LOCAL_MODULE_KO_DIRS += asoc/codecs/wsa881x_analog_dlkm.ko
+LOCAL_MODULE_KO_DIRS += asoc/codecs/wcd937x/wcd937x_dlkm.ko
+LOCAL_MODULE_KO_DIRS += asoc/codecs/wcd937x/wcd937x_slave_dlkm.ko
+LOCAL_MODULE_KO_DIRS += asoc/codecs/wcd938x/wcd938x_dlkm.ko
+LOCAL_MODULE_KO_DIRS += asoc/codecs/wcd938x/wcd938x_slave_dlkm.ko
 endif

audio_modules.bzl

@@ -6,6 +6,7 @@ SOC_PATH = "soc"
 ASOC_PATH = "asoc"
 ASOC_CODECS_PATH = ASOC_PATH + "/codecs"
 ASOC_CODECS_LPASS_CDC_PATH = ASOC_CODECS_PATH + "/lpass-cdc"
+ASOC_CODECS_BOLERO_PATH = ASOC_CODECS_PATH + "/bolero"
 
 audio_modules = create_module_registry([":audio_headers"])
 # ------------------------------------ AUDIO MODULE DEFINITIONS ---------------------------------
@@ -311,6 +312,55 @@ audio_modules.register(
     config_option = "CONFIG_LPASS_CDC_TX_MACRO",
     srcs = ["lpass-cdc-tx-macro.c"]
 )
+# >>>> ASOC/CODECS/BOLERO MODULES <<<<
+audio_modules.register(
+    name = "bolero_cdc_dlkm",
+    path = ASOC_CODECS_BOLERO_PATH,
+    config_option = "CONFIG_SND_SOC_BOLERO",
+    srcs = [
+        "bolero-cdc.c",
+        "bolero-cdc-utils.c",
+        "bolero-cdc-regmap.c",
+        "bolero-cdc-tables.c",
+        "bolero-clk-rsc.c",
+    ],
+)
+audio_modules.register(
+    name = "va_macro_dlkm",
+    path = ASOC_CODECS_BOLERO_PATH,
+    config_option = "CONFIG_VA_MACRO",
+    srcs = ["va-macro.c"]
+)
+audio_modules.register(
+    name = "rx_macro_dlkm",
+    path = ASOC_CODECS_BOLERO_PATH,
+    config_option = "CONFIG_RX_MACRO",
+    srcs = ["rx-macro.c"]
+)
+audio_modules.register(
+    name = "tx_macro_dlkm",
+    path = ASOC_CODECS_BOLERO_PATH,
+    config_option = "CONFIG_TX_MACRO",
+    srcs = ["tx-macro.c"]
+)
+# >>>> WSA881X-ANALOG MODULE <<<<
+audio_modules.register(
+    name = "wsa881x_analog_dlkm",
+    path = ASOC_CODECS_PATH,
+    config_option = "CONFIG_SND_SOC_WSA881X_ANALOG",
+    srcs = [
+        "wsa881x-analog.c",
+        "wsa881x-tables-analog.c",
+        "wsa881x-regmap-analog.c",
+	],
+    conditional_srcs = {
+        "CONFIG_WSA881X_TEMP_SENSOR_DISABLE": {
+            False: [
+                "wsa881x-temp-sensor.c"
+            ]
+        }
+    }
+)
 # >>>> WSA883X MODULE <<<<
 audio_modules.register(
     name = "wsa883x_dlkm",
@@ -333,6 +383,24 @@ audio_modules.register(
         "wsa884x-tables.c",
     ]
 )
+# >>>> WCD937X MODULES <<<<
+audio_modules.register(
+    name = "wcd937x_dlkm",
+    path = ASOC_CODECS_PATH + "/wcd937x",
+    config_option = "CONFIG_SND_SOC_WCD937X",
+    srcs = [
+        "wcd937x.c",
+        "wcd937x-regmap.c",
+        "wcd937x-tables.c",
+        "wcd937x-mbhc.c",
+    ],
+)
+audio_modules.register(
+    name = "wcd937x_slave_dlkm",
+    path = ASOC_CODECS_PATH + "/wcd937x",
+    config_option = "CONFIG_SND_SOC_WCD937X_SLAVE",
+    srcs = ["wcd937x_slave.c"]
+)
 # >>>> WCD938X MODULES <<<<
 audio_modules.register(
     name = "wcd938x_dlkm",

build/blair.bzl

@@ -0,0 +1,49 @@
+load(":audio_modules.bzl", "audio_modules")
+load(":module_mgr.bzl", "define_consolidate_gki_modules")
+
+def define_blair():
+    define_consolidate_gki_modules(
+        target = "blair",
+        registry = audio_modules,
+        modules = [
+            "q6_dlkm",
+            "spf_core_dlkm",
+            "audpkt_ion_dlkm",
+            "q6_notifier_dlkm",
+            "adsp_loader_dlkm",
+            "audio_prm_dlkm",
+            "q6_pdr_dlkm",
+            "gpr_dlkm",
+            "audio_pkt_dlkm",
+            "pinctrl_lpi_dlkm",
+            "swr_dlkm",
+            "swr_ctrl_dlkm",
+            "snd_event_dlkm",
+            "machine_dlkm",
+            "wcd_core_dlkm",
+            "mbhc_dlkm",
+            "wcd9xxx_dlkm",
+            "stub_dlkm",
+            "bolero_cdc_dlkm",
+            "va_macro_dlkm",
+            "tx_macro_dlkm",
+            "rx_macro_dlkm",
+            "wsa881x_analog_dlkm",
+            "wcd937x_dlkm",
+            "wcd937x_slave_dlkm",
+            "wcd938x_dlkm",
+            "wcd938x_slave_dlkm",
+        ],
+        config_options = [
+            "CONFIG_SND_SOC_HOLI",
+            "CONFIG_SND_SOC_MSM_QDSP6V2_INTF",
+            "CONFIG_MSM_QDSP6_SSR",
+            "CONFIG_DIGITAL_CDC_RSC_MGR",
+            "CONFIG_SOUNDWIRE_MSTR_CTRL",
+            "CONFIG_WCD9XXX_CODEC_CORE_V2",
+            "CONFIG_MSM_CDC_PINCTRL",
+            "CONFIG_SND_SOC_WCD_IRQ",
+            "CONFIG_SND_SOC_WCD9XXX_V2",
+            "CONFIG_SND_SOC_WCD_MBHC_ADC",
+        ]
+    )