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

Commit d084f570 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 5bdd66fa on remote branch 

Change-Id: Iae57e93285d0f045850d0ae8ed9158b6997273e1
parents 91bd8594 5bdd66fa

Makefile

+18 −0
Original line number Diff line number Diff line
@@ -14,6 +14,10 @@ ifeq ($(CONFIG_ARCH_BENGAL), y) 
include $(srctree)/techpack/camera/config/bengalcamera.conf

endif



ifeq ($(CONFIG_ARCH_MONACO), y)

include $(srctree)/techpack/camera/config/monacocamera.conf

endif



ifeq ($(CONFIG_ARCH_LAHAINA), y)

include $(srctree)/techpack/camera/config/lahainacamera.conf

endif
@@ -22,6 +26,10 @@ ifeq ($(CONFIG_ARCH_HOLI), y) 
include $(srctree)/techpack/camera/config/holicamera.conf

endif



ifeq ($(CONFIG_ARCH_BLAIR), y)

include $(srctree)/techpack/camera/config/blaircamera.conf

endif



ifeq ($(CONFIG_ARCH_SHIMA), y)

include $(srctree)/techpack/camera/config/shimacamera.conf

endif
@@ -45,6 +53,11 @@ LINUXINCLUDE += \ 
		-include $(srctree)/techpack/camera/config/bengalcameraconf.h

endif



ifeq ($(CONFIG_ARCH_MONACO), y)

LINUXINCLUDE    += \

		-include $(srctree)/techpack/camera/config/monacocameraconf.h

endif



ifeq ($(CONFIG_ARCH_LAHAINA), y)

LINUXINCLUDE    += \

		-include $(srctree)/techpack/camera/config/lahainacameraconf.h
@@ -55,6 +68,11 @@ LINUXINCLUDE += \ 
		-include $(srctree)/techpack/camera/config/holicameraconf.h

endif



ifeq ($(CONFIG_ARCH_BLAIR), y)

LINUXINCLUDE    += \

		-include $(srctree)/techpack/camera/config/blaircameraconf.h

endif



ifeq ($(CONFIG_ARCH_SHIMA), y)

LINUXINCLUDE    += \

		-include $(srctree)/techpack/camera/config/shimacameraconf.h

config/blaircamera.conf

0 → 100644
+17 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

# Copyright (c) 2021, The Linux Foundation. All rights reserved.



ifeq ($(CONFIG_QGKI),y)

export CONFIG_SPECTRA_CAMERA=m

$(info "SPECTRA_CAMERA IS STATIC")

else

$(info "SPECTRA_CAMERA IS MODULAR")

export CONFIG_SPECTRA_CAMERA=m

endif



ifneq (,$(filter $(CONFIG_SPECTRA_CAMERA), y m))

export CONFIG_SPECTRA_ISP=y

export CONFIG_SPECTRA_OPE=y

export CONFIG_SPECTRA_TFE=y

export CONFIG_SPECTRA_SENSOR=y

endif

config/blaircameraconf.h

0 → 100644
+10 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

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

 */



#define CONFIG_SPECTRA_CAMERA      1

#define CONFIG_SPECTRA_ISP         1

#define CONFIG_SPECTRA_OPE         1

#define CONFIG_SPECTRA_TFE         1

#define CONFIG_SPECTRA_SENSOR      1

config/monacocamera.conf

0 → 100644
+8 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

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



export CONFIG_SPECTRA_CAMERA=y

export CONFIG_SPECTRA_TFE=y

export CONFIG_SPECTRA_ISP=y

export CONFIG_SPECTRA_SENSOR=y

export CONFIG_SPECTRA_OPE=y

config/monacocameraconf.h

0 → 100644
+11 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

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

 */



#define CONFIG_SPECTRA_CAMERA 1

#define CONFIG_SPECTRA_TFE    1

#define CONFIG_SPECTRA_ISP    1

#define CONFIG_SPECTRA_SENSOR 1

#define CONFIG_SPECTRA_OPE    1