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

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

Merge "ASoC: Add support for audio drivers compilation on kernel-4.14"

parents 75a24ba3 8d34b2e8

Makefile

+2 −2
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ LINUXINCLUDE += \ 
                -include $(srctree)/techpack/audio/config/sm8150autoconf.h

endif



obj-y += asoc/

obj-y += soc/

obj-y += dsp/

obj-y += ipc/

obj-y += soc/
 
obj-y += asoc/

asoc/Kbuild

+1 −2
Original line number Diff line number Diff line
@@ -6,11 +6,10 @@ else 
	KERNEL_BUILD := 0

endif





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_BLD_DIR := $(ANDROID_BUILD_TOP)/kernel/msm-4.14

	AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio

endif

asoc/codecs/Kbuild

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ endif 
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_BLD_DIR := $(ANDROID_BUILD_TOP)/kernel/msm-4.14

	AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio

endif

dsp/Kbuild

+8 −8
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ endif 
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_BLD_DIR := $(ANDROID_BUILD_TOP)/kernel/msm-4.14

	AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio

endif
@@ -111,14 +111,14 @@ ifdef CONFIG_MSM_ADSP_LOADER 
ADSP_LOADER_OBJS += adsp-loader.o

endif



ifdef CONFIG_MSM_QDSP6_NOTIFIER

QDSP6_NOTIFIER_OBJS += audio_notifier.o audio_ssr.o

endif



ifdef CONFIG_MSM_QDSP6_PDR

QDSP6_PDR_OBJS += audio_pdr.o

endif



ifdef CONFIG_MSM_QDSP6_NOTIFIER

QDSP6_NOTIFIER_OBJS += audio_notifier.o audio_ssr.o

endif



ifdef CONFIG_MSM_ULTRASOUND

USF_OBJS += usf.o usfcdev.o q6usm.o

endif
@@ -184,11 +184,11 @@ usf_dlkm-y := $(USF_OBJS) 
obj-$(CONFIG_MSM_ADSP_LOADER) += adsp_loader_dlkm.o

adsp_loader_dlkm-y := $(ADSP_LOADER_OBJS)



obj-$(CONFIG_MSM_QDSP6_NOTIFIER) += q6_notifier_dlkm.o

q6_notifier_dlkm-y := $(QDSP6_NOTIFIER_OBJS)



obj-$(CONFIG_MSM_QDSP6_PDR) += q6_pdr_dlkm.o

q6_pdr_dlkm-y := $(QDSP6_PDR_OBJS)



obj-$(CONFIG_MSM_QDSP6_NOTIFIER) += q6_notifier_dlkm.o

q6_notifier_dlkm-y := $(QDSP6_NOTIFIER_OBJS)



# inject some build related information

DEFINES += -DBUILD_TIMESTAMP=\"$(shell date -u +'%Y-%m-%dT%H:%M:%SZ')\"

dsp/codecs/Kbuild

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ endif 
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_BLD_DIR := $(ANDROID_BUILD_TOP)/kernel/msm-4.14

	AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio

endif