Browse Source

securemsm-kernel: Enable CONFIG_QSEECOM_COMPAT for pineapple

Bzl files changes to enable CONFIG_QSEECOM_COMPAT for pineapple.
Now that ddk flag is enabled, the config can no longer be enabled
with Kbuild, instead we have to use bzl based changes to enable
it.

Change-Id: I2f1bb9bb4b78413289b7fa988a49fc7b10e7836e
Signed-off-by: Divisha Bisht <quic_divibish@quicinc.com>
Divisha Bisht 1 year ago
parent
commit
986fef5bf8
3 changed files with 18 additions and 14 deletions
  1. 2 0
      linux/misc/qseecom_priv.h
  2. 1 0
      pineapple.bzl
  3. 15 14
      securemsm_modules.bzl

+ 2 - 0
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
 
 

+ 1 - 0
pineapple.bzl

@@ -16,5 +16,6 @@ def define_pineapple():
         ],
         extra_options = [
             "CONFIG_QCOM_SMCINVOKE",
+            "CONFIG_QSEECOM_COMPAT",
         ],
     )

+ 15 - 14
securemsm_modules.bzl

@@ -48,6 +48,19 @@ 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 = "qseecom_dlkm",
+    path = QSEECOM_PATH,
+    default_srcs = [
+        "qseecom.c",
+        "ice.h",
+    ],
+    deps = [":qseecom_kernel_headers"],
+    #srcs = ["config/sec-kernel_defconfig_qseecom.h"],
+    #copts = ["-include", "config/sec-kernel_defconfig_qseecom.h"],
+)
+
+
 register_securemsm_module(
     name = "smcinvoke_dlkm",
     path = SMCINVOKE_PATH,
@@ -58,22 +71,10 @@ register_securemsm_module(
         "IQSEEComCompat.h",
         "IQSEEComCompatAppLoader.h",
     ],
-    deps = [":smcinvoke_kernel_headers", ":qseecom_kernel_headers"],
+    deps = [":smcinvoke_kernel_headers", ":qseecom_kernel_headers", "%b_qseecom_dlkm"],
     hdrs = [":smcinvoke_kernel_headers"],
 )
 
-register_securemsm_module(
-    name = "qseecom_dlkm",
-    path = QSEECOM_PATH,
-    default_srcs = [
-        "qseecom.c",
-        "ice.h",
-    ],
-    deps = [":qseecom_kernel_headers"],
-    #srcs = ["config/sec-kernel_defconfig_qseecom.h"],
-    #copts = ["-include", "config/sec-kernel_defconfig_qseecom.h"],
-)
-
 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",