diff --git a/linux/misc/qseecom_priv.h b/linux/misc/qseecom_priv.h index b1d8221552..86b6555668 100644 --- a/linux/misc/qseecom_priv.h +++ b/linux/misc/qseecom_priv.h @@ -18,6 +18,8 @@ static inline int qseecom_process_listener_from_smcinvoke(uint32_t *result, { return -EOPNOTSUPP; } + +int get_qseecom_kernel_fun_ops(void); #endif diff --git a/pineapple.bzl b/pineapple.bzl index dc29c2796b..bc4c20bdb7 100644 --- a/pineapple.bzl +++ b/pineapple.bzl @@ -16,5 +16,6 @@ def define_pineapple(): ], extra_options = [ "CONFIG_QCOM_SMCINVOKE", + "CONFIG_QSEECOM_COMPAT", ], ) diff --git a/securemsm_modules.bzl b/securemsm_modules.bzl index b7f3badc90..83845b2d79 100644 --- a/securemsm_modules.bzl +++ b/securemsm_modules.bzl @@ -48,20 +48,6 @@ def register_securemsm_module(name, path = None, config_option = None, default_s securemsm_modules_by_config[config_option] = name # ------------------------------------ SECUREMSM MODULE DEFINITIONS --------------------------------- -register_securemsm_module( - name = "smcinvoke_dlkm", - path = SMCINVOKE_PATH, - default_srcs = [ - "smcinvoke.c", - "smcinvoke_kernel.c", - "trace_smcinvoke.h", - "IQSEEComCompat.h", - "IQSEEComCompatAppLoader.h", - ], - deps = [":smcinvoke_kernel_headers", ":qseecom_kernel_headers"], - hdrs = [":smcinvoke_kernel_headers"], -) - register_securemsm_module( name = "qseecom_dlkm", path = QSEECOM_PATH, @@ -74,6 +60,21 @@ register_securemsm_module( #copts = ["-include", "config/sec-kernel_defconfig_qseecom.h"], ) + +register_securemsm_module( + name = "smcinvoke_dlkm", + path = SMCINVOKE_PATH, + default_srcs = [ + "smcinvoke.c", + "smcinvoke_kernel.c", + "trace_smcinvoke.h", + "IQSEEComCompat.h", + "IQSEEComCompatAppLoader.h", + ], + deps = [":smcinvoke_kernel_headers", ":qseecom_kernel_headers", "%b_qseecom_dlkm"], + hdrs = [":smcinvoke_kernel_headers"], +) + register_securemsm_module( name = "tz_log_dlkm", path = TZLOG_PATH, @@ -103,7 +104,7 @@ register_securemsm_module( "hdcp1_ops.h", "hdcp2p2.h", ], - deps = [":hdcp_qseecom_dlkm", "%b_smcinvoke_dlkm"], + deps = [":hdcp_qseecom_dlkm", "%b_smcinvoke_dlkm", "%b_qseecom_dlkm"], srcs = ["config/sec-kernel_defconfig.h"], copts = [ "-include",