From 19985adeb39e3395eec1d60728c3df253d0fdce2 Mon Sep 17 00:00:00 2001 From: liuwang2 Date: Mon, 13 Jul 2020 16:09:39 +0800 Subject: [PATCH] cci: modify cci_intf driver to support kernel 5.4 [detail] add kernel 5.4 path in Kbuild. Change-Id: I16a01fee110770040e442031a0995ccfbae56fe7 Signed-off-by: liuwang2 Reviewed-on: https://gerrit.mot.com/1679108 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Dawei Wang Reviewed-by: Shanghui Zhang Reviewed-by: Zhenxin Xi Submit-Approved: Jira Key --- .../msm/camera/cam_sensor_module/cam_cci/Kbuild | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/drivers/media/platform/msm/camera/cam_sensor_module/cam_cci/Kbuild b/drivers/media/platform/msm/camera/cam_sensor_module/cam_cci/Kbuild index cf0f7f2a4c7b..0be27cdfd1af 100644 --- a/drivers/media/platform/msm/camera/cam_sensor_module/cam_cci/Kbuild +++ b/drivers/media/platform/msm/camera/cam_sensor_module/cam_cci/Kbuild @@ -1,24 +1,29 @@ -HAVE_KERNEL_419 = $(shell test -d $(TOP)/kernel/msm-4.19 && echo 1) +HAVE_KERNEL_4_19 = $(shell test -d $(ANDROID_BUILD_TOP)/kernel/msm-4.19 && echo 1) -ifeq ($(HAVE_KERNEL_419),1) +HAVE_KERNEL_5_4 = $(shell test -d $(ANDROID_BUILD_TOP)/kernel/msm-5.4 && echo 1) + +ifeq ($(HAVE_KERNEL_4_19),1) KERNEL_SOURCE_PATH ?= kernel/msm-4.19 +else ifeq ($(HAVE_KERNEL_5_4),1) + KERNEL_SOURCE_PATH ?= kernel/msm-5.4 else KERNEL_SOURCE_PATH ?= kernel/msm-4.9 endif -HAVE_TECHPACK_CAMERA = $(shell test -d $(TOP)/$(KERNEL_SOURCE_PATH)/techpack/camera && echo 1) +HAVE_TECHPACK_CAMERA = $(shell test -d $(ANDROID_BUILD_TOP)/$(KERNEL_SOURCE_PATH)/techpack/camera && echo 1) ifeq ($(HAVE_TECHPACK_CAMERA),1) - KERNEL_CAMERA_DRIVER_PATH ?= $(TOP)/$(KERNEL_SOURCE_PATH)/techpack/camera/drivers + KERNEL_CAMERA_DRIVER_PATH ?= $(ANDROID_BUILD_TOP)/$(KERNEL_SOURCE_PATH)/techpack/camera/drivers EXTRA_CFLAGS += -DCONFIG_SPECTRA_CAMERA=1 EXTRA_CFLAGS += -I$(KERNEL_CAMERA_DRIVER_PATH)/../include EXTRA_CFLAGS += -I$(KERNEL_CAMERA_DRIVER_PATH)/../include/uapi + EXTRA_CFLAGS += -I$(KERNEL_CAMERA_DRIVER_PATH)/../include/uapi/camera else - KERNEL_CAMERA_DRIVER_PATH ?= $(TOP)/$(KERNEL_SOURCE_PATH)/drivers/media/platform/msm/camera + KERNEL_CAMERA_DRIVER_PATH ?= $(ANDROID_BUILD_TOP)/$(KERNEL_SOURCE_PATH)/drivers/media/platform/msm/camera endif EXTRA_CFLAGS += -Wall -EXTRA_CFLAGS += -I$(TOP)/motorola/kernel/modules/include +EXTRA_CFLAGS += -I$(ANDROID_BUILD_TOP)/motorola/kernel/modules/include EXTRA_CFLAGS += -I$(KERNEL_CAMERA_DRIVER_PATH)/cam_utils EXTRA_CFLAGS += -I$(KERNEL_CAMERA_DRIVER_PATH)/cam_cpas/include EXTRA_CFLAGS += -I$(KERNEL_CAMERA_DRIVER_PATH)/cam_sensor_module/cam_sensor_io