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

Commit bc755538 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 60eaf5fe on remote branch 

Change-Id: Ie95d4f114d593e5744a0b1c77809c261af94ab14
parents 8ce6d5fb 60eaf5fe

Makefile.am

+10 −0
Original line number Diff line number Diff line
@@ -18,6 +18,9 @@ endif 
ifeq ($(TARGET_SUPPORT), qrb5165)

KBUILD_OPTIONS += CONFIG_ARCH_KONA=y

endif

ifeq ($(TARGET_SUPPORT), qcs6490)

KBUILD_OPTIONS += CONFIG_ARCH_LAHAINA=y

endif



subdir-ccflags-y += -I$(AUDIO_ROOT)/include/uapi/
@@ -48,6 +51,13 @@ obj-m += asoc/codecs/wcd938x/ 
bj-m += asoc/codecs/wsa883x/

KBUILD_CFLAGS += -Wno-error

endif

ifeq ($(TARGET_SUPPORT), $(filter $(TARGET_SUPPORT), qcs6490))

obj-m += asoc/codecs/bolero/

obj-m += asoc/codecs/wcd937x/

obj-m += asoc/codecs/wcd938x/

obj-m += asoc/codecs/wsa883x/

KBUILD_CFLAGS += -Wno-error

endif

ifeq ($(TARGET_SUPPORT), sdmsteppe)

obj-m += asoc/codecs/bolero/

obj-m += asoc/codecs/wcd937x/

asoc/Kbuild

+5 −0
Original line number Diff line number Diff line
@@ -72,6 +72,11 @@ else 
			include $(AUDIO_ROOT)/config/konaauto.conf

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

		endif

		ifeq ($(CONFIG_ARCH_LAHAINA), y)

			include $(AUDIO_ROOT)/config/lahainaauto.conf

			export

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

		endif

		ifeq ($(CONFIG_ARCH_LITO), y)

			include $(AUDIO_ROOT)/config/litoauto.conf

			export

asoc/codecs/Kbuild

+5 −0
Original line number Diff line number Diff line
@@ -72,6 +72,11 @@ else 
			include $(AUDIO_ROOT)/config/konaauto.conf

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

		endif

		ifeq ($(CONFIG_ARCH_LAHAINA), y)

			include $(AUDIO_ROOT)/config/lahainaauto.conf

			export

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

		endif

		ifeq ($(CONFIG_ARCH_LITO), y)

			include $(AUDIO_ROOT)/config/litoauto.conf

			export

asoc/codecs/bolero/Kbuild

+5 −0
Original line number Diff line number Diff line
@@ -30,6 +30,11 @@ ifeq ($(KERNEL_BUILD), 0) 
		include $(AUDIO_ROOT)/config/konaauto.conf

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

	endif

	ifeq ($(CONFIG_ARCH_LAHAINA), y)

		include $(AUDIO_ROOT)/config/lahainaauto.conf

		export

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

	endif

	ifeq ($(CONFIG_ARCH_LITO), y)

		include $(AUDIO_ROOT)/config/litoauto.conf

		export

asoc/codecs/wcd937x/Kbuild

+5 −0
Original line number Diff line number Diff line
@@ -36,6 +36,11 @@ ifeq ($(KERNEL_BUILD), 0) 
		export

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

	endif

	ifeq ($(CONFIG_ARCH_LAHAINA), y)

		include $(AUDIO_ROOT)/config/lahainaauto.conf

		export

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

	endif

endif



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