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

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

Merge "audio-driver: Update build files for sa6155"

parents d6329e47 f53de7f9

Android.mk

+5 −1
Original line number Original line Diff line number Diff line
@@ -22,9 +22,11 @@ include $(MY_LOCAL_PATH)/asoc/codecs/Android.mk 
endif

endif





ifeq ($(call is-board-platform-in-list,msmnile $(MSMSTEPPE) $(TRINKET)),true)

ifeq ($(call is-board-platform-in-list,msmnile $(MSMSTEPPE) $(TRINKET)),true)

ifneq ($(TARGET_PRODUCT), $(filter $(TARGET_PRODUCT), msmnile_au msmnile_gvmq))

ifneq ($(TARGET_PRODUCT), $(filter $(TARGET_PRODUCT), msmnile_au sm6150_au msmnile_gvmq))

$(shell rm -rf $(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/wcd934x/Module.symvers)

$(shell rm -rf $(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/wcd934x/Module.symvers)

include $(MY_LOCAL_PATH)/asoc/codecs/wcd934x/Android.mk

include $(MY_LOCAL_PATH)/asoc/codecs/wcd934x/Android.mk

$(shell rm -rf $(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/soc/Module.symvers)

include $(MY_LOCAL_PATH)/soc/Android.mk

endif

endif

endif

endif
@@ -40,11 +42,13 @@ endif 
endif

endif





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

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

ifneq ($(TARGET_PRODUCT), $(filter $(TARGET_PRODUCT), sm6150_au))

$(shell rm -rf $(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/bolero/Module.symvers)

$(shell rm -rf $(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/bolero/Module.symvers)

include $(MY_LOCAL_PATH)/asoc/codecs/bolero/Android.mk

include $(MY_LOCAL_PATH)/asoc/codecs/bolero/Android.mk

$(shell rm -rf $(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/wcd937x/Module.symvers)

$(shell rm -rf $(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/wcd937x/Module.symvers)

include $(MY_LOCAL_PATH)/asoc/codecs/wcd937x/Android.mk

include $(MY_LOCAL_PATH)/asoc/codecs/wcd937x/Android.mk

endif

endif

endif





ifeq ($(call is-board-platform-in-list, kona lito bengal),true)

ifeq ($(call is-board-platform-in-list, kona lito bengal),true)

$(shell rm -rf $(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/bolero/Module.symvers)

$(shell rm -rf $(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/bolero/Module.symvers)

asoc/Android.mk

+4 −0
Original line number Original line Diff line number Diff line
@@ -14,8 +14,12 @@ endif 




ifeq ($(call is-board-platform,$(MSMSTEPPE)),true)

ifeq ($(call is-board-platform,$(MSMSTEPPE)),true)

TARGET := talos

TARGET := talos

ifeq ($(TARGET_PRODUCT), $(filter $(TARGET_PRODUCT), sm6150_au))

AUDIO_SELECT  := CONFIG_SND_SOC_SA6155=m

else

AUDIO_SELECT  := CONFIG_SND_SOC_SM6150=m

AUDIO_SELECT  := CONFIG_SND_SOC_SM6150=m

endif

endif

endif





ifeq ($(call is-board-platform,$(TRINKET)),true)

ifeq ($(call is-board-platform,$(TRINKET)),true)

TARGET := trinket

TARGET := trinket

asoc/Kbuild

+17 −4
Original line number Original line Diff line number Diff line
@@ -26,10 +26,16 @@ ifeq ($(KERNEL_BUILD), 0) 
		endif

		endif

	endif

	endif

	ifeq ($(CONFIG_ARCH_SM6150), y)

	ifeq ($(CONFIG_ARCH_SM6150), y)

		ifdef CONFIG_SND_SOC_SA6155

			include $(AUDIO_ROOT)/config/sa6155auto.conf

			export

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

		else

			include $(AUDIO_ROOT)/config/sm6150auto.conf

			include $(AUDIO_ROOT)/config/sm6150auto.conf

			export

			export

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

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

		endif

		endif

	endif

	ifeq ($(CONFIG_ARCH_TRINKET), y)

	ifeq ($(CONFIG_ARCH_TRINKET), y)

		include $(AUDIO_ROOT)/config/sm6150auto.conf

		include $(AUDIO_ROOT)/config/sm6150auto.conf

		export

		export
@@ -96,10 +102,14 @@ endif 
# for SM6150 sound card driver

# for SM6150 sound card driver

ifdef CONFIG_SND_SOC_SM6150

ifdef CONFIG_SND_SOC_SM6150

	MACHINE_OBJS += sm6150.o

	MACHINE_OBJS += sm6150.o

	MACHINE_OBJS += sa6155.o

	MACHINE_OBJS += machine_615x_init.o

	MACHINE_OBJS += machine_615x_init.o

endif

endif





# For sa6155 sound card driver

ifdef CONFIG_SND_SOC_SA6155

	MACHINE_OBJS += sa6155.o

endif



# for qcs405 sound card driver

# for qcs405 sound card driver

ifdef CONFIG_SND_SOC_QCS405

ifdef CONFIG_SND_SOC_QCS405

	MACHINE_OBJS += qcs405.o

	MACHINE_OBJS += qcs405.o
@@ -211,6 +221,9 @@ machine_dlkm-y := $(MACHINE_OBJS) 
obj-$(CONFIG_SND_SOC_SM6150) += machine_dlkm.o

obj-$(CONFIG_SND_SOC_SM6150) += machine_dlkm.o

machine_dlkm-y := $(MACHINE_OBJS)

machine_dlkm-y := $(MACHINE_OBJS)





obj-$(CONFIG_SND_SOC_SA6155) += machine_dlkm.o

machine_dlkm-y := $(MACHINE_OBJS)



obj-$(CONFIG_SND_SOC_QCS405) += machine_dlkm.o

obj-$(CONFIG_SND_SOC_QCS405) += machine_dlkm.o

machine_dlkm-y := $(MACHINE_OBJS)

machine_dlkm-y := $(MACHINE_OBJS)

asoc/codecs/Android.mk

+9 −5
Original line number Original line Diff line number Diff line
@@ -12,8 +12,12 @@ endif 
endif

endif





ifeq ($(call is-board-platform,$(MSMSTEPPE)),true)

ifeq ($(call is-board-platform,$(MSMSTEPPE)),true)

ifeq ($(TARGET_PRODUCT), $(filter $(TARGET_PRODUCT), sm6150_au))

AUDIO_SELECT  := CONFIG_SND_SOC_SA6155=m

else

AUDIO_SELECT  := CONFIG_SND_SOC_SM6150=m

AUDIO_SELECT  := CONFIG_SND_SOC_SM6150=m

endif

endif

endif





ifeq ($(call is-board-platform,$(TRINKET)),true)

ifeq ($(call is-board-platform,$(TRINKET)),true)

AUDIO_SELECT  := CONFIG_SND_SOC_SM6150=m

AUDIO_SELECT  := CONFIG_SND_SOC_SM6150=m
@@ -54,9 +58,9 @@ KBUILD_OPTIONS := AUDIO_ROOT=$(AUDIO_BLD_DIR) 
KBUILD_OPTIONS += MODNAME=wcd_core_dlkm

KBUILD_OPTIONS += MODNAME=wcd_core_dlkm

KBUILD_OPTIONS += BOARD_PLATFORM=$(TARGET_BOARD_PLATFORM)

KBUILD_OPTIONS += BOARD_PLATFORM=$(TARGET_BOARD_PLATFORM)

KBUILD_OPTIONS += $(AUDIO_SELECT)

KBUILD_OPTIONS += $(AUDIO_SELECT)



# Target specific build

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

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

ifneq ($(TARGET_PRODUCT), $(filter $(TARGET_PRODUCT), msmnile_au msmnile_gvmq))

ifneq ($(TARGET_PRODUCT), $(filter $(TARGET_PRODUCT), msmnile_au sm6150_au msmnile_gvmq))

include $(CLEAR_VARS)

include $(CLEAR_VARS)

LOCAL_MODULE              := $(AUDIO_CHIPSET)_wcd_core.ko

LOCAL_MODULE              := $(AUDIO_CHIPSET)_wcd_core.ko

LOCAL_MODULE_KBUILD_NAME  := wcd_core_dlkm.ko

LOCAL_MODULE_KBUILD_NAME  := wcd_core_dlkm.ko
@@ -118,8 +122,8 @@ LOCAL_MODULE_TAGS := optional 
LOCAL_MODULE_DEBUG_ENABLE := true

LOCAL_MODULE_DEBUG_ENABLE := true

LOCAL_MODULE_PATH         := $(KERNEL_MODULES_OUT)

LOCAL_MODULE_PATH         := $(KERNEL_MODULES_OUT)

include $(DLKM_DIR)/AndroidKernelModule.mk

include $(DLKM_DIR)/AndroidKernelModule.mk

endif

endif # target specific build

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

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

include $(CLEAR_VARS)

include $(CLEAR_VARS)

LOCAL_MODULE              := $(AUDIO_CHIPSET)_stub.ko

LOCAL_MODULE              := $(AUDIO_CHIPSET)_stub.ko

LOCAL_MODULE_KBUILD_NAME  := stub_dlkm.ko

LOCAL_MODULE_KBUILD_NAME  := stub_dlkm.ko
@@ -127,7 +131,7 @@ LOCAL_MODULE_TAGS := optional 
LOCAL_MODULE_DEBUG_ENABLE := true

LOCAL_MODULE_DEBUG_ENABLE := true

LOCAL_MODULE_PATH         := $(KERNEL_MODULES_OUT)

LOCAL_MODULE_PATH         := $(KERNEL_MODULES_OUT)

include $(DLKM_DIR)/AndroidKernelModule.mk

include $(DLKM_DIR)/AndroidKernelModule.mk

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

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

include $(CLEAR_VARS)

include $(CLEAR_VARS)

LOCAL_MODULE              := $(AUDIO_CHIPSET)_hdmi.ko

LOCAL_MODULE              := $(AUDIO_CHIPSET)_hdmi.ko

LOCAL_MODULE_KBUILD_NAME  := hdmi_dlkm.ko

LOCAL_MODULE_KBUILD_NAME  := hdmi_dlkm.ko

asoc/codecs/Kbuild

+9 −3
Original line number Original line Diff line number Diff line
@@ -26,10 +26,16 @@ ifeq ($(KERNEL_BUILD), 0) 
		endif

		endif

	endif

	endif

	ifeq ($(CONFIG_ARCH_SM6150), y)

	ifeq ($(CONFIG_ARCH_SM6150), y)

		ifdef CONFIG_SND_SOC_SA6155

			include $(AUDIO_ROOT)/config/sa6155auto.conf

			export

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

		else

			include $(AUDIO_ROOT)/config/sm6150auto.conf

			include $(AUDIO_ROOT)/config/sm6150auto.conf

			export

			export

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

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

		endif

		endif

	endif

	ifeq ($(CONFIG_ARCH_TRINKET), y)

	ifeq ($(CONFIG_ARCH_TRINKET), y)

		include $(AUDIO_ROOT)/config/sm6150auto.conf

		include $(AUDIO_ROOT)/config/sm6150auto.conf

		export

		export