From f633ed34d135d24d8c415a89822b52b941f5170c Mon Sep 17 00:00:00 2001 From: Anvesh Jain P Date: Tue, 10 Oct 2023 12:42:50 +0530 Subject: [PATCH] Check product type before enabling driver Add condition to enable driver for non GVM target. Virtual fastrpc driver is used for target based on hypervisor, skipping driver compilation. Signed-off-by: Anvesh Jain P Change-Id: I1ac5c0e29f259cbd05f426ca51cd945b695078c9 --- dsp_kernel_board.mk | 4 +++- dsp_kernel_product.mk | 4 +++- product.mk | 2 ++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dsp_kernel_board.mk b/dsp_kernel_board.mk index 12a10f0e40..fb39d962f5 100644 --- a/dsp_kernel_board.mk +++ b/dsp_kernel_board.mk @@ -1,7 +1,9 @@ ifneq ($(TARGET_KERNEL_DLKM_DISABLE), true) +ifneq ($(ENABLE_HYP), true) ifeq ($(call is-board-platform-in-list,$(TARGET_BOARD_PLATFORM)),true) BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/frpc-adsprpc.ko #BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/frpc-trusted-adsprpc.ko BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/cdsp-loader.ko endif -endif \ No newline at end of file +endif +endif diff --git a/dsp_kernel_product.mk b/dsp_kernel_product.mk index 06a8832440..fb61d5653d 100644 --- a/dsp_kernel_product.mk +++ b/dsp_kernel_product.mk @@ -1,5 +1,7 @@ ifneq ($(TARGET_KERNEL_DLKM_DISABLE), true) +ifneq ($(ENABLE_HYP), true) PRODUCT_PACKAGES += frpc-adsprpc.ko #PRODUCT_PACKAGES += frpc_trusted-adsprpc.ko PRODUCT_PACKAGES += cdsp-loader.ko -endif \ No newline at end of file +endif +endif diff --git a/product.mk b/product.mk index 34d12e010c..24c9e25931 100644 --- a/product.mk +++ b/product.mk @@ -1,2 +1,4 @@ +ifneq ($(ENABLE_HYP), true) PRODUCT_PACKAGES += frpc-adsprpc.ko #PRODUCT_PACKAGES += cdsp-loader.ko +endif