Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 20e8f7bf authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: kconfig: Add support for face detection driver"

parents a66f808c 08f68d61

drivers/media/platform/msm/camera_v2/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -249,3 +249,9 @@ config MSM_GEMINI 
	depends on MSMB_CAMERA && (ARCH_MSM7X30 || ARCH_MSM8X60 || ARCH_MSM8960)

	---help---

	  Enables support for the Gemini JPEG encoder engine for 8x60.



config MSM_FD

	 tristate "Qualcomm MSM FD face detection engine support"

	 depends on MSMB_CAMERA

	 ---help---

	    Enables support for the MSM FD face detection engine.

drivers/media/platform/msm/camera_v2/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ ccflags-y += -Idrivers/media/platform/msm/camera_v2/pproc 
ccflags-y += -Idrivers/media/platform/msm/camera_v2/msm_vb2

ccflags-y += -Idrivers/media/platform/msm/camera_v2/camera

ccflags-y += -Idrivers/media/platform/msm/camera_v2/jpeg_10

ccflags-y += -Idrivers/media/platform/msm/camera_v2/fd



obj-$(CONFIG_MSMB_CAMERA) += msm.o

obj-$(CONFIG_MSMB_CAMERA) += camera/
@@ -16,3 +17,4 @@ obj-$(CONFIG_MSMB_CAMERA) += isp/ 
obj-$(CONFIG_MSMB_CAMERA) += ispif/

obj-$(CONFIG_MSMB_JPEG) += jpeg_10/

obj-$(CONFIG_MSMB_CAMERA) += msm_buf_mgr/

obj-$(CONFIG_MSM_FD) += fd/

include/uapi/media/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -17,3 +17,4 @@ header-y += msmb_ispif.h 
header-y += msmb_generic_buf_mgr.h

header-y += msmb_pproc.h

header-y += msm_vpu.h

header-y += msm_fd.h