Merge "audio: Enable audio compile for 8953"

This commit is contained in:
Linux Build Service Account 2018-01-09 03:08:39 -08:00 • committed by Gerrit - the friendly Code Review server
commit 1f5ff4b6f0
19 changed files with 66 additions and 21 deletions

View file

@ -3,7 +3,7 @@ MY_LOCAL_PATH := $(call my-dir)
UAPI_OUT := $(OUT)/obj/vendor/qcom/opensource/audio-kernel/include
ifeq ($(call is-board-platform-in-list,sdm845 sdm670 qcs605),true)
ifeq ($(call is-board-platform-in-list,msm8953 sdm845 sdm670 qcs605),true)
$(shell mkdir -p $(UAPI_OUT)/linux;)
$(shell mkdir -p $(UAPI_OUT)/sound;)
$(shell rm -rf $(OUT)/obj/vendor/qcom/opensource/audio-kernel/ipc/Module.symvers)
@ -23,7 +23,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,sdm670 qcs605),true)
ifeq ($(call is-board-platform-in-list,msm8953 sdm670 qcs605),true)
$(shell rm -rf $(OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/sdm660_cdc/Module.symvers)
$(shell rm -rf $(OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/msm_sdw/Module.symvers)
include $(MY_LOCAL_PATH)/asoc/codecs/sdm660_cdc/Android.mk

View file

@ -8,14 +8,14 @@ TARGET := sdm845
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,msm8953 sdm670 qcs605),true)
TARGET := sdm670
AUDIO_SELECT := CONFIG_SND_SOC_SDM670=m
endif
AUDIO_CHIPSET := audio
# Build/Package only in case of supported target
ifeq ($(call is-board-platform-in-list,sdm845 sdm670 qcs605),true)
ifeq ($(call is-board-platform-in-list,msm8953 sdm845 sdm670 qcs605),true)
LOCAL_PATH := $(call my-dir)
@ -50,7 +50,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,msm8953 sdm670 qcs605),true)
include $(CLEAR_VARS)
LOCAL_MODULE := $(AUDIO_CHIPSET)_cpe_lsm.ko
LOCAL_MODULE_KBUILD_NAME := cpe_lsm_dlkm.ko

View file

@ -25,6 +25,11 @@ ifeq ($(KERNEL_BUILD), 0)
export
INCS += -include $(AUDIO_ROOT)/config/sdm670autoconf.h
endif
ifeq ($(CONFIG_ARCH_SDM450), y)
include $(AUDIO_ROOT)/config/sdm670auto.conf
export
INCS += -include $(AUDIO_ROOT)/config/sdm670autoconf.h
endif
endif
# As per target team, build is done as follows:

View file

@ -7,13 +7,13 @@ 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,msm8953 sdm670 qcs605),true)
AUDIO_SELECT := CONFIG_SND_SOC_SDM670=m
endif
AUDIO_CHIPSET := audio
# Build/Package only in case of supported target
ifeq ($(call is-board-platform-in-list,sdm845 sdm670 qcs605),true)
ifeq ($(call is-board-platform-in-list,msm8953 sdm845 sdm670 qcs605),true)
LOCAL_PATH := $(call my-dir)
@ -74,7 +74,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,msm8953 sdm670 qcs605),true)
include $(CLEAR_VARS)
LOCAL_MODULE := $(AUDIO_CHIPSET)_wcd9335.ko
LOCAL_MODULE_KBUILD_NAME := wcd9335_dlkm.ko

View file

@ -24,6 +24,11 @@ ifeq ($(KERNEL_BUILD), 0)
export
INCS += -include $(AUDIO_ROOT)/config/sdm670autoconf.h
endif
ifeq ($(CONFIG_ARCH_SDM450), y)
include $(AUDIO_ROOT)/config/sdm670auto.conf
export
INCS += -include $(AUDIO_ROOT)/config/sdm670autoconf.h
endif
endif
# As per target team, build is done as follows:

View file

@ -4,7 +4,7 @@
AUDIO_CHIPSET := audio
# Build/Package only in case of supported target
ifeq ($(call is-board-platform-in-list,sdm670 qcs605),true)
ifeq ($(call is-board-platform-in-list,msm8953 sdm670 qcs605),true)
AUDIO_SELECT := CONFIG_SND_SOC_SDM670=m
LOCAL_PATH := $(call my-dir)

View file

@ -25,6 +25,11 @@ ifeq ($(KERNEL_BUILD), 0)
export
INCS += -include $(AUDIO_ROOT)/config/sdm670autoconf.h
endif
ifeq ($(CONFIG_ARCH_SDM450), y)
include $(AUDIO_ROOT)/config/sdm670auto.conf
export
INCS += -include $(AUDIO_ROOT)/config/sdm670autoconf.h
endif
endif
# As per target team, build is done as follows:

View file

@ -4,7 +4,7 @@
AUDIO_CHIPSET := audio
# Build/Package only in case of supported target
ifeq ($(call is-board-platform-in-list,sdm670 qcs605),true)
ifeq ($(call is-board-platform-in-list,msm8953 sdm670 qcs605),true)
LOCAL_PATH := $(call my-dir)

View file

@ -25,6 +25,11 @@ ifeq ($(KERNEL_BUILD), 0)
export
INCS += -include $(AUDIO_ROOT)/config/sdm670autoconf.h
endif
ifeq ($(CONFIG_ARCH_SDM450), y)
include $(AUDIO_ROOT)/config/sdm670auto.conf
export
INCS += -include $(AUDIO_ROOT)/config/sdm670autoconf.h
endif
endif
# As per target team, build is done as follows:

View file

@ -7,13 +7,13 @@ 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,msm8953 sdm670 qcs605),true)
AUDIO_SELECT := CONFIG_SND_SOC_SDM670=m
endif
AUDIO_CHIPSET := audio
# Build/Package only in case of supported target
ifeq ($(call is-board-platform-in-list,sdm845 sdm670 qcs605),true)
ifeq ($(call is-board-platform-in-list,msm8953 sdm845 sdm670 qcs605),true)
LOCAL_PATH := $(call my-dir)

View file

@ -26,6 +26,11 @@ ifeq ($(KERNEL_BUILD), 0)
export
INCS += -include $(AUDIO_ROOT)/config/sdm670autoconf.h
endif
ifeq ($(CONFIG_ARCH_SDM450), y)
include $(AUDIO_ROOT)/config/sdm670auto.conf
export
INCS += -include $(AUDIO_ROOT)/config/sdm670autoconf.h
endif
endif
# As per target team, build is done as follows:

View file

@ -7,13 +7,13 @@ 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,msm8953 sdm670 qcs605),true)
AUDIO_SELECT := CONFIG_SND_SOC_SDM670=m
endif
AUDIO_CHIPSET := audio
# Build/Package only in case of supported target
ifeq ($(call is-board-platform-in-list,sdm845 sdm670 qcs605),true)
ifeq ($(call is-board-platform-in-list,msm8953 sdm845 sdm670 qcs605),true)
LOCAL_PATH := $(call my-dir)

View file

@ -24,6 +24,11 @@ ifeq ($(KERNEL_BUILD), 0)
export
INCS += -include $(AUDIO_ROOT)/config/sdm670autoconf.h
endif
ifeq ($(CONFIG_ARCH_SDM450), y)
include $(AUDIO_ROOT)/config/sdm670auto.conf
export
INCS += -include $(AUDIO_ROOT)/config/sdm670autoconf.h
endif
endif

View file

@ -7,13 +7,13 @@ 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,msm8953 sdm670 qcs605),true)
AUDIO_SELECT := CONFIG_SND_SOC_SDM670=m
endif
AUDIO_CHIPSET := audio
# Build/Package only in case of supported target
ifeq ($(call is-board-platform-in-list,sdm845 sdm670 qcs605),true)
ifeq ($(call is-board-platform-in-list,msm8953 sdm845 sdm670 qcs605),true)
LOCAL_PATH := $(call my-dir)

View file

@ -25,6 +25,11 @@ ifeq ($(KERNEL_BUILD), 0)
export
INCS += -include $(AUDIO_ROOT)/config/sdm670autoconf.h
endif
ifeq ($(CONFIG_ARCH_SDM450), y)
include $(AUDIO_ROOT)/config/sdm670auto.conf
export
INCS += -include $(AUDIO_ROOT)/config/sdm670autoconf.h
endif
endif
# As per target team, build is done as follows:

View file

@ -7,13 +7,13 @@ 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,msm8953 sdm670 qcs605),true)
AUDIO_SELECT := CONFIG_SND_SOC_SDM670=m
endif
AUDIO_CHIPSET := audio
# Build/Package only in case of supported target
ifeq ($(call is-board-platform-in-list,sdm845 sdm670 qcs605),true)
ifeq ($(call is-board-platform-in-list,msm8953 sdm845 sdm670 qcs605),true)
LOCAL_PATH := $(call my-dir)

View file

@ -34,6 +34,11 @@ ifeq ($(KERNEL_BUILD), 0)
export
INCS += -include $(AUDIO_ROOT)/config/sdm670autoconf.h
endif
ifeq ($(CONFIG_ARCH_SDM450), y)
include $(AUDIO_ROOT)/config/sdm670auto.conf
export
INCS += -include $(AUDIO_ROOT)/config/sdm670autoconf.h
endif
endif
# As per target team, build is done as follows:

View file

@ -7,13 +7,13 @@ 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,msm8953 sdm670 qcs605),true)
AUDIO_SELECT := CONFIG_SND_SOC_SDM670=m
endif
AUDIO_CHIPSET := audio
# Build/Package only in case of supported target
ifeq ($(call is-board-platform-in-list,sdm845 sdm670 qcs605),true)
ifeq ($(call is-board-platform-in-list,msm8953 sdm845 sdm670 qcs605),true)
LOCAL_PATH := $(call my-dir)
@ -40,7 +40,7 @@ KBUILD_OPTIONS += BOARD_PLATFORM=$(TARGET_BOARD_PLATFORM)
KBUILD_OPTIONS += $(AUDIO_SELECT)
###########################################################
ifeq ($(call is-board-platform-in-list,sdm670 qcs605),true)
ifeq ($(call is-board-platform-in-list,msm8953 sdm670 qcs605),true)
include $(CLEAR_VARS)
LOCAL_MODULE := $(AUDIO_CHIPSET)_pinctrl_lpi.ko
LOCAL_MODULE_KBUILD_NAME := pinctrl_lpi_dlkm.ko

View file

@ -24,6 +24,11 @@ ifeq ($(KERNEL_BUILD), 0)
export
INCS += -include $(AUDIO_ROOT)/config/sdm670autoconf.h
endif
ifeq ($(CONFIG_ARCH_SDM450), y)
include $(AUDIO_ROOT)/config/sdm670auto.conf
export
INCS += -include $(AUDIO_ROOT)/config/sdm670autoconf.h
endif
endif
# As per target team, build is done as follows: