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

msm: camera: common: Add msm-mmrm dependency to camera-kernel

Browse Source 
Updates board list of supported msm-mmrm boards to include kalama.

CRs-Fixed: 2980570
Change-Id: I182ef8b56b67c24d1ad9c4b23f475782f93e8aed
Signed-off-by: Karthik Jayakumar <quic_kjayakum@quicinc.com>
This commit is contained in:
Karthik Jayakumar
2022-01-14 12:34:25 -08:00
committed by Camera Software Integration
parent 5fafa34efe
commit c115c89179
2 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Android.mk
View File

@@ -4,6 +4,8 @@ ifeq ($(call is-board-platform-in-list, $(TARGET_BOARD_PLATFORM)),true)
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)
# Path to DLKM make scripts # Path to DLKM make scripts
DLKM_DIR := $(TOP)/device/qcom/common/dlkm DLKM_DIR := $(TOP)/device/qcom/common/dlkm
# List of board platforms for which MMRM driver API should be enabled
MMRM_BOARDS := taro parrot kalama
# Kbuild options # Kbuild options
KBUILD_OPTIONS := CAMERA_KERNEL_ROOT=$(shell pwd)/$(LOCAL_PATH) KBUILD_OPTIONS := CAMERA_KERNEL_ROOT=$(shell pwd)/$(LOCAL_PATH)
@@ -11,14 +13,6 @@ KBUILD_OPTIONS += KERNEL_ROOT=$(shell pwd)/kernel/msm-$(TARGET_KERNEL_VERSION)/
KBUILD_OPTIONS += MODNAME=camera KBUILD_OPTIONS += MODNAME=camera
KBUILD_OPTIONS += BOARD_PLATFORM=$(TARGET_BOARD_PLATFORM) KBUILD_OPTIONS += BOARD_PLATFORM=$(TARGET_BOARD_PLATFORM)
ifeq ($(TARGET_BOARD_PLATFORM), taro)
KBUILD_OPTIONS += KBUILD_EXTRA_SYMBOLS=$(shell pwd)/$(call intermediates-dir-for,DLKM,mmrm-module-symvers)/Module.symvers
endif
ifeq ($(TARGET_BOARD_PLATFORM), parrot)
KBUILD_OPTIONS += KBUILD_EXTRA_SYMBOLS=$(shell pwd)/$(call intermediates-dir-for,DLKM,mmrm-module-symvers)/Module.symvers
endif
# Clear shell environment variables from previous android module during build # Clear shell environment variables from previous android module during build
include $(CLEAR_VARS) include $(CLEAR_VARS)
# For incremental compilation support. # For incremental compilation support.
@@ -37,14 +31,11 @@ LOCAL_MODULE_TAGS := optional
#LOCAL_MODULE_KBUILD_NAME := camera.ko #LOCAL_MODULE_KBUILD_NAME := camera.ko
#LOCAL_MODULE_DEBUG_ENABLE := true #LOCAL_MODULE_DEBUG_ENABLE := true
ifeq ($(TARGET_BOARD_PLATFORM), taro) ifeq ($(call is-board-platform-in-list, $(MMRM_BOARDS)),true)
LOCAL_REQUIRED_MODULES := mmrm-module-symvers $(warning camera-kernel: Adding msm-mmrm dependency!)
LOCAL_ADDITIONAL_DEPENDENCIES := $(call intermediates-dir-for,DLKM,mmrm-module-symvers)/Module.symvers KBUILD_OPTIONS += KBUILD_EXTRA_SYMBOLS=$(shell pwd)/$(call intermediates-dir-for,DLKM,mmrm-module-symvers)/Module.symvers
endif LOCAL_REQUIRED_MODULES := mmrm-module-symvers
LOCAL_ADDITIONAL_DEPENDENCIES := $(call intermediates-dir-for,DLKM,mmrm-module-symvers)/Module.symvers
ifeq ($(TARGET_BOARD_PLATFORM), parrot)
LOCAL_REQUIRED_MODULES := mmrm-module-symvers
LOCAL_ADDITIONAL_DEPENDENCIES := $(call intermediates-dir-for,DLKM,mmrm-module-symvers)/Module.symvers
endif endif
ifeq ($(TARGET_BOARD_PLATFORM), lahaina) ifeq ($(TARGET_BOARD_PLATFORM), lahaina)

1
config/kalama.mk
View File

@@ -15,6 +15,7 @@ ccflags-y += -DCONFIG_SPECTRA_CUSTOM=1
ccflags-y += -DCONFIG_SPECTRA_SENSOR=1 ccflags-y += -DCONFIG_SPECTRA_SENSOR=1
# External Dependencies # External Dependencies
KBUILD_CPPFLAGS += -DCONFIG_MSM_MMRM=1
ifeq ($(CONFIG_QCOM_VA_MINIDUMP), y) ifeq ($(CONFIG_QCOM_VA_MINIDUMP), y)
KBUILD_CPPFLAGS += -DCONFIG_QCOM_VA_MINIDUMP=1 KBUILD_CPPFLAGS += -DCONFIG_QCOM_VA_MINIDUMP=1
endif endif