From 4c964683e31b1269bfc35336237d9b40c48e4c1e Mon Sep 17 00:00:00 2001 From: Sarath Varma Ganapathiraju Date: Fri, 22 Mar 2024 18:21:26 +0530 Subject: [PATCH] asoc: Fix compilation issue on pitti/milos update conf file with proper comment and remove PINEAPPLE config from volcano bazel to avoid compilation issue. Change-Id: If24dd6a0ac2fb95c606e88f4b8cb150b17f4b28d Signed-off-by: Sarath Varma Ganapathiraju --- build/pineapple.bzl | 4 +++- build/volcano.bzl | 7 +++---- config/pittiauto.conf | 6 +++--- config/volcanoauto.conf | 6 +++--- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/build/pineapple.bzl b/build/pineapple.bzl index d2bf3cfa4f..9e7ea57915 100644 --- a/build/pineapple.bzl +++ b/build/pineapple.bzl @@ -41,7 +41,9 @@ def define_pineapple(): "wcd938x_dlkm", "wcd938x_slave_dlkm", "wcd939x_dlkm", - "wcd939x_slave_dlkm" + "wcd939x_slave_dlkm", + "wcd9378_dlkm", + "wcd9378_slave_dlkm" ], config_options = [ "CONFIG_SND_SOC_PINEAPPLE", diff --git a/build/volcano.bzl b/build/volcano.bzl index 031723447e..be171fe221 100644 --- a/build/volcano.bzl +++ b/build/volcano.bzl @@ -42,12 +42,11 @@ def define_volcano(): "wcd938x_slave_dlkm", "wcd939x_dlkm", "wcd939x_slave_dlkm", - "wcd9378_dlkm", - "wcd9378_slave_dlkm", + "wcd9378_dlkm", + "wcd9378_slave_dlkm" ], config_options = [ - "CONFIG_SND_SOC_PINEAPPLE", - "CONFIG_SND_SOC_VOLCANO", + "CONFIG_SND_SOC_VOLCANO", "CONFIG_SND_SOC_MSM_QDSP6V2_INTF", "CONFIG_MSM_QDSP6_SSR", "CONFIG_DIGITAL_CDC_RSC_MGR", diff --git a/config/pittiauto.conf b/config/pittiauto.conf index b155faf124..d62102cd9f 100644 --- a/config/pittiauto.conf +++ b/config/pittiauto.conf @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only -/* - * Copyright (c) 2023-2024, Qualcomm Innovation Center, Inc. All rights reserved. - */ +# +# Copyright (c) 2023-2024, Qualcomm Innovation Center, Inc. All rights reserved. +# export CONFIG_SND_SOC_MSM_QDSP6V2_INTF=m export CONFIG_SND_SOC_PITTI=m export CONFIG_SND_EVENT=m diff --git a/config/volcanoauto.conf b/config/volcanoauto.conf index 72d377f506..aa38902067 100644 --- a/config/volcanoauto.conf +++ b/config/volcanoauto.conf @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only -/* - * Copyright (c) 2024, Qualcomm Innovation Center, Inc. All rights reserved. - */ +# +# Copyright (c) 2024, Qualcomm Innovation Center, Inc. All rights reserved. +# export CONFIG_SND_SOC_MSM_QDSP6V2_INTF=m export CONFIG_SND_SOC_PINEAPPLE=m export CONFIG_SND_SOC_VOLCANO=m