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

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

Merge "ASOC: fix audio machine driver compile issue"

parents d4c2f7ad eae52c27

Makefile.am

100644 → 100755
+4 −1
Original line number Diff line number Diff line
@@ -46,12 +46,15 @@ obj-m += dsp/ 
obj-m += asoc/

obj-m += asoc/codecs/

obj-m += soc/

ifeq ($(TARGET_SUPPORT), $(filter $(TARGET_SUPPORT), sa8155 sa8155ivi sa8195 qtiquingvm))

ifeq ($(TARGET_SUPPORT), $(filter $(TARGET_SUPPORT), sa8155 sa8155ivi sa8195))

KBUILD_OPTIONS += CONFIG_SND_SOC_SA8155=m

endif

ifeq ($(TARGET_SUPPORT), $(filter $(TARGET_SUPPORT), sa6155))

KBUILD_OPTIONS += CONFIG_SND_SOC_SA6155=m

endif

ifeq ($(TARGET_SUPPORT), $(filter $(TARGET_SUPPORT), qtiquingvm))

KBUILD_OPTIONS += CONFIG_SND_SOC_GVM=m

endif

endif



define PROCESS_HEADERS

asoc/Kbuild

100644 → 100755
+60 −55
Original line number Diff line number Diff line
@@ -24,6 +24,11 @@ ifeq ($(CONFIG_SND_SOC_AUTO), y) 
		export

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

	endif

	ifdef CONFIG_SND_SOC_GVM

		include $(AUDIO_ROOT)/config/gvmauto.conf

		export

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

	endif

else

	ifeq ($(KERNEL_BUILD), 0)

		ifeq ($(CONFIG_ARCH_SM8150), y)

asoc/codecs/Kbuild

100644 → 100755
+54 −49
Original line number Diff line number Diff line
@@ -24,6 +24,11 @@ ifeq ($(CONFIG_SND_SOC_AUTO), y) 
		export

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

	endif

	ifdef CONFIG_SND_SOC_GVM

		include $(AUDIO_ROOT)/config/gvmauto.conf

		export

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

	endif

else

	ifeq ($(KERNEL_BUILD), 0)

		ifeq ($(CONFIG_ARCH_SM8150), y)

config/gvmauto.conf

100644 → 100755
+1 −1

File changed.File mode changed from 100644 to 100755.

Contains only whitespace changes.

dsp/Kbuild

100644 → 100755
+58 −53
Original line number Diff line number Diff line
@@ -24,6 +24,11 @@ ifeq ($(CONFIG_SND_SOC_AUTO), y) 
		export

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

	endif

	ifdef CONFIG_SND_SOC_GVM

		include $(AUDIO_ROOT)/config/gvmauto.conf

		export

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

	endif

else

	ifeq ($(KERNEL_BUILD), 0)

		ifeq ($(CONFIG_ARCH_SM6150), y)