Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 661ea8b3 authored by Camera Software Integration's avatar Camera Software Integration Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: isp: Disable compilation of IFE, incase of TFE" into camera-kernel.lnx.3.1

parents a4c69c8d dd0db4d6

config/bengalcamera.conf

+1 −1
Original line number Diff line number Diff line
@@ -2,5 +2,5 @@ 
# Copyright (c) 2019, The Linux Foundation. All rights reserved.



export CONFIG_SPECTRA_CAMERA=y

export CONFIG_SPECTRA_CAMERA_ISP=y

export CONFIG_SPECTRA_CAMERA_OPE=y

export CONFIG_SPECTRA_CAMERA_TFE=y

config/bengalcameraconf.h

+2 −2
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Copyright (c) 2019, The Linux Foundation. All rights reserved.

 * Copyright (c) 2020, The Linux Foundation. All rights reserved.

 */



#define CONFIG_SPECTRA_CAMERA      1

#define CONFIG_SPECTRA_CAMERA_ISP  1

#define CONFIG_SPECTRA_CAMERA_OPE  1

#define CONFIG_SPECTRA_CAMERA_TFE  1

config/konacamera.conf

+1 −1
Original line number Diff line number Diff line
@@ -6,5 +6,5 @@ export CONFIG_SPECTRA_CAMERA_CUST=y 
export CONFIG_SPECTRA_CAMERA_FD=y

export CONFIG_SPECTRA_CAMERA_ICP=y

export CONFIG_SPECTRA_CAMERA_JPEG=y

export CONFIG_SPECTRA_CAMERA_ISP=y

export CONFIG_SPECTRA_CAMERA_IFE=y

export CONFIG_SPECTRA_CAMERA_LRME=y

config/konacameraconf.h

+2 −2
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Copyright (c) 2019, The Linux Foundation. All rights reserved.

 * Copyright (c) 2020, The Linux Foundation. All rights reserved.

 */



#define CONFIG_SPECTRA_CAMERA      1
@@ -8,5 +8,5 @@ 
#define CONFIG_SPECTRA_CAMERA_FD   1

#define CONFIG_SPECTRA_CAMERA_ICP  1

#define CONFIG_SPECTRA_CAMERA_JPEG 1

#define CONFIG_SPECTRA_CAMERA_ISP  1

#define CONFIG_SPECTRA_CAMERA_IFE  1

#define CONFIG_SPECTRA_CAMERA_LRME 1

config/litocamera.conf

+1 −1
Original line number Diff line number Diff line
@@ -5,5 +5,5 @@ export CONFIG_SPECTRA_CAMERA=y 
export CONFIG_SPECTRA_CAMERA_FD=y

export CONFIG_SPECTRA_CAMERA_ICP=y

export CONFIG_SPECTRA_CAMERA_JPEG=y

export CONFIG_SPECTRA_CAMERA_ISP=y

export CONFIG_SPECTRA_CAMERA_IFE=y

export CONFIG_SPECTRA_CAMERA_LRME=y