Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e19eabb1 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "audio-kernel: add ar conf in makefie"

parents 21433bb5 a5cac994

Makefile.am

+11 −3
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ obj-m += asoc/codecs/bolero/ 
obj-m += asoc/codecs/wcd937x/

endif



ifeq ($(TARGET_SUPPORT), $(filter $(TARGET_SUPPORT), sa8155 sa8155ivi sa6155 sa8195 qtiquingvm qtiquingvm8295 sa8295 qtigvmi3))

ifeq ($(TARGET_SUPPORT), $(filter $(TARGET_SUPPORT), sa8155 sa8155ivi sa6155 sa8195 qtiquingvm qtiquingvm8295 sa8295))

KBUILD_OPTIONS += CONFIG_SND_SOC_AUTO=y

obj-m := ipc/

obj-m += dsp/
@@ -57,14 +57,22 @@ endif 
ifeq ($(TARGET_SUPPORT), $(filter $(TARGET_SUPPORT), sa6155))

KBUILD_OPTIONS += CONFIG_SND_SOC_SA6155=m

endif

ifeq ($(TARGET_SUPPORT), $(filter $(TARGET_SUPPORT), qtiquingvm qtigvmi3))

ifeq ($(TARGET_SUPPORT), $(filter $(TARGET_SUPPORT), qtiquingvm))

KBUILD_OPTIONS += CONFIG_SND_SOC_GVM=m

endif

ifeq ($(TARGET_SUPPORT), $(filter $(TARGET_SUPPORT), qtiquingvm8295))

KBUILD_OPTIONS += CONFIG_SND_SOC_GVM_SA8295=m

endif

endif



ifeq ($(AR_SUPPORT), $(filter $(AR_SUPPORT), yes))

obj-m := ipc/

obj-m += dsp/

obj-m += asoc/

obj-m += asoc/codecs/

obj-m += soc/

KBUILD_OPTIONS += CONFIG_SND_SOC_AUTO=y

KBUILD_OPTIONS += CONFIG_SND_SOC_AR=m

endif

all:

	$(shell rm -fr $(shell pwd)/soc/core.h)

	$(shell ln -s $(KERNEL_SRC)/drivers/pinctrl/core.h $(shell pwd)/soc/core.h)

asoc/Kbuild

100644 → 100755
+5 −0
Original line number Diff line number Diff line
@@ -29,6 +29,11 @@ ifeq ($(CONFIG_SND_SOC_AUTO), y) 
		export

		INCS    +=  -include $(AUDIO_ROOT)/config/gvmautoconf.h

	endif

	ifdef CONFIG_SND_SOC_AR

		include $(AUDIO_ROOT)/config/arauto.conf

		export

		INCS    +=  -include $(AUDIO_ROOT)/config/arautoconf.h

	endif

	ifdef CONFIG_SND_SOC_GVM_SA8295

		include $(AUDIO_ROOT)/config/sa8295gvmauto.conf

		export

asoc/codecs/Kbuild

+5 −0
Original line number Diff line number Diff line
@@ -29,6 +29,11 @@ ifeq ($(CONFIG_SND_SOC_AUTO), y) 
		export

		INCS    +=  -include $(AUDIO_ROOT)/config/gvmautoconf.h

	endif

	ifdef CONFIG_SND_SOC_AR

		include $(AUDIO_ROOT)/config/arauto.conf

		export

		INCS    +=  -include $(AUDIO_ROOT)/config/arautoconf.h

	endif

	ifdef CONFIG_SND_SOC_GVM_SA8295

		include $(AUDIO_ROOT)/config/sa8295gvmauto.conf

		export

config/arauto.conf

0 → 100755
+19 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

# Copyright (c) 2021, The Linux Foundation. All rights reserved.



ifeq ($(CONFIG_QGKI), y)

export CONFIG_SND_SOC_GVM_AUTO_SPF=m

export CONFIG_MSM_QDSP6_APRV2_VM=m

export CONFIG_MSM_QDSP6_SSR=m

export CONFIG_MSM_ADSP_LOADER=m

export CONFIG_MSM_QDSP6_NOTIFIER=m

export CONFIG_SND_SOC_MSM_QDSP6V2_VM=m

export CONFIG_SND_SOC_QDSP6V2=m

export CONFIG_QTI_PP=m

export CONFIG_SND_HWDEP_ROUTING=m

export CONFIG_SND_SOC_MSM_STUB=m

export CONFIG_SND_SOC_MSM_HDMI_CODEC_RX=m

export CONFIG_MSM_QDSP6V2_CODECS=m

export CONFIG_SND_EVENT=m

export CONFIG_SND_SOC_SA8155=m

endif
 
 No newline at end of file

config/arautoconf.h

0 → 100755
+27 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2018-2019, 2021 The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



#define CONFIG_SND_SOC_GVM_AUTO_SPF 1

#define CONFIG_MSM_QDSP6_APRV2_VM 1

#define CONFIG_MSM_ADSP_LOADER 1

#define CONFIG_MSM_QDSP6_SSR 1

#define CONFIG_MSM_QDSP6_NOTIFIER 1

#define CONFIG_SND_SOC_MSM_QDSP6V2_VM 1

#define CONFIG_SND_SOC_QDSP6V2 1

#define CONFIG_QTI_PP 1

#define CONFIG_SND_HWDEP_ROUTING 1

#define CONFIG_SND_SOC_MSM_STUB 1

#define CONFIG_SND_SOC_MSM_HDMI_CODEC_RX 1

#define CONFIG_MSM_QDSP6V2_CODECS 1

#define CONFIG_SND_EVENT 1

#define CONFIG_SND_SOC_SA8155 1