Merge "securemsm-kernel: Disable crypto driver"

This commit is contained in:
qctecmdr
2022-11-02 16:08:35 -07:00
zatwierdzone przez Gerrit - the friendly Code Review server
4 zmienionych plików z 33 dodań i 36 usunięć

Wyświetl plik

@@ -58,34 +58,34 @@ LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
include $(DLKM_DIR)/Build_external_kernelmodule.mk include $(DLKM_DIR)/Build_external_kernelmodule.mk
################################################### ###################################################
################################################### ###################################################
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
LOCAL_MODULE_KBUILD_NAME := qce50_dlkm.ko #LOCAL_MODULE_KBUILD_NAME := qce50_dlkm.ko
LOCAL_MODULE_TAGS := optional #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) #include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(SSG_SRC_FILES) #LOCAL_SRC_FILES := $(SSG_SRC_FILES)
LOCAL_MODULE := qcedev-mod_dlkm.ko #LOCAL_MODULE := qcedev-mod_dlkm.ko
LOCAL_MODULE_KBUILD_NAME := qcedev-mod_dlkm.ko #LOCAL_MODULE_KBUILD_NAME := qcedev-mod_dlkm.ko
LOCAL_MODULE_TAGS := optional #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) #include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(SSG_SRC_FILES) #LOCAL_SRC_FILES := $(SSG_SRC_FILES)
LOCAL_MODULE := qcrypto-msm_dlkm.ko #LOCAL_MODULE := qcrypto-msm_dlkm.ko
LOCAL_MODULE_KBUILD_NAME := qcrypto-msm_dlkm.ko #LOCAL_MODULE_KBUILD_NAME := qcrypto-msm_dlkm.ko
LOCAL_MODULE_TAGS := optional #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) include $(CLEAR_VARS)

12
Kbuild
Wyświetl plik

@@ -24,14 +24,14 @@ smcinvoke_dlkm-objs := smcinvoke/smcinvoke_kernel.o smcinvoke/smcinvoke.o
obj-$(CONFIG_QTI_TZ_LOG) += tz_log_dlkm.o obj-$(CONFIG_QTI_TZ_LOG) += tz_log_dlkm.o
tz_log_dlkm-objs := tz_log/tz_log.o tz_log_dlkm-objs := tz_log/tz_log.o
obj-$(CONFIG_CRYPTO_DEV_QCEDEV) += qce50_dlkm.o #obj-$(CONFIG_CRYPTO_DEV_QCEDEV) += qce50_dlkm.o
qce50_dlkm-objs := crypto-qti/qce50.o #qce50_dlkm-objs := crypto-qti/qce50.o
obj-$(CONFIG_CRYPTO_DEV_QCEDEV) += qcedev-mod_dlkm.o #obj-$(CONFIG_CRYPTO_DEV_QCEDEV) += qcedev-mod_dlkm.o
qcedev-mod_dlkm-objs := crypto-qti/qcedev.o crypto-qti/qcedev_smmu.o crypto-qti/compat_qcedev.o #qcedev-mod_dlkm-objs := crypto-qti/qcedev.o crypto-qti/qcedev_smmu.o crypto-qti/compat_qcedev.o
obj-$(CONFIG_CRYPTO_DEV_QCRYPTO) += qcrypto-msm_dlkm.o #obj-$(CONFIG_CRYPTO_DEV_QCRYPTO) += qcrypto-msm_dlkm.o
qcrypto-msm_dlkm-objs := crypto-qti/qcrypto.o #qcrypto-msm_dlkm-objs := crypto-qti/qcrypto.o
obj-$(CONFIG_HDCP_QSEECOM) += hdcp_qseecom_dlkm.o obj-$(CONFIG_HDCP_QSEECOM) += hdcp_qseecom_dlkm.o
hdcp_qseecom_dlkm-objs := hdcp/hdcp_qseecom.o hdcp_qseecom_dlkm-objs := hdcp/hdcp_qseecom.o

Wyświetl plik

@@ -10,9 +10,9 @@ endif
ifeq ($(ENABLE_SECUREMSM_DLKM), true) ifeq ($(ENABLE_SECUREMSM_DLKM), true)
PRODUCT_PACKAGES += tz_log_dlkm.ko PRODUCT_PACKAGES += tz_log_dlkm.ko
PRODUCT_PACKAGES += qcedev-mod_dlkm.ko #PRODUCT_PACKAGES += qcedev-mod_dlkm.ko
PRODUCT_PACKAGES += qce50_dlkm.ko #PRODUCT_PACKAGES += qce50_dlkm.ko
PRODUCT_PACKAGES += qcrypto-msm_dlkm.ko #PRODUCT_PACKAGES += qcrypto-msm_dlkm.ko
PRODUCT_PACKAGES += hdcp_qseecom_dlkm.ko PRODUCT_PACKAGES += hdcp_qseecom_dlkm.ko
PRODUCT_PACKAGES += qrng_dlkm.ko PRODUCT_PACKAGES += qrng_dlkm.ko
PRODUCT_PACKAGES += smcinvoke_dlkm.ko PRODUCT_PACKAGES += smcinvoke_dlkm.ko

Wyświetl plik

@@ -11,9 +11,6 @@ endif
ifeq ($(ENABLE_SECUREMSM_DLKM), true) ifeq ($(ENABLE_SECUREMSM_DLKM), true)
BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/tz_log_dlkm.ko \ BOARD_VENDOR_KERNEL_MODULES += $(KERNEL_MODULES_OUT)/tz_log_dlkm.ko \
$(KERNEL_MODULES_OUT)/qcedev-mod_dlkm.ko \
$(KERNEL_MODULES_OUT)/qcrypto-msm_dlkm.ko \
$(KERNEL_MODULES_OUT)/qce50_dlkm.ko \
$(KERNEL_MODULES_OUT)/hdcp_qseecom_dlkm.ko \ $(KERNEL_MODULES_OUT)/hdcp_qseecom_dlkm.ko \
$(KERNEL_MODULES_OUT)/qrng_dlkm.ko \ $(KERNEL_MODULES_OUT)/qrng_dlkm.ko \