Merge "bengal: enable compile of required modules" (fd60ba91) · Commits · e / devices / android_kernel_fairphone_FP4

Android.mk

+2 −2

Original line number	Diff line number	Diff line
		@@ -38,7 +38,7 @@ include $(MY_LOCAL_PATH)/asoc/codecs/aqt1000/Android.mk
		endif
		endif

		ifeq ($(call is-board-platform-in-list,$(MSMSTEPPE) $(TRINKET)),true)
		ifeq ($(call is-board-platform-in-list,$(MSMSTEPPE) $(TRINKET) bengal),true)
		ifneq ($(TARGET_BOARD_AUTO),true)
		$(shell rm -rf $(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/bolero/Module.symvers)
		include $(MY_LOCAL_PATH)/asoc/codecs/bolero/Android.mk
		@@ -47,7 +47,7 @@ include $(MY_LOCAL_PATH)/asoc/codecs/wcd937x/Android.mk
		endif
		endif

		ifeq ($(call is-board-platform-in-list, kona lito bengal),true)
		ifeq ($(call is-board-platform-in-list, kona lito),true)
		$(shell rm -rf $(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/bolero/Module.symvers)
		include $(MY_LOCAL_PATH)/asoc/codecs/bolero/Android.mk
		$(shell rm -rf $(PRODUCT_OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/codecs/wcd938x/Module.symvers)

asoc/Android.mk

+5 −0

Original line number	Diff line number	Diff line
		@@ -36,6 +36,11 @@ TARGET := lito
		AUDIO_SELECT := CONFIG_SND_SOC_LITO=m
		endif

		ifeq ($(call is-board-platform,bengal),true)
		TARGET := bengal
		AUDIO_SELECT := CONFIG_SND_SOC_BENGAL=m
		endif

		AUDIO_CHIPSET := audio
		# Build/Package only in case of supported target
		ifeq ($(call is-board-platform-in-list,msmnile $(MSMSTEPPE) $(TRINKET) kona lito bengal sdmshrike),true)

asoc/Kbuild

+10 −2

Original line number	Diff line number	Diff line
		@@ -51,9 +51,9 @@ ifeq ($(KERNEL_BUILD), 0)
		INCS += -include $(AUDIO_ROOT)/config/litoautoconf.h
		endif
		ifeq ($(CONFIG_ARCH_BENGAL), y)
		include $(AUDIO_ROOT)/config/litoauto.conf
		include $(AUDIO_ROOT)/config/bengalauto.conf
		export
		INCS += -include $(AUDIO_ROOT)/config/litoautoconf.h
		INCS += -include $(AUDIO_ROOT)/config/bengalautoconf.h
		endif
		ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)
		ifdef CONFIG_SND_SOC_SA8155
		@@ -135,6 +135,11 @@ ifdef CONFIG_SND_SOC_LITO
		MACHINE_OBJS += kona.o
		endif

		# for BENGAL sound card driver
		ifdef CONFIG_SND_SOC_BENGAL
		MACHINE_OBJS += bengal.o
		endif

		# for sa8155 sound card driver
		ifdef CONFIG_SND_SOC_SA8155
		MACHINE_OBJS += sa8155.o
		@@ -244,6 +249,9 @@ machine_dlkm-y := $(MACHINE_OBJS)
		obj-$(CONFIG_SND_SOC_LITO) += machine_dlkm.o
		machine_dlkm-y := $(MACHINE_OBJS)

		obj-$(CONFIG_SND_SOC_BENGAL) += machine_dlkm.o
		machine_dlkm-y := $(MACHINE_OBJS)

		obj-$(CONFIG_SND_SOC_SA8155) += machine_dlkm.o
		machine_dlkm-y := $(MACHINE_OBJS)

asoc/codecs/Android.mk

+18 −0

Original line number	Diff line number	Diff line
		@@ -31,6 +31,10 @@ ifeq ($(call is-board-platform,lito),true)
		AUDIO_SELECT := CONFIG_SND_SOC_LITO=m
		endif

		ifeq ($(call is-board-platform,bengal),true)
		AUDIO_SELECT := CONFIG_SND_SOC_BENGAL=m
		endif

		AUDIO_CHIPSET := audio
		# Build/Package only in case of supported target
		ifeq ($(call is-board-platform-in-list,msmnile $(MSMSTEPPE) $(TRINKET) kona lito bengal sdmshrike),true)
		@@ -107,6 +111,7 @@ LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
		include $(DLKM_DIR)/AndroidKernelModule.mk
		endif
		###########################################################
		ifneq ($(TARGET_PRODUCT), $(filter $(TARGET_PRODUCT), bengal))
		include $(CLEAR_VARS)
		LOCAL_MODULE := $(AUDIO_CHIPSET)_wsa881x.ko
		LOCAL_MODULE_KBUILD_NAME := wsa881x_dlkm.ko
		@@ -114,6 +119,17 @@ LOCAL_MODULE_TAGS := optional
		LOCAL_MODULE_DEBUG_ENABLE := true
		LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
		include $(DLKM_DIR)/AndroidKernelModule.mk
		endif
		###########################################################
		ifeq ($(call is-board-platform-in-list, bengal),true)
		include $(CLEAR_VARS)
		LOCAL_MODULE := $(AUDIO_CHIPSET)_wsa881x_analog.ko
		LOCAL_MODULE_KBUILD_NAME := wsa881x_analog_dlkm.ko
		LOCAL_MODULE_TAGS := optional
		LOCAL_MODULE_DEBUG_ENABLE := true
		LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
		include $(DLKM_DIR)/AndroidKernelModule.mk
		endif
		###########################################################
		include $(CLEAR_VARS)
		LOCAL_MODULE := $(AUDIO_CHIPSET)_mbhc.ko
		@@ -132,6 +148,7 @@ LOCAL_MODULE_DEBUG_ENABLE := true
		LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
		include $(DLKM_DIR)/AndroidKernelModule.mk
		###########################################################
		ifneq ($(TARGET_PRODUCT), $(filter $(TARGET_PRODUCT), bengal))
		include $(CLEAR_VARS)
		LOCAL_MODULE := $(AUDIO_CHIPSET)_hdmi.ko
		LOCAL_MODULE_KBUILD_NAME := hdmi_dlkm.ko
		@@ -139,6 +156,7 @@ LOCAL_MODULE_TAGS := optional
		LOCAL_MODULE_DEBUG_ENABLE := true
		LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
		include $(DLKM_DIR)/AndroidKernelModule.mk
		endif
		###########################################################

		endif # DLKM check

asoc/codecs/Kbuild

+11 −2

Original line number	Diff line number	Diff line
		@@ -51,9 +51,9 @@ ifeq ($(KERNEL_BUILD), 0)
		INCS += -include $(AUDIO_ROOT)/config/litoautoconf.h
		endif
		ifeq ($(CONFIG_ARCH_BENGAL), y)
		include $(AUDIO_ROOT)/config/litoauto.conf
		include $(AUDIO_ROOT)/config/bengalauto.conf
		export
		INCS += -include $(AUDIO_ROOT)/config/litoautoconf.h
		INCS += -include $(AUDIO_ROOT)/config/bengalautoconf.h
		endif
		ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)
		include $(AUDIO_ROOT)/config/sm8150auto.conf
		@@ -143,6 +143,12 @@ ifdef CONFIG_SND_SOC_WSA881X
		WSA881X_OBJS += wsa881x-temp-sensor.o
		endif

		ifdef CONFIG_SND_SOC_WSA881X_ANALOG
		WSA881X_ANALOG_OBJS += wsa881x-analog.o
		WSA881X_ANALOG_OBJS += wsa881x-tables-analog.o
		WSA881X_ANALOG_OBJS += wsa881x-regmap-analog.o
		WSA881X_ANALOG_OBJS += wsa881x-temp-sensor.o
		endif
		ifdef CONFIG_SND_SOC_MSM_STUB
		STUB_OBJS += msm_stub.o
		endif
		@@ -235,6 +241,9 @@ wcd9335_dlkm-y := $(WCD9335_OBJS)
		obj-$(CONFIG_SND_SOC_WSA881X) += wsa881x_dlkm.o
		wsa881x_dlkm-y := $(WSA881X_OBJS)

		obj-$(CONFIG_SND_SOC_WSA881X_ANALOG) += wsa881x_analog_dlkm.o
		wsa881x_analog_dlkm-y := $(WSA881X_ANALOG_OBJS)

		obj-$(CONFIG_SND_SOC_MSM_STUB) += stub_dlkm.o
		stub_dlkm-y := $(STUB_OBJS)