Merge "securemsm-kernel: Add rules to build qtee modules on sun"

This commit is contained in:
qctecmdr
2023-09-20 02:06:53 -07:00
committed by Gerrit - the friendly Code Review server
4 changed files with 41 additions and 18 deletions

View File

@@ -1,15 +1,16 @@
# Android makefile for securemsm kernel modules # Android makefile for securemsm kernel modules
ENABLE_SECUREMSM_DLKM := false
ifeq ($(TARGET_KERNEL_DLKM_DISABLE), true)
ifeq ($(TARGET_KERNEL_DLKM_SECURE_MSM_OVERRIDE), true)
ENABLE_SECUREMSM_DLKM := true ENABLE_SECUREMSM_DLKM := true
endif ENABLE_SECUREMSM_QTEE_DLKM := true
else
ENABLE_SECUREMSM_DLKM := true
endif
ifeq ($(ENABLE_SECUREMSM_DLKM), true) ifeq ($(TARGET_KERNEL_DLKM_DISABLE), true)
ifeq ($(TARGET_KERNEL_DLKM_SECURE_MSM_OVERRIDE),false)
ENABLE_SECUREMSM_DLKM := false
endif
ifeq ($(TARGET_KERNEL_DLKM_SECUREMSM_QTEE_OVERRIDE),false)
ENABLE_SECUREMSM_QTEE_DLKM := false
endif
endif
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)
DLKM_DIR := $(TOP)/device/qcom/common/dlkm DLKM_DIR := $(TOP)/device/qcom/common/dlkm
@@ -40,6 +41,8 @@ LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
include $(DLKM_DIR)/Build_external_kernelmodule.mk include $(DLKM_DIR)/Build_external_kernelmodule.mk
################################################### ###################################################
################################################### ###################################################
ifeq ($(ENABLE_SECUREMSM_QTEE_DLKM), true)
include $(CLEAR_VARS) include $(CLEAR_VARS)
#LOCAL_SRC_FILES := $(SSG_SRC_FILES) #LOCAL_SRC_FILES := $(SSG_SRC_FILES)
LOCAL_MODULE := smcinvoke_dlkm.ko LOCAL_MODULE := smcinvoke_dlkm.ko
@@ -59,8 +62,20 @@ LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_DEBUG_ENABLE := true LOCAL_MODULE_DEBUG_ENABLE := true
LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT) LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
include $(DLKM_DIR)/Build_external_kernelmodule.mk include $(DLKM_DIR)/Build_external_kernelmodule.mk
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(SSG_SRC_FILES)
LOCAL_MODULE := qseecom_dlkm.ko
LOCAL_MODULE_KBUILD_NAME := qseecom_dlkm.ko
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_DEBUG_ENABLE := true
LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
include $(DLKM_DIR)/Build_external_kernelmodule.mk
endif #ENABLE_SECUREMSM_QTEE_DLKM
################################################### ###################################################
################################################### ###################################################
ifeq ($(ENABLE_SECUREMSM_DLKM), true)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(SSG_SRC_FILES) LOCAL_SRC_FILES := $(SSG_SRC_FILES)
LOCAL_MODULE := qce50_dlkm.ko LOCAL_MODULE := qce50_dlkm.ko
@@ -111,16 +126,6 @@ LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
include $(DLKM_DIR)/Build_external_kernelmodule.mk include $(DLKM_DIR)/Build_external_kernelmodule.mk
################################################### ###################################################
################################################### ###################################################
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(SSG_SRC_FILES)
LOCAL_MODULE := qseecom_dlkm.ko
LOCAL_MODULE_KBUILD_NAME := qseecom_dlkm.ko
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_DEBUG_ENABLE := true
LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
include $(DLKM_DIR)/Build_external_kernelmodule.mk
###################################################
###################################################
ifeq ($(TARGET_USES_SMMU_PROXY), true) ifeq ($(TARGET_USES_SMMU_PROXY), true)
include $(CLEAR_VARS) include $(CLEAR_VARS)
#LOCAL_SRC_FILES := $(SSG_SRC_FILES) #LOCAL_SRC_FILES := $(SSG_SRC_FILES)

View File

@@ -75,6 +75,8 @@ ddk_headers(
load(":build/pineapple.bzl", "define_pineapple") load(":build/pineapple.bzl", "define_pineapple")
load(":build/blair.bzl", "define_blair") load(":build/blair.bzl", "define_blair")
load(":build/sun.bzl", "define_sun")
define_pineapple() define_pineapple()
define_blair() define_blair()
define_sun()

15
build/sun.bzl Normal file
View File

@@ -0,0 +1,15 @@
load(":securemsm_kernel.bzl", "define_consolidate_gki_modules")
def define_sun():
define_consolidate_gki_modules(
target = "sun",
modules = [
"smcinvoke_dlkm",
"tz_log_dlkm",
"qseecom_dlkm"
],
extra_options = [
"CONFIG_QCOM_SMCINVOKE",
"CONFIG_QSEECOM_COMPAT",
],
)

View File

@@ -109,3 +109,4 @@ def define_target_variant_modules(target, variant, modules, extra_options = [],
def define_consolidate_gki_modules(target, modules, extra_options = [], config_option = None): def define_consolidate_gki_modules(target, modules, extra_options = [], config_option = None):
define_target_variant_modules(target, "consolidate", modules, extra_options, config_option) define_target_variant_modules(target, "consolidate", modules, extra_options, config_option)
define_target_variant_modules(target, "gki", modules, extra_options, config_option) define_target_variant_modules(target, "gki", modules, extra_options, config_option)
define_target_variant_modules(target, "perf", modules, extra_options, config_option)