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

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

CRs-Fixed: 2560543
Change-Id: Iab571871e5171aab501c41496cc09e3c5d942985
Signed-off-by: Karthik Jayakumar <[email protected]>

drivers/Makefile

@@ -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_utils/
 obj-$(CONFIG_SPECTRA_CAMERA) += cam_core/

drivers/cam_cdm/Makefile

@@ -1,6 +1,5 @@
 # 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_utils
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include

drivers/cam_core/Makefile

@@ -1,6 +1,5 @@
 # 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_smmu/
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_sync

drivers/cam_cpas/Makefile

@@ -1,11 +1,8 @@
 # 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_core
 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)
 

drivers/cam_cpas/camss_top/Makefile

@@ -1,6 +1,5 @@
 # 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_core
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include

drivers/cam_cpas/cpas_top/Makefile

@@ -1,6 +1,5 @@
 # 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_core
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include

drivers/cam_cust/cam_custom_context.h

@@ -7,8 +7,9 @@
 #define _CAM_CUSTOM_CONTEXT_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_custom_hw_mgr_intf.h"

drivers/cam_cust/cam_custom_dev.c

@@ -12,7 +12,8 @@
 #include <linux/timer.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_hw_mgr_intf.h"
 #include "cam_custom_hw_mgr_intf.h"

drivers/cam_cust/cam_custom_hw_mgr/cam_custom_hw_mgr.c

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

drivers/cam_cust/cam_custom_hw_mgr/cam_custom_hw_mgr.h

@@ -12,8 +12,9 @@
 #include "cam_ife_csid_hw_intf.h"
 #include "cam_isp_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 {
 	CAM_CUSTOM_HW_SUB_MODULE,

drivers/cam_cust/cam_custom_hw_mgr/include/cam_custom_hw.h

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

drivers/cam_cust/cam_custom_hw_mgr/include/cam_custom_hw_mgr_intf.h

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

drivers/cam_fd/Makefile

@@ -1,6 +1,5 @@
 # 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_req_mgr
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core

drivers/cam_fd/fd_hw_mgr/Makefile

@@ -1,6 +1,5 @@
 # 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_req_mgr
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core

drivers/cam_icp/Makefile

@@ -1,6 +1,5 @@
 # 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_req_mgr
 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/icp_hw_mgr
 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_smmu/
 

drivers/cam_icp/icp_hw/Makefile

@@ -1,6 +1,5 @@
 # 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_req_mgr
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core

drivers/cam_isp/Makefile

@@ -1,6 +1,5 @@
 # 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_isp/isp_hw_mgr/include
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr

drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c

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

drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_core.c

@@ -5,8 +5,9 @@
 
 #include <linux/iopoll.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>
 

drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/cam_vfe_bus_rd_ver1.c

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

drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/cam_vfe_bus_ver3.c

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

drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/include/cam_vfe_bus.h

@@ -6,7 +6,8 @@
 #ifndef _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_isp_hw.h"
 

drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_top/cam_vfe_fe_ver1.c

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

drivers/cam_jpeg/Makefile

@@ -1,6 +1,5 @@
 # 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_utils
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_sync

drivers/cam_lrme/Makefile

@@ -1,6 +1,5 @@
 # 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_utils
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_sync

drivers/cam_lrme/lrme_hw_mgr/Makefile

@@ -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/lrme_hw_mgr
 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
 
 obj-$(CONFIG_SPECTRA_CAMERA) += lrme_hw/

drivers/cam_lrme/lrme_hw_mgr/lrme_hw/Makefile

@@ -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/lrme_hw_mgr
 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
 
 obj-$(CONFIG_SPECTRA_CAMERA) += cam_lrme_hw_dev.o cam_lrme_hw_core.o cam_lrme_hw_soc.o

drivers/cam_req_mgr/Makefile

@@ -1,6 +1,5 @@
 # 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_smmu/
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_utils

drivers/cam_sensor_module/cam_actuator/Makefile

@@ -1,6 +1,5 @@
 # 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_cpas/include
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_core

drivers/cam_sensor_module/cam_cci/Makefile

@@ -1,6 +1,5 @@
 # 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_utils
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_cpas/include

drivers/cam_sensor_module/cam_csiphy/Makefile

@@ -1,6 +1,5 @@
 # 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_cpas/include
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_sensor_module/cam_sensor_io

drivers/cam_sensor_module/cam_eeprom/Makefile

@@ -1,6 +1,5 @@
 # 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_cpas/include
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_sensor_module/cam_sensor_io

drivers/cam_sensor_module/cam_flash/Makefile

@@ -1,7 +1,5 @@
 # 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_cpas/include
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr

drivers/cam_sensor_module/cam_ois/Makefile

@@ -1,6 +1,5 @@
 # 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_cpas/include
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_sensor_module/cam_sensor_io

drivers/cam_sensor_module/cam_res_mgr/Makefile

@@ -1,6 +1,5 @@
 # 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_cpas/include
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr

drivers/cam_sensor_module/cam_sensor/Makefile

@@ -1,6 +1,5 @@
 # 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_cpas/include
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_req_mgr

drivers/cam_sensor_module/cam_sensor_io/Makefile

@@ -1,6 +1,5 @@
 # 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_cpas/include
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_sensor_module/cam_sensor_utils

drivers/cam_sensor_module/cam_sensor_utils/Makefile

@@ -1,6 +1,5 @@
 # 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_utils
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_sensor_module/cam_sensor_io

drivers/cam_smmu/Makefile

@@ -1,6 +1,5 @@
 # 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_req_mgr
 

drivers/cam_sync/Makefile

@@ -1,6 +1,5 @@
 # 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-$(CONFIG_MSM_GLOBAL_SYNX) += -I$(srctree)/drivers/media/platform/msm/synx
 ccflags-y += -I$(src)

drivers/cam_utils/Makefile

@@ -1,6 +1,5 @@
 # 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_req_mgr/
 ccflags-y += -I$(srctree)/techpack/camera/drivers/cam_smmu/

drivers/cam_utils/cam_soc_util.h

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

include/uapi/Kbuild

@@ -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