ASoC: allow drivers to compile both static and dynamic
Based on where the code is synced the driver should allow both static and dynamic linked compilation. Also remove __exit for modules loaded from another common init/exit functions. Change-Id: Ib58f152002aba3af4446f9bbd9b82c279212bd0a Signed-off-by: Asish Bhattacharya <asishb@codeaurora.org>
This commit is contained in:

gecommit door
Laxminath Kasam

bovenliggende
50a527cf07
commit
5faacb3a7e
47
dsp/Kbuild
47
dsp/Kbuild
@@ -1,22 +1,33 @@
|
||||
# We can build either as part of a standalone Kernel build or as
|
||||
# an external module. Determine which mechanism is being used
|
||||
KERNEL_BUILD := 0
|
||||
ifeq ($(MODNAME), )
|
||||
KERNEL_BUILD := 1
|
||||
else
|
||||
KERNEL_BUILD := 0
|
||||
endif
|
||||
|
||||
|
||||
ifeq ($(KERNEL_BUILD), 0)
|
||||
ifeq ($(KERNEL_BUILD), 1)
|
||||
# These are configurable via Kconfig for kernel-based builds
|
||||
# Need to explicitly configure for Android-based builds
|
||||
AUDIO_BLD_DIR := $(ANDROID_BUILD_TOP)/kernel/msm-4.9
|
||||
AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio
|
||||
endif
|
||||
|
||||
ifeq ($(KERNEL_BUILD), 0)
|
||||
ifeq ($(CONFIG_ARCH_SDM845), y)
|
||||
include $(AUDIO_ROOT)/config/sdm845auto.conf
|
||||
export
|
||||
INCS += -include $(AUDIO_ROOT)/config/sdm845autoconf.h
|
||||
endif
|
||||
ifeq ($(CONFIG_ARCH_SDM670), 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:
|
||||
# Defconfig : build with default flags
|
||||
# Slub : defconfig + CONFIG_SLUB_DEBUG := y +
|
||||
@@ -43,10 +54,9 @@ COMMON_INC := -I$(AUDIO_ROOT)/$(COMMON_DIR)
|
||||
|
||||
############ QDSP6V2 ############
|
||||
|
||||
ifeq ($(CONFIG_SND_SOC_MSM_QDSP6V2_INTF), m)
|
||||
ifdef CONFIG_SND_SOC_MSM_QDSP6V2_INTF
|
||||
Q6_OBJS += audio_calibration.o
|
||||
Q6_OBJS += audio_cal_utils.o
|
||||
Q6_OBJS += msm-dts-srs-tm-config.o
|
||||
Q6_OBJS += q6adm.o
|
||||
Q6_OBJS += q6afe.o
|
||||
Q6_OBJS += q6asm.o
|
||||
@@ -61,34 +71,31 @@ ifeq ($(CONFIG_SND_SOC_MSM_QDSP6V2_INTF), m)
|
||||
Q6_OBJS += avtimer.o
|
||||
Q6_OBJS += q6_init.o
|
||||
endif
|
||||
ifeq ($(CONFIG_MSM_ADSP_LOADER), m)
|
||||
ifdef CONFIG_DTS_SRS_TM
|
||||
Q6_OBJS += msm-dts-srs-tm-config.o
|
||||
endif
|
||||
|
||||
ifdef CONFIG_MSM_ADSP_LOADER
|
||||
ADSP_LOADER_OBJS += adsp-loader.o
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_MSM_QDSP6_NOTIFIER), m)
|
||||
ifdef CONFIG_MSM_QDSP6_NOTIFIER
|
||||
QDSP6_NOTIFIER_OBJS += audio_notifier.o audio_ssr.o
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_MSM_QDSP6_PDR), m)
|
||||
ifdef CONFIG_MSM_QDSP6_PDR
|
||||
QDSP6_PDR_OBJS += audio_pdr.o
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_MSM_ULTRASOUND), m)
|
||||
ifdef CONFIG_MSM_ULTRASOUND
|
||||
USF_OBJS += usf.o usfcdev.o q6usm.o
|
||||
endif
|
||||
|
||||
LINUX_INC += -Iinclude/linux
|
||||
|
||||
INCS := $(COMMON_INC) \
|
||||
INCS += $(COMMON_INC) \
|
||||
$(UAPI_INC)
|
||||
|
||||
ifeq ($(CONFIG_ARCH_SDM845), y)
|
||||
INCS += -include $(AUDIO_ROOT)/config/sdm845autoconf.h
|
||||
endif
|
||||
ifeq ($(CONFIG_ARCH_SDM670), y)
|
||||
INCS += -include $(AUDIO_ROOT)/config/sdm670autoconf.h
|
||||
endif
|
||||
|
||||
EXTRA_CFLAGS += $(INCS)
|
||||
|
||||
|
||||
@@ -128,7 +135,13 @@ CHIP_NAME ?= $(MODNAME)
|
||||
CDEFINES += -DMULTI_IF_NAME=\"$(CHIP_NAME)\"
|
||||
endif
|
||||
|
||||
ifeq ($(KERNEL_BUILD), 0)
|
||||
KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/vendor/qcom/opensource/audio-kernel/ipc/Module.symvers
|
||||
endif
|
||||
|
||||
ifeq ($(KERNEL_BUILD), 1)
|
||||
obj-y += codecs/
|
||||
endif
|
||||
|
||||
obj-$(CONFIG_SND_SOC_MSM_QDSP6V2_INTF) += q6_dlkm.o
|
||||
q6_dlkm-y := $(Q6_OBJS)
|
||||
|
Verwijs in nieuw issue
Block a user