msm: camera: config: Makefile update to support GKI 2.0

Adds support for camera kernel driver source being moved to Vendor SI.

CRs-Fixed: 2835738
Change-Id: Ibb876edb1284bc77c366c3ef9e1ee9a39981c960
Signed-off-by: Karthik Jayakumar <kjayakum@codeaurora.org>
This commit is contained in:
Karthik Jayakumar
2020-08-20 13:48:44 -07:00
committed by Jigarkumar Zala
parent 0499b96da4
commit 8c2e1cab8f
43 changed files with 446 additions and 543 deletions

10
include/uapi/Android.mk Normal file
View File

@@ -0,0 +1,10 @@
# Standalone camera UAPI header android target
LOCAL_PATH := $(call my-dir)
# Path variable for other modules to include for compilation
LOCAL_EXPORT_CAMERA_UAPI_INCLUDE := $(LOCAL_PATH)/camera/
CAMERA_HEADERS := $(call all-subdir-named-files,*.h)
KERNEL_SCRIPTS := $(shell pwd)/kernel/msm-$(TARGET_KERNEL_VERSION)/scripts
include $(CLEAR_VARS)
LOCAL_MODULE := camera-uapi

View File

@@ -1,22 +0,0 @@
# SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note
# Legacy file used for kernel 4.19.x build system to install
# UAPI headers.
header-y += camera/media/cam_cpas.h
header-y += camera/media/cam_custom.h
header-y += camera/media/cam_defs.h
header-y += camera/media/cam_fd.h
header-y += camera/media/cam_icp.h
header-y += camera/media/cam_isp_ife.h
header-y += camera/media/cam_isp_vfe.h
header-y += camera/media/cam_isp.h
header-y += camera/media/cam_jpeg.h
header-y += camera/media/cam_lrme.h
header-y += camera/media/cam_req_mgr.h
header-y += camera/media/cam_sensor.h
header-y += camera/media/cam_sync.h
header-y += camera/media/cam_ope.h
header-y += camera/media/cam_isp_tfe.h
header-y += camera/media/cam_tfe.h
header-y += camera/media/cam_isp_sfe.h

View File

@@ -6,7 +6,7 @@
#ifndef __UAPI_CAM_CPAS_H__
#define __UAPI_CAM_CPAS_H__
#include <camera/media/cam_defs.h>
#include <media/cam_defs.h>
#define CAM_FAMILY_CAMERA_SS 1
#define CAM_FAMILY_CPAS_SS 2

View File

@@ -6,7 +6,7 @@
#ifndef __UAPI_CAM_CUSTOM_H__
#define __UAPI_CAM_CUSTOM_H__
#include <camera/media/cam_defs.h>
#include <media/cam_defs.h>
/* Custom driver name */
#define CAM_CUSTOM_DEV_NAME "cam-custom"

View File

@@ -6,7 +6,7 @@
#ifndef __UAPI_CAM_FD_H__
#define __UAPI_CAM_FD_H__
#include <camera/media/cam_defs.h>
#include <media/cam_defs.h>
#define CAM_FD_MAX_FACES 35
#define CAM_FD_RAW_RESULT_ENTRIES 512

View File

@@ -6,8 +6,8 @@
#ifndef __UAPI_CAM_ICP_H__
#define __UAPI_CAM_ICP_H__
#include <camera/media/cam_defs.h>
#include <camera/media/cam_cpas.h>
#include <media/cam_defs.h>
#include <media/cam_cpas.h>
/* icp, ipe, bps, cdm(ipe/bps) are used in querycap */
#define CAM_ICP_DEV_TYPE_A5 1

View File

@@ -6,11 +6,11 @@
#ifndef __UAPI_CAM_ISP_H__
#define __UAPI_CAM_ISP_H__
#include <camera/media/cam_defs.h>
#include <camera/media/cam_isp_vfe.h>
#include <camera/media/cam_isp_ife.h>
#include <camera/media/cam_isp_sfe.h>
#include <camera/media/cam_cpas.h>
#include <media/cam_defs.h>
#include <media/cam_isp_vfe.h>
#include <media/cam_isp_ife.h>
#include <media/cam_isp_sfe.h>
#include <media/cam_cpas.h>
/* ISP driver name */
#define CAM_ISP_DEV_NAME "cam-isp"

View File

@@ -6,7 +6,7 @@
#ifndef __UAPI_CAM_JPEG_H__
#define __UAPI_CAM_JPEG_H__
#include <camera/media/cam_defs.h>
#include <media/cam_defs.h>
/* enc, dma, cdm(enc/dma) are used in querycap */
#define CAM_JPEG_DEV_TYPE_ENC 0

View File

@@ -6,7 +6,7 @@
#ifndef __UAPI_CAM_LRME_H__
#define __UAPI_CAM_LRME_H__
#include <camera/media/cam_defs.h>
#include <media/cam_defs.h>
/* LRME Resource Types */

View File

@@ -6,8 +6,8 @@
#ifndef __UAPI_OPE_H__
#define __UAPI_OPE_H__
#include <camera/media/cam_defs.h>
#include <camera/media/cam_cpas.h>
#include <media/cam_defs.h>
#include <media/cam_cpas.h>
#define OPE_DEV_NAME_SIZE 128

View File

@@ -10,7 +10,7 @@
#include <linux/types.h>
#include <linux/ioctl.h>
#include <linux/media.h>
#include <camera/media/cam_defs.h>
#include <media/cam_defs.h>
#define CAM_REQ_MGR_VNODE_NAME "cam-req-mgr-devnode"

View File

@@ -8,7 +8,7 @@
#include <linux/types.h>
#include <linux/ioctl.h>
#include <camera/media/cam_defs.h>
#include <media/cam_defs.h>
#define CAM_SENSOR_PROBE_CMD (CAM_COMMON_OPCODE_MAX + 1)
#define CAM_FLASH_MAX_LED_TRIGGERS 2

View File

@@ -6,9 +6,9 @@
#ifndef __UAPI_CAM_TFE_H__
#define __UAPI_CAM_TFE_H__
#include <camera/media/cam_defs.h>
#include <camera/media/cam_isp_tfe.h>
#include <camera/media/cam_cpas.h>
#include <media/cam_defs.h>
#include <media/cam_isp_tfe.h>
#include <media/cam_cpas.h>
/* ISP TFE driver name */