msm: eva: add support for Synx fastRpc ko dependency

--added support for Synx ko dependency
--enable Synx compilation flag
--added MODULE_SOFTDEP on synx-driver

--similar updates applied for fastRPC
--use KBUILD_REQUIRED_KOS instead of KBUILD_EXTRA_SYMBOLS
--last patch disable synx temporarily

Change-Id: Ib4fe2fd6b16e200f924f0105ece4363bc8c882e6
Signed-off-by: Yu SI <[email protected]>

Android.mk

@@ -15,10 +15,29 @@ LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
 LOCAL_ADDITIONAL_DEPENDENCY      := synx-driver.ko
 
 # export to kbuild
-KBUILD_OPTIONS += KBUILD_EXTRA_SYMBOLS=$(shell pwd)/$(call intermediates-dir-for,DLKM,mmrm-module-symvers)/Module.symvers
-
+# Setup mmrm dependency
 LOCAL_REQUIRED_MODULES    := mmrm-module-symvers
 LOCAL_ADDITIONAL_DEPENDENCIES := $(call intermediates-dir-for,DLKM,mmrm-module-symvers)/Module.symvers
+KBUILD_REQUIRED_KOS += msm-mmrm.ko
+
+# Setup SynX dependency
+CONFIG_SYNX := n
+#ifdef CONFIG_SYNX
+ifeq ($(CONFIG_SYNX), y)
+$(warning Compiling SynX)
+LOCAL_REQUIRED_MODULES    += synx-driver-symvers
+LOCAL_ADDITIONAL_DEPENDENCIES += $(call intermediates-dir-for,DLKM,synx-driver-symvers)/synx-driver-symvers
+KBUILD_REQUIRED_KOS += synx-driver.ko
+endif
+
+# Setup fastRPC dependency
+CONFIG_FASTRPC := y
+ifeq ($(CONFIG_FASTRPC), y)
+$(warning Compiling FastRPC)
+LOCAL_REQUIRED_MODULES    += dsp-module-symvers
+LOCAL_ADDITIONAL_DEPENDENCIES += $(call intermediates-dir-for,DLKM,dsp-module-symvers)/Module.symvers
+KBUILD_REQUIRED_KOS += frpc-adsprpc.ko
+endif
 
 # print out variables
 $(info KBUILD_OPTIONS = $(KBUILD_OPTIONS))

msm/Kbuild

@@ -33,6 +33,7 @@ $(info within KBUILD file CONFIG_ARCH_PINEAPPLE = $(CONFIG_ARCH_PINEAPPLE))
 KBUILD_CPPFLAGS += -DCONFIG_EVA_PINEAPPLE=1 -DCVP_CONFIG_SYNX_V2=1
 ccflags-y += -DCONFIG_EVA_PINEAPPLE=1 -DCVP_CONFIG_SYNX_V2=1
 ccflags-y += -I$(EVA_ROOT)/../synx-kernel/msm/synx/ \
+    -I$(EVA_ROOT)/../dsp-kernel/include/ \
     -I$(EVA_ROOT)/../synx-kernel/include/uapi/synx/media/
 endif
 

msm/eva/cvp.c

@@ -649,5 +649,7 @@ module_init(msm_cvp_init);
 module_exit(msm_cvp_exit);
 
 MODULE_SOFTDEP("pre: msm-mmrm");
+MODULE_SOFTDEP("pre: synx-driver");
+MODULE_SOFTDEP("pre: frpc-adsprpc");
 MODULE_LICENSE("GPL v2");
 MODULE_IMPORT_NS(DMA_BUF);

msm/eva/cvp_comm_def.h

@@ -37,6 +37,8 @@ enum queue_state {
 #ifdef CONFIG_EVA_PINEAPPLE
 #define CVP_MMRM_ENABLED 1
 #define CVP_CONFIG_SYNX_V2 1
+/* #define CVP_SYNX_ENABLED 1 */ /* temp disable til Synx ready*/
+#define CVP_FASTRPC_ENABLED 1
 #endif	/* End of CONFIG_EVA_PINEAPPLE */