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

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

Merge "Rename sdm670 to sdm710."

parents b9f9e3ee 68d3ed85

Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ MY_LOCAL_PATH := $(call my-dir) 


UAPI_OUT := $(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/include



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

ifeq ($(call is-board-platform-in-list,msm8953 msm8937 sdm845 sdm710 qcs605),true)

$(shell mkdir -p $(UAPI_OUT)/linux;)

$(shell mkdir -p $(UAPI_OUT)/sound;)

$(shell rm -rf $(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/ipc/Module.symvers)
@@ -24,7 +24,7 @@ include $(MY_LOCAL_PATH)/asoc/codecs/Android.mk 
include $(MY_LOCAL_PATH)/asoc/codecs/wcd934x/Android.mk

endif



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

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

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

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

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

Makefile

+2 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ include $(srctree)/techpack/audio/config/sdm845auto.conf 
export

endif

ifeq ($(CONFIG_ARCH_SDM670), y)

include $(srctree)/techpack/audio/config/sdm670auto_static.conf

include $(srctree)/techpack/audio/config/sdm710auto_static.conf

export

endif

ifeq ($(CONFIG_ARCH_SDXPOORWILLS), y)
@@ -28,7 +28,7 @@ LINUXINCLUDE += \ 
endif

ifeq ($(CONFIG_ARCH_SDM670), y)

LINUXINCLUDE    += \

                -include $(srctree)/techpack/audio/config/sdm670autoconf.h

                -include $(srctree)/techpack/audio/config/sdm710autoconf.h

endif

ifeq ($(CONFIG_ARCH_SDXPOORWILLS), y)

LINUXINCLUDE    += \

asoc/Android.mk

+4 −4
Original line number Diff line number Diff line
@@ -8,8 +8,8 @@ TARGET := sdm845 
AUDIO_SELECT  := CONFIG_SND_SOC_SDM845=m

endif



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

TARGET := sdm670

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

TARGET := sdm710

AUDIO_SELECT  := CONFIG_SND_SOC_SDM670=m

endif
@@ -21,7 +21,7 @@ endif 


AUDIO_CHIPSET := audio

# Build/Package only in case of supported target

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

ifeq ($(call is-board-platform-in-list,msm8953 msm8937 sdm845 sdm710 qcs605),true)



LOCAL_PATH := $(call my-dir)
@@ -56,7 +56,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 msm8937 sdm670 qcs605),true)

ifeq ($(call is-board-platform-in-list,msm8953 msm8937 sdm710 qcs605),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
@@ -21,9 +21,9 @@ ifeq ($(KERNEL_BUILD), 0) 
		INCS    +=  -include $(AUDIO_ROOT)/config/sdm845autoconf.h

	endif

	ifeq ($(CONFIG_ARCH_SDM670), y)

		include $(AUDIO_ROOT)/config/sdm670auto.conf

		include $(AUDIO_ROOT)/config/sdm710auto.conf

		export

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

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

	endif

	ifeq ($(CONFIG_ARCH_SDM450), y)

		include $(AUDIO_ROOT)/config/sdm450auto.conf

asoc/codecs/Android.mk

+5 −5
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ ifeq ($(call is-board-platform,sdm845),true) 
AUDIO_SELECT  := CONFIG_SND_SOC_SDM845=m

endif



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

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

AUDIO_SELECT  := CONFIG_SND_SOC_SDM670=m

endif
@@ -18,7 +18,7 @@ endif 


AUDIO_CHIPSET := audio

# Build/Package only in case of supported target

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

ifeq ($(call is-board-platform-in-list,msm8953 msm8937 sdm845 sdm710 qcs605),true)



LOCAL_PATH := $(call my-dir)
@@ -61,7 +61,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 msm8937 sdm670 qcs605),true)

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

include $(CLEAR_VARS)

LOCAL_MODULE              := $(AUDIO_CHIPSET)_wcd_cpe.ko

LOCAL_MODULE_KBUILD_NAME  := wcd_cpe_dlkm.ko
@@ -71,7 +71,7 @@ LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT) 
include $(DLKM_DIR)/AndroidKernelModule.mk

endif

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

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

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

include $(CLEAR_VARS)

LOCAL_MODULE              := $(AUDIO_CHIPSET)_wcd_spi.ko

LOCAL_MODULE_KBUILD_NAME  := wcd_spi_dlkm.ko
@@ -81,7 +81,7 @@ LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT) 
include $(DLKM_DIR)/AndroidKernelModule.mk

endif

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

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

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

include $(CLEAR_VARS)

LOCAL_MODULE              := $(AUDIO_CHIPSET)_wcd9335.ko

LOCAL_MODULE_KBUILD_NAME  := wcd9335_dlkm.ko