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

Commit 994eb4e8 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 0a07c920 111a5945

Makefile.am

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ obj-m += asoc/codecs/wcd937x/ 
endif



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

KBUILD_OPTIONS += CONFIG_SND_SOC_AUTO=y

obj-m := ipc/

obj-m += dsp/

obj-m += asoc/

asoc/Kbuild

+13 −0
Original line number Diff line number Diff line
@@ -13,6 +13,18 @@ ifeq ($(KERNEL_BUILD), 1) 
	AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio

endif



ifeq ($(CONFIG_SND_SOC_AUTO), y)

	ifdef CONFIG_SND_SOC_SA8155

		include $(AUDIO_ROOT)/config/sa8155auto.conf

		export

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

	endif

	ifdef CONFIG_SND_SOC_SA6155

		include $(AUDIO_ROOT)/config/sa6155auto.conf

		export

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

	endif

else

ifeq ($(KERNEL_BUILD), 0)

	ifeq ($(CONFIG_ARCH_SM8150), y)

		ifdef CONFIG_SND_SOC_SA8155
@@ -77,6 +89,7 @@ ifeq ($(KERNEL_BUILD), 0) 
		INCS    +=  -include $(AUDIO_ROOT)/config/gvmautoconf.h

	endif

endif

endif



# As per target team, build is done as follows:

# Defconfig : build with default flags

asoc/codecs/Kbuild

+13 −0
Original line number Diff line number Diff line
@@ -13,6 +13,18 @@ ifeq ($(KERNEL_BUILD), 1) 
	AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio

endif



ifeq ($(CONFIG_SND_SOC_AUTO), y)

	ifdef CONFIG_SND_SOC_SA8155

		include $(AUDIO_ROOT)/config/sa8155auto.conf

		export

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

	endif

	ifdef CONFIG_SND_SOC_SA6155

		include $(AUDIO_ROOT)/config/sa6155auto.conf

		export

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

	endif

else

ifeq ($(KERNEL_BUILD), 0)

	ifeq ($(CONFIG_ARCH_SM8150), y)

		ifdef CONFIG_SND_SOC_SA8155
@@ -71,6 +83,7 @@ ifeq ($(KERNEL_BUILD), 0) 
		INCS    +=  -include $(AUDIO_ROOT)/config/gvmautoconf.h

	endif

endif

endif



# As per target team, build is done as follows:

# Defconfig : build with default flags

dsp/Kbuild

+13 −2
Original line number Diff line number Diff line
@@ -13,6 +13,18 @@ ifeq ($(KERNEL_BUILD), 1) 
	AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio

endif



ifeq ($(CONFIG_SND_SOC_AUTO), y)

	ifdef CONFIG_SND_SOC_SA8155

		include $(AUDIO_ROOT)/config/sa8155auto.conf

		export

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

	endif

	ifdef CONFIG_SND_SOC_SA6155

		include $(AUDIO_ROOT)/config/sa6155auto.conf

		export

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

	endif

else

ifeq ($(KERNEL_BUILD), 0)

	ifeq ($(CONFIG_ARCH_SM6150), y)

		ifdef CONFIG_SND_SOC_SA6155
@@ -77,8 +89,7 @@ ifeq ($(KERNEL_BUILD), 0) 
		INCS    +=  -include $(AUDIO_ROOT)/config/gvmautoconf.h

	endif

endif





endif



# As per target team, build is done as follows:

# Defconfig : build with default flags

ipc/Kbuild

+13 −0
Original line number Diff line number Diff line
@@ -14,6 +14,18 @@ ifeq ($(KERNEL_BUILD), 1) 
	AUDIO_ROOT := $(KDIR)/techpack/audio

endif



ifeq ($(CONFIG_SND_SOC_AUTO), y)

	ifdef CONFIG_SND_SOC_SA8155

		include $(AUDIO_ROOT)/config/sa8155auto.conf

		export

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

	endif

	ifdef CONFIG_SND_SOC_SA6155

		include $(AUDIO_ROOT)/config/sa6155auto.conf

		export

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

	endif

else

ifeq ($(KERNEL_BUILD), 0)

        ifeq ($(CONFIG_ARCH_SM6150), y)

		ifdef CONFIG_SND_SOC_SA6155
@@ -78,6 +90,7 @@ ifeq ($(KERNEL_BUILD), 0) 
		INCS    +=  -include $(AUDIO_ROOT)/config/gvmautoconf.h

	endif

endif

endif



# As per target team, build is done as follows:

# Defconfig : build with default flags