configs: msmsteppe: enable gki for msm-5.4
1. Enable AUDIO_FEATURE_ENABLED_GKI flag for Kernel
5.4 compatibility.
2. Remove audio dlkm
Change-Id: I48cb800b39c91dc14f9a6ae961d69e5ca5531397
diff --git a/configs/msmsteppe/msmsteppe.mk b/configs/msmsteppe/msmsteppe.mk
index 29bad8d..164cf84 100644
--- a/configs/msmsteppe/msmsteppe.mk
+++ b/configs/msmsteppe/msmsteppe.mk
@@ -41,6 +41,9 @@
AUDIO_FEATURE_ENABLED_DLKM := true
BOARD_SUPPORTS_SOUND_TRIGGER := true
AUDIO_FEATURE_ENABLED_INSTANCE_ID := true
+ifeq ($(TARGET_HAS_GENERIC_KERNEL_HEADERS), true)
+AUDIO_FEATURE_ENABLED_GKI := true
+endif
AUDIO_USE_DEEP_AS_PRIMARY_OUTPUT := false
AUDIO_FEATURE_ENABLED_VBAT_MONITOR := true
AUDIO_FEATURE_ENABLED_NT_PAUSE_TIMEOUT := true
@@ -88,76 +91,6 @@
PRODUCT_PACKAGES += $(AUDIO_WRAPPER)
PRODUCT_PACKAGES += $(AUDIO_HAL_TEST_APPS)
-ifeq ($(AUDIO_FEATURE_ENABLED_DLKM),true)
-BOARD_VENDOR_KERNEL_MODULES := \
- $(KERNEL_MODULES_OUT)/audio_apr.ko \
- $(KERNEL_MODULES_OUT)/audio_snd_event.ko \
- $(KERNEL_MODULES_OUT)/audio_wglink.ko \
- $(KERNEL_MODULES_OUT)/audio_q6_pdr.ko \
- $(KERNEL_MODULES_OUT)/audio_q6_notifier.ko \
- $(KERNEL_MODULES_OUT)/audio_adsp_loader.ko \
- $(KERNEL_MODULES_OUT)/audio_q6.ko \
- $(KERNEL_MODULES_OUT)/audio_usf.ko \
- $(KERNEL_MODULES_OUT)/audio_pinctrl_wcd.ko \
- $(KERNEL_MODULES_OUT)/audio_pinctrl_lpi.ko \
- $(KERNEL_MODULES_OUT)/audio_swr.ko \
- $(KERNEL_MODULES_OUT)/audio_wcd_core.ko \
- $(KERNEL_MODULES_OUT)/audio_swr_ctrl.ko \
- $(KERNEL_MODULES_OUT)/audio_wsa881x.ko \
- $(KERNEL_MODULES_OUT)/audio_platform.ko \
- $(KERNEL_MODULES_OUT)/audio_hdmi.ko \
- $(KERNEL_MODULES_OUT)/audio_stub.ko \
- $(KERNEL_MODULES_OUT)/audio_wcd9xxx.ko \
- $(KERNEL_MODULES_OUT)/audio_mbhc.ko \
- $(KERNEL_MODULES_OUT)/audio_wcd934x.ko \
- $(KERNEL_MODULES_OUT)/audio_wcd937x.ko \
- $(KERNEL_MODULES_OUT)/audio_wcd937x_slave.ko \
- $(KERNEL_MODULES_OUT)/audio_bolero_cdc.ko \
- $(KERNEL_MODULES_OUT)/audio_wsa_macro.ko \
- $(KERNEL_MODULES_OUT)/audio_va_macro.ko \
- $(KERNEL_MODULES_OUT)/audio_rx_macro.ko \
- $(KERNEL_MODULES_OUT)/audio_tx_macro.ko \
- $(KERNEL_MODULES_OUT)/audio_wcd_spi.ko \
- $(KERNEL_MODULES_OUT)/audio_native.ko \
- $(KERNEL_MODULES_OUT)/audio_machine_talos.ko
-endif
-
-BOARD_VENDOR_KERNEL_MODULES += $(shell ls $(KERNEL_MODULES_OUT)/*.ko)
-
-#Audio DLKM
-AUDIO_DLKM := audio_apr.ko
-AUDIO_DLKM += audio_snd_event.ko
-AUDIO_DLKM += audio_wglink.ko
-AUDIO_DLKM += audio_q6_pdr.ko
-AUDIO_DLKM += audio_q6_notifier.ko
-AUDIO_DLKM += audio_adsp_loader.ko
-AUDIO_DLKM += audio_q6.ko
-AUDIO_DLKM += audio_usf.ko
-AUDIO_DLKM += audio_pinctrl_wcd.ko
-AUDIO_DLKM += audio_swr.ko
-AUDIO_DLKM += audio_wcd_core.ko
-AUDIO_DLKM += audio_swr_ctrl.ko
-AUDIO_DLKM += audio_wsa881x.ko
-AUDIO_DLKM += audio_platform.ko
-AUDIO_DLKM += audio_hdmi.ko
-AUDIO_DLKM += audio_stub.ko
-AUDIO_DLKM += audio_wcd9xxx.ko
-AUDIO_DLKM += audio_mbhc.ko
-AUDIO_DLKM += audio_wcd_spi.ko
-AUDIO_DLKM += audio_native.ko
-AUDIO_DLKM += audio_machine_talos.ko
-AUDIO_DLKM += audio_wcd934x.ko
-AUDIO_DLKM += audio_pinctrl_lpi.ko
-AUDIO_DLKM += audio_wcd937x.ko
-AUDIO_DLKM += audio_wcd937x_slave.ko
-AUDIO_DLKM += audio_bolero_cdc.ko
-AUDIO_DLKM += audio_wsa_macro.ko
-AUDIO_DLKM += audio_va_macro.ko
-AUDIO_DLKM += audio_rx_macro.ko
-AUDIO_DLKM += audio_tx_macro.ko
-
-PRODUCT_PACKAGES += $(AUDIO_DLKM)
-
#Audio Specific device overlays
DEVICE_PACKAGE_OVERLAYS += vendor/qcom/opensource/audio-hal/primary-hal/configs/common/overlay