Selaa lähdekoodia

msm: camera: common: Enable secure camera on Bazel build

Add the required Kconfig option for secure camera to work
on the targets with Domain ID support.

CRs-Fixed: 3535645
Change-Id: I74d3fc6b2b6f1d4d5fdf9d8f2d32f369d2f0467b
Signed-off-by: Vijay Kumar Tumati <[email protected]>
Vijay Kumar Tumati 1 vuosi sitten
vanhempi
sitoutus
aae436e4a1
5 muutettua tiedostoa jossa 17 lisäystä ja 6 poistoa
  1. 13 5
      Kconfig
  2. 1 1
      camera_modules.bzl
  3. 1 0
      config/pineapple.mk
  4. 1 0
      pineapple_consolidate_defconfig
  5. 1 0
      pineapple_gki_defconfig

+ 13 - 5
Kconfig

@@ -1,5 +1,5 @@
 config SPECTRA_ISP
-	bool "enable camera ISP modele"
+	bool "enable camera ISP module"
 	help
 	  This is enabling camera ISP module.
 	  IFE camera driver file be included.
@@ -7,7 +7,7 @@ config SPECTRA_ISP
 	  Core camera driver to handle VFE HW.
 
 config SPECTRA_ICP
-	bool "enable camera ICP modele"
+	bool "enable camera ICP module"
 	help
 	  This is enabling camera ICP module.
 	  Camera ICP driver file be included.
@@ -15,7 +15,7 @@ config SPECTRA_ICP
 	  ICP FW. Which can control IPE and BPS HW.
 
 config SPECTRA_JPEG
-	bool "enable camera jpeg modele"
+	bool "enable camera jpeg module"
 	help
 	  This is enabling camera JPEG module.
 	  camera jpeg module will be functional.
@@ -23,7 +23,7 @@ config SPECTRA_JPEG
 	  snapshot processing.
 
 config SPECTRA_SENSOR
-	bool "enable camera sensor modele"
+	bool "enable camera sensor module"
 	help
 	  This is enabling camera sensor module.
 	  sensor module files will be included to enable the driver.
@@ -76,4 +76,12 @@ config INTERCONNECT_QCOM
 		This is to access icc driver api.
 		To cache AB and IB vote will
 		use ICC kernel driver API.
-		So that ICC driver can consolidate the vote
+		So that ICC driver can consolidate the vote
+
+config DOMAIN_ID_SECURE_CAMERA
+	bool "enable domain ID based secure camera flow"
+	help
+		This is to enable domain ID based secure
+		camera flow on the hardware platforms with
+		domain ID based security architecture.
+		VC based security can be achieved with this.

+ 1 - 1
camera_modules.bzl

@@ -12,7 +12,7 @@ def _define_module(target, variant):
         deps.extend([
             "//vendor/qcom/opensource/synx-kernel:synx_headers",
             "//vendor/qcom/opensource/synx-kernel:{}_modules".format(tv),
-            "//vendor/qcom/opensource/securemsm-kernel:qseecom_kernel_headers",
+            "//vendor/qcom/opensource/securemsm-kernel:smcinvoke_kernel_headers",
             "//vendor/qcom/opensource/securemsm-kernel:smmu_proxy_headers",
             "//vendor/qcom/opensource/securemsm-kernel:{}_smcinvoke_dlkm".format(tv),
             "//vendor/qcom/opensource/securemsm-kernel:{}_smmu_proxy_dlkm".format(tv),

+ 1 - 0
config/pineapple.mk

@@ -8,6 +8,7 @@ CONFIG_SPECTRA_SENSOR := y
 CONFIG_SPECTRA_LLCC_STALING := y
 CONFIG_SPECTRA_USE_RPMH_DRV_API := y
 CONFIG_SPECTRA_USE_CLK_CRM_API := y
+CONFIG_DOMAIN_ID_SECURE_CAMERA := y
 
 # Flags to pass into C preprocessor
 ccflags-y += -DCONFIG_SPECTRA_ISP=1

+ 1 - 0
pineapple_consolidate_defconfig

@@ -8,3 +8,4 @@ CONFIG_SPECTRA_LLCC_STALING=y
 CONFIG_TARGET_SYNX_ENABLE=y
 CONFIG_MSM_MMRM=y
 CONFIG_INTERCONNECT_QCOM=y
+CONFIG_DOMAIN_ID_SECURE_CAMERA=y

+ 1 - 0
pineapple_gki_defconfig

@@ -8,3 +8,4 @@ CONFIG_SPECTRA_LLCC_STALING=y
 CONFIG_TARGET_SYNX_ENABLE=y
 CONFIG_MSM_MMRM=y
 CONFIG_INTERCONNECT_QCOM=y
+CONFIG_DOMAIN_ID_SECURE_CAMERA=y