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

Commit ccc541f2 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "audio: Update config files and Kbuild for trinket"

parents 2bc51f99 a9390223

asoc/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ LOCAL_MODULE_DEBUG_ENABLE := true 
LOCAL_MODULE_PATH         := $(KERNEL_MODULES_OUT)

include $(DLKM_DIR)/AndroidKernelModule.mk

###########################################################

ifeq ($(call is-board-platform-in-list,msm8953 sdm670 qcs605),true)

ifeq ($(call is-board-platform-in-list,msm8953 sdm670 qcs605 $(TRINKET)),true)

include $(CLEAR_VARS)

LOCAL_MODULE              := $(AUDIO_CHIPSET)_cpe_lsm.ko

LOCAL_MODULE_KBUILD_NAME  := cpe_lsm_dlkm.ko

asoc/Kbuild

+2 −2
Original line number Diff line number Diff line
@@ -40,9 +40,9 @@ ifeq ($(KERNEL_BUILD), 0) 
		INCS    +=  -include $(AUDIO_ROOT)/config/sm6150autoconf.h

	endif

	ifeq ($(CONFIG_ARCH_TRINKET), y)

		include $(AUDIO_ROOT)/config/sm6150auto.conf

		include $(AUDIO_ROOT)/config/trinketauto.conf

		export

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

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

	endif

	ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)

		include $(AUDIO_ROOT)/config/sm8150auto.conf

asoc/codecs/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ LOCAL_MODULE_DEBUG_ENABLE := true 
LOCAL_MODULE_PATH         := $(KERNEL_MODULES_OUT)

include $(DLKM_DIR)/AndroidKernelModule.mk

###########################################################

ifeq ($(call is-board-platform-in-list,sdm670 qcs605),true)

ifeq ($(call is-board-platform-in-list,sdm670 qcs605 $(TRINKET)),true)

include $(CLEAR_VARS)

LOCAL_MODULE              := $(AUDIO_CHIPSET)_wcd_cpe.ko

LOCAL_MODULE_KBUILD_NAME  := wcd_cpe_dlkm.ko
@@ -86,7 +86,7 @@ LOCAL_MODULE_DEBUG_ENABLE := true 
LOCAL_MODULE_PATH         := $(KERNEL_MODULES_OUT)

include $(DLKM_DIR)/AndroidKernelModule.mk

###########################################################

ifeq ($(call is-board-platform-in-list,msm8953 sdm670 qcs605),true)

ifeq ($(call is-board-platform-in-list,msm8953 sdm670 qcs605 $(TRINKET)),true)

include $(CLEAR_VARS)

LOCAL_MODULE              := $(AUDIO_CHIPSET)_wcd9335.ko

LOCAL_MODULE_KBUILD_NAME  := wcd9335_dlkm.ko

asoc/codecs/Kbuild

+2 −2
Original line number Diff line number Diff line
@@ -40,9 +40,9 @@ ifeq ($(KERNEL_BUILD), 0) 
		INCS    +=  -include $(AUDIO_ROOT)/config/sm6150autoconf.h

	endif

	ifeq ($(CONFIG_ARCH_TRINKET), y)

		include $(AUDIO_ROOT)/config/sm6150auto.conf

		include $(AUDIO_ROOT)/config/trinketauto.conf

		export

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

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

	endif

	ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)

		include $(AUDIO_ROOT)/config/sm8150auto.conf

asoc/codecs/bolero/Kbuild

+2 −2
Original line number Diff line number Diff line
@@ -22,9 +22,9 @@ ifeq ($(KERNEL_BUILD), 0) 
		INCS    +=  -include $(AUDIO_ROOT)/config/sm6150autoconf.h

	endif

	ifeq ($(CONFIG_ARCH_TRINKET), y)

		include $(AUDIO_ROOT)/config/sm6150auto.conf

		include $(AUDIO_ROOT)/config/trinketauto.conf

		export

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

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

	endif

	ifeq ($(CONFIG_ARCH_QCS405), y)

		include $(AUDIO_ROOT)/config/qcs405auto.conf