samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

msm: camera: config: Makefile fixes to support legacy kernel build system

Browse Source 
Adds fixes to makefile in order to support legacy kernel build systems.

CRs-Fixed: 2560543
Change-Id: Iab571871e5171aab501c41496cc09e3c5d942985
Signed-off-by: Karthik Jayakumar <kjayakum@codeaurora.org>
This commit is contained in:
Karthik Jayakumar
2019-11-05 16:53:31 -08:00
parent 8d6ec3bf3c
commit 524b1ab1d4
43 changed files with 54 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/Makefile
View File

@@ -1,3 +1,5 @@
subdir-ccflags-y += -I$(srctree)/techpack/camera/include/uapi/camera
obj-$(CONFIG_SPECTRA_CAMERA) += cam_req_mgr/ obj-$(CONFIG_SPECTRA_CAMERA) += cam_req_mgr/
obj-$(CONFIG_SPECTRA_CAMERA) += cam_utils/ obj-$(CONFIG_SPECTRA_CAMERA) += cam_utils/
obj-$(CONFIG_SPECTRA_CAMERA) += cam_core/ obj-$(CONFIG_SPECTRA_CAMERA) += cam_core/

1
drivers/cam_cdm/Makefile
View File

@@ -1,6 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
ccflags-y += -I$(srctree)/techpack/camera/include/uapi
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_smmu ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_smmu
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include

1
drivers/cam_core/Makefile
View File

@@ -1,6 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
ccflags-y += -I$(srctree)/techpack/camera/include/uapi
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_smmu/ ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_smmu/
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_sync ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_sync

3
drivers/cam_cpas/Makefile
View File

@@ -1,11 +1,8 @@
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
ccflags-y += -I$(srctree)/techpack/camera/include/uapi
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include
#ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/cpas_top
#ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/camss_top
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils
ccflags-y += -I$(srctree) ccflags-y += -I$(srctree)

1
drivers/cam_cpas/camss_top/Makefile
View File

@@ -1,6 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
ccflags-y += -I$(srctree)/techpack/camera/include/uapi
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include

1
drivers/cam_cpas/cpas_top/Makefile
View File

@@ -1,6 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
ccflags-y += -I$(srctree)/techpack/camera/include/uapi
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include

5
drivers/cam_cust/cam_custom_context.h
View File

@@ -7,8 +7,9 @@
#define _CAM_CUSTOM_CONTEXT_H_ #define _CAM_CUSTOM_CONTEXT_H_
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <uapi/media/cam_custom.h>
#include <uapi/media/cam_defs.h> #include <media/cam_custom.h>
#include <media/cam_defs.h>
#include "cam_context.h" #include "cam_context.h"
#include "cam_custom_hw_mgr_intf.h" #include "cam_custom_hw_mgr_intf.h"

3
drivers/cam_cust/cam_custom_dev.c
View File

@@ -12,7 +12,8 @@
#include <linux/timer.h> #include <linux/timer.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <uapi/media/cam_req_mgr.h> #include <media/cam_req_mgr.h>
#include "cam_custom_dev.h" #include "cam_custom_dev.h"
#include "cam_hw_mgr_intf.h" #include "cam_hw_mgr_intf.h"
#include "cam_custom_hw_mgr_intf.h" #include "cam_custom_hw_mgr_intf.h"

4
drivers/cam_cust/cam_custom_hw_mgr/cam_custom_hw_mgr.c
View File

@@ -7,9 +7,11 @@
#include <linux/string.h> #include <linux/string.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <linux/debugfs.h> #include <linux/debugfs.h>
#include <soc/qcom/scm.h> #include <soc/qcom/scm.h>
#include <uapi/media/cam_custom.h> #include <media/cam_custom.h>
#include <media/cam_sync.h> #include <media/cam_sync.h>
#include "cam_sync_api.h" #include "cam_sync_api.h"
#include "cam_smmu_api.h" #include "cam_smmu_api.h"
#include "cam_req_mgr_workq.h" #include "cam_req_mgr_workq.h"

5
drivers/cam_cust/cam_custom_hw_mgr/cam_custom_hw_mgr.h
View File

@@ -12,8 +12,9 @@
#include "cam_ife_csid_hw_intf.h" #include "cam_ife_csid_hw_intf.h"
#include "cam_isp_hw.h" #include "cam_isp_hw.h"
#include "cam_custom_hw.h" #include "cam_custom_hw.h"
#include <uapi/media/cam_defs.h>
#include <uapi/media/cam_custom.h> #include <media/cam_defs.h>
#include <media/cam_custom.h>
enum cam_custom_hw_mgr_res_type { enum cam_custom_hw_mgr_res_type {
CAM_CUSTOM_HW_SUB_MODULE, CAM_CUSTOM_HW_SUB_MODULE,

3
drivers/cam_cust/cam_custom_hw_mgr/include/cam_custom_hw.h
View File

@@ -9,7 +9,8 @@
#include <linux/of.h> #include <linux/of.h>
#include <linux/time.h> #include <linux/time.h>
#include <linux/list.h> #include <linux/list.h>
#include <uapi/media/cam_custom.h>
#include <media/cam_custom.h>
enum cam_custom_hw_resource_state { enum cam_custom_hw_resource_state {
CAM_CUSTOM_HW_RESOURCE_STATE_UNAVAILABLE = 0, CAM_CUSTOM_HW_RESOURCE_STATE_UNAVAILABLE = 0,

4
drivers/cam_cust/cam_custom_hw_mgr/include/cam_custom_hw_mgr_intf.h
View File

@@ -9,7 +9,9 @@
#include <linux/of.h> #include <linux/of.h>
#include <linux/time.h> #include <linux/time.h>
#include <linux/list.h> #include <linux/list.h>
#include <uapi/media/cam_custom.h>
#include <media/cam_custom.h>
#include "cam_hw.h" #include "cam_hw.h"
#include "cam_hw_mgr_intf.h" #include "cam_hw_mgr_intf.h"
#include "cam_hw_intf.h" #include "cam_hw_intf.h"

1
drivers/cam_fd/Makefile
View File

@@ -1,6 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
ccflags-y += -I$(srctree)/techpack/camera/include/uapi
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core

1
drivers/cam_fd/fd_hw_mgr/Makefile
View File

@@ -1,6 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
ccflags-y += -I$(srctree)/techpack/camera/include/uapi
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core

2
drivers/cam_icp/Makefile
View File

@@ -1,6 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
ccflags-y += -I$(srctree)/techpack/camera/include/uapi
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core
@@ -9,7 +8,6 @@ ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_icp
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_icp/icp_hw/include ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_icp/icp_hw/include
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_icp/icp_hw/icp_hw_mgr ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_icp/icp_hw/icp_hw_mgr
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_icp/fw_inc ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_icp/fw_inc
ccflags-y += -I$(srctree)/techpack/camera
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_smmu/ ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_smmu/

1
drivers/cam_icp/icp_hw/Makefile
View File

@@ -1,6 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
ccflags-y += -I$(srctree)/techpack/camera/include/uapi
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core

1
drivers/cam_isp/Makefile
View File

@@ -1,6 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
ccflags-y += -I$(srctree)/techpack/camera/include/uapi
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_isp/isp_hw_mgr/include ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_isp/isp_hw_mgr/include
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr

4
drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c
View File

@@ -7,8 +7,10 @@
#include <linux/string.h> #include <linux/string.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <linux/debugfs.h> #include <linux/debugfs.h>
#include <soc/qcom/scm.h> #include <soc/qcom/scm.h>
#include <uapi/media/cam_isp.h> #include <media/cam_isp.h>
#include "cam_smmu_api.h" #include "cam_smmu_api.h"
#include "cam_req_mgr_workq.h" #include "cam_req_mgr_workq.h"
#include "cam_isp_hw_mgr_intf.h" #include "cam_isp_hw_mgr_intf.h"

5
drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_core.c
View File

@@ -5,8 +5,9 @@
#include <linux/iopoll.h> #include <linux/iopoll.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <uapi/media/cam_isp.h>
#include <uapi/media/cam_defs.h> #include <media/cam_isp.h>
#include <media/cam_defs.h>
#include <dt-bindings/msm/msm-camera.h> #include <dt-bindings/msm/msm-camera.h>

4
drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/cam_vfe_bus_rd_ver1.c
View File

@@ -5,7 +5,9 @@
#include <linux/ratelimit.h> #include <linux/ratelimit.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <uapi/media/cam_isp.h>
#include <media/cam_isp.h>
#include "cam_io_util.h" #include "cam_io_util.h"
#include "cam_debug_util.h" #include "cam_debug_util.h"
#include "cam_cdm_util.h" #include "cam_cdm_util.h"

4
drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/cam_vfe_bus_ver3.c
View File

@@ -6,7 +6,9 @@
#include <linux/ratelimit.h> #include <linux/ratelimit.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <uapi/media/cam_isp.h>
#include <media/cam_isp.h>
#include "cam_io_util.h" #include "cam_io_util.h"
#include "cam_debug_util.h" #include "cam_debug_util.h"
#include "cam_cdm_util.h" #include "cam_cdm_util.h"

3
drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/include/cam_vfe_bus.h
View File

@@ -6,7 +6,8 @@
#ifndef _CAM_VFE_BUS_H_ #ifndef _CAM_VFE_BUS_H_
#define _CAM_VFE_BUS_H_ #define _CAM_VFE_BUS_H_
#include <uapi/media/cam_isp.h> #include <media/cam_isp.h>
#include "cam_hw_intf.h" #include "cam_hw_intf.h"
#include "cam_isp_hw.h" #include "cam_isp_hw.h"

4
drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_top/cam_vfe_fe_ver1.c
View File

@@ -4,7 +4,9 @@
*/ */
#include <linux/slab.h> #include <linux/slab.h>
#include <uapi/media/cam_isp.h>
#include <media/cam_isp.h>
#include "cam_io_util.h" #include "cam_io_util.h"
#include "cam_isp_hw_mgr_intf.h" #include "cam_isp_hw_mgr_intf.h"
#include "cam_isp_hw.h" #include "cam_isp_hw.h"

1
drivers/cam_jpeg/Makefile
View File

@@ -1,6 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
ccflags-y += -I$(srctree)/techpack/camera/include/uapi
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_sync ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_sync

1
drivers/cam_lrme/Makefile
View File

@@ -1,6 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
ccflags-y += -I$(srctree)/techpack/camera/include/uapi
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_sync ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_sync

1
drivers/cam_lrme/lrme_hw_mgr/Makefile
View File

@@ -9,7 +9,6 @@ ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cdm
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_lrme ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_lrme
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_lrme/lrme_hw_mgr ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_lrme/lrme_hw_mgr
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_lrme/lrme_hw_mgr/lrme_hw ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_lrme/lrme_hw_mgr/lrme_hw
ccflags-y += -I$(srctree)/techpack/camera
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include
obj-$(CONFIG_SPECTRA_CAMERA) += lrme_hw/ obj-$(CONFIG_SPECTRA_CAMERA) += lrme_hw/

1
drivers/cam_lrme/lrme_hw_mgr/lrme_hw/Makefile
View File

@@ -9,7 +9,6 @@ ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cdm
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_lrme ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_lrme
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_lrme/lrme_hw_mgr ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_lrme/lrme_hw_mgr
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_lrme/lrme_hw_mgr/lrme_hw ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_lrme/lrme_hw_mgr/lrme_hw
ccflags-y += -I$(srctree)/techpack/camera0
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include
obj-$(CONFIG_SPECTRA_CAMERA) += cam_lrme_hw_dev.o cam_lrme_hw_core.o cam_lrme_hw_soc.o obj-$(CONFIG_SPECTRA_CAMERA) += cam_lrme_hw_dev.o cam_lrme_hw_core.o cam_lrme_hw_soc.o

1
drivers/cam_req_mgr/Makefile
View File

@@ -1,6 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
ccflags-y += -I$(srctree)/techpack/camera/include/uapi
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_smmu/ ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_smmu/
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils

1
drivers/cam_sensor_module/cam_actuator/Makefile
View File

@@ -1,6 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
ccflags-y += -I$(srctree)/techpack/camera/include/uapi
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core

1
drivers/cam_sensor_module/cam_cci/Makefile
View File

@@ -1,6 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
ccflags-y += -I$(srctree)/techpack/camera/include/uapi
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr/ ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr/
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include

1
drivers/cam_sensor_module/cam_csiphy/Makefile
View File

@@ -1,6 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
ccflags-y += -I$(srctree)/techpack/camera/include/uapi
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_sensor_module/cam_sensor_io ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_sensor_module/cam_sensor_io

1
drivers/cam_sensor_module/cam_eeprom/Makefile
View File

@@ -1,6 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
ccflags-y += -I$(srctree)/techpack/camera/include/uapi
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_sensor_module/cam_sensor_io ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_sensor_module/cam_sensor_io

2
drivers/cam_sensor_module/cam_flash/Makefile
View File

@@ -1,7 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
ccflags-y += -I$(srctree)/techpack/camera/include/uapi
ccflags-y += -I$(srctree)/techpack/camera/include/uapi
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr

1
drivers/cam_sensor_module/cam_ois/Makefile
View File

@@ -1,6 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
ccflags-y += -I$(srctree)/techpack/camera/include/uapi
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_sensor_module/cam_sensor_io ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_sensor_module/cam_sensor_io

1
drivers/cam_sensor_module/cam_res_mgr/Makefile
View File

@@ -1,6 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
#ccflags-y += -I$(srctree)/techpack/camera/include/uapi
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr

1
drivers/cam_sensor_module/cam_sensor/Makefile
View File

@@ -1,6 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
ccflags-y += -I$(srctree)/techpack/camera/include/uapi
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr

1
drivers/cam_sensor_module/cam_sensor_io/Makefile
View File

@@ -1,6 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
ccflags-y += -I$(srctree)/techpack/camera/include/uapi
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_sensor_module/cam_sensor_utils ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_sensor_module/cam_sensor_utils

1
drivers/cam_sensor_module/cam_sensor_utils/Makefile
View File

@@ -1,6 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
ccflags-y += -I$(srctree)/techpack/camera/include/uapi
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_sensor_module/cam_sensor_io ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_sensor_module/cam_sensor_io

1
drivers/cam_smmu/Makefile
View File

@@ -1,6 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
ccflags-y += -I$(srctree)/techpack/camera/include/uapi
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr

1
drivers/cam_sync/Makefile
View File

@@ -1,6 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
ccflags-y += -I$(srctree)/techpack/camera/include/uapi
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils
ccflags-$(CONFIG_MSM_GLOBAL_SYNX) += -I$(srctree)/drivers/media/platform/msm/synx ccflags-$(CONFIG_MSM_GLOBAL_SYNX) += -I$(srctree)/drivers/media/platform/msm/synx
ccflags-y += -I$(src) ccflags-y += -I$(src)

1
drivers/cam_utils/Makefile
View File

@@ -1,6 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
ccflags-y += -I$(srctree)/techpack/camera/include/uapi
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core/ ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core/
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr/ ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr/
ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_smmu/ ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_smmu/

2
drivers/cam_utils/cam_soc_util.h
View File

@@ -18,7 +18,7 @@
#include <linux/of_fdt.h> #include <linux/of_fdt.h>
#include "cam_io_util.h" #include "cam_io_util.h"
#include <uapi/media/cam_defs.h> #include <media/cam_defs.h>
#define NO_SET_RATE -1 #define NO_SET_RATE -1
#define INIT_RATE -2 #define INIT_RATE -2

18
include/uapi/Kbuild Normal file
View File

@@ -0,0 +1,18 @@
# 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