1
0

msm: camera: common: Update Makefiles to remove SFE config

SFE config is not needed since it shares the same code paths as VFE.
As such we deprecate the config and enable SFE whenever ISP is enabled.

CRs-Fixed: 2835738
Change-Id: I5e6b44345e9eaabdb3a91d3662322f3dec53761b
Signed-off-by: Karthik Jayakumar <kjayakum@codeaurora.org>
Este cometimento está contido em:
Karthik Jayakumar
2021-01-13 19:00:52 -08:00
ascendente c69ede622c
cometimento df522198ab
2 ficheiros modificados com 7 adições e 11 eliminações

16
Kbuild
Ver ficheiro

@@ -101,6 +101,13 @@ camera-$(CONFIG_SPECTRA_ISP) += \
drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_hw_ver2.o \
drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_mod.o \
drivers/cam_isp/isp_hw_mgr/isp_hw/ife_csid_hw/cam_ife_csid_lite_mod.o \
drivers/cam_isp/isp_hw_mgr/isp_hw/sfe_hw/cam_sfe_soc.o \
drivers/cam_isp/isp_hw_mgr/isp_hw/sfe_hw/cam_sfe_dev.o \
drivers/cam_isp/isp_hw_mgr/isp_hw/sfe_hw/cam_sfe_core.o \
drivers/cam_isp/isp_hw_mgr/isp_hw/sfe_hw/sfe_top/cam_sfe_top.o \
drivers/cam_isp/isp_hw_mgr/isp_hw/sfe_hw/sfe_bus/cam_sfe_bus.o \
drivers/cam_isp/isp_hw_mgr/isp_hw/sfe_hw/sfe_bus/cam_sfe_bus_rd.o \
drivers/cam_isp/isp_hw_mgr/isp_hw/sfe_hw/sfe_bus/cam_sfe_bus_wr.o \
drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/cam_vfe_soc.o \
drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/cam_vfe_dev.o \
drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/cam_vfe_core.o \
@@ -132,15 +139,6 @@ camera-$(CONFIG_SPECTRA_ISP) += \
drivers/cam_isp/cam_isp_dev.o \
drivers/cam_isp/cam_isp_context.o
camera-$(CONFIG_SPECTRA_SFE) += \
drivers/cam_isp/isp_hw_mgr/isp_hw/sfe_hw/cam_sfe_soc.o \
drivers/cam_isp/isp_hw_mgr/isp_hw/sfe_hw/cam_sfe_dev.o \
drivers/cam_isp/isp_hw_mgr/isp_hw/sfe_hw/cam_sfe_core.o \
drivers/cam_isp/isp_hw_mgr/isp_hw/sfe_hw/sfe_top/cam_sfe_top.o \
drivers/cam_isp/isp_hw_mgr/isp_hw/sfe_hw/sfe_bus/cam_sfe_bus.o \
drivers/cam_isp/isp_hw_mgr/isp_hw/sfe_hw/sfe_bus/cam_sfe_bus_rd.o \
drivers/cam_isp/isp_hw_mgr/isp_hw/sfe_hw/sfe_bus/cam_sfe_bus_wr.o \
camera-$(CONFIG_SPECTRA_ICP) += \
drivers/cam_icp/icp_hw/icp_hw_mgr/cam_icp_hw_mgr.o \
drivers/cam_icp/icp_hw/ipe_hw/ipe_dev.o \

Ver ficheiro

@@ -3,7 +3,6 @@
# Localized KCONFIG settings
CONFIG_SPECTRA_ISP := y
CONFIG_SPECTRA_ICP := y
CONFIG_SPECTRA_SFE := y
CONFIG_SPECTRA_JPEG := y
CONFIG_SPECTRA_CUSTOM := y
CONFIG_SPECTRA_SENSOR := y
@@ -11,7 +10,6 @@ CONFIG_SPECTRA_SENSOR := y
# Flags to pass into C preprocessor
ccflags-y += -DCONFIG_SPECTRA_ISP=1
ccflags-y += -DCONFIG_SPECTRA_ICP=1
ccflags-y += -DCONFIG_SPECTRA_SFE=1
ccflags-y += -DCONFIG_SPECTRA_JPEG=1
ccflags-y += -DCONFIG_SPECTRA_CUSTOM=1
ccflags-y += -DCONFIG_SPECTRA_SENSOR=1