From 613bf2ef1a0bd14796d4c68cf5ac087cb9847dfd Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Sun, 2 Apr 2023 21:50:38 +0300 Subject: [PATCH] techpack: camera: Don't build for bengal Change-Id: Ia7ec24e36e9ea6a911269067fbac70dbe7de5617 --- techpack/camera/Makefile | 13 +------------ techpack/camera/config/konacamera.conf | 6 +++++- techpack/camera/config/konacameraconf.h | 3 +-- techpack/camera/config/litocamera.conf | 1 + techpack/camera/config/litocameraconf.h | 2 +- 5 files changed, 9 insertions(+), 16 deletions(-) diff --git a/techpack/camera/Makefile b/techpack/camera/Makefile index 9e0b13785b58..6dbae43a4106 100644 --- a/techpack/camera/Makefile +++ b/techpack/camera/Makefile @@ -9,10 +9,6 @@ ifeq ($(CONFIG_ARCH_LITO), y) include $(srctree)/techpack/camera/config/litocamera.conf endif -ifeq ($(CONFIG_ARCH_BENGAL), y) -include $(srctree)/techpack/camera/config/bengalcamera.conf -endif - ifeq ($(CONFIG_ARCH_KONA), y) LINUXINCLUDE += \ -include $(srctree)/techpack/camera/config/konacameraconf.h @@ -23,12 +19,7 @@ LINUXINCLUDE += \ -include $(srctree)/techpack/camera/config/litocameraconf.h endif -ifeq ($(CONFIG_ARCH_BENGAL), y) -LINUXINCLUDE += \ - -include $(srctree)/techpack/camera/config/bengalcameraconf.h -endif - -ifdef CONFIG_SPECTRA_CAMERA +ifdef CONFIG_SPECTRA_CAMERA_KONA # Use USERINCLUDE when you must reference the UAPI directories only. USERINCLUDE += \ -I$(srctree)/techpack/camera/include/uapi @@ -39,6 +30,4 @@ LINUXINCLUDE += \ -I$(srctree)/techpack/camera/include/uapi \ -I$(srctree)/techpack/camera/include obj-y += drivers/ -else -$(info Target not found) endif diff --git a/techpack/camera/config/konacamera.conf b/techpack/camera/config/konacamera.conf index 9b08bcb80c2b..bae5fda7a592 100644 --- a/techpack/camera/config/konacamera.conf +++ b/techpack/camera/config/konacamera.conf @@ -1 +1,5 @@ -export CONFIG_SPECTRA_CAMERA=y \ No newline at end of file +# SPDX-License-Identifier: GPL-2.0-only +# Copyright (c) 2019, The Linux Foundation. All rights reserved. + +export CONFIG_SPECTRA_CAMERA_KONA=y +export CONFIG_SPECTRA_CAMERA=y diff --git a/techpack/camera/config/konacameraconf.h b/techpack/camera/config/konacameraconf.h index 875b95587ab6..9f32793df01e 100644 --- a/techpack/camera/config/konacameraconf.h +++ b/techpack/camera/config/konacameraconf.h @@ -3,6 +3,5 @@ * Copyright (c) 2019, The Linux Foundation. All rights reserved. */ - +#define CONFIG_SPECTRA_CAMERA_KONA 1 #define CONFIG_SPECTRA_CAMERA 1 - diff --git a/techpack/camera/config/litocamera.conf b/techpack/camera/config/litocamera.conf index 451723eebce3..bae5fda7a592 100644 --- a/techpack/camera/config/litocamera.conf +++ b/techpack/camera/config/litocamera.conf @@ -1,4 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only # Copyright (c) 2019, The Linux Foundation. All rights reserved. +export CONFIG_SPECTRA_CAMERA_KONA=y export CONFIG_SPECTRA_CAMERA=y diff --git a/techpack/camera/config/litocameraconf.h b/techpack/camera/config/litocameraconf.h index 1a7714018004..9f32793df01e 100644 --- a/techpack/camera/config/litocameraconf.h +++ b/techpack/camera/config/litocameraconf.h @@ -3,5 +3,5 @@ * Copyright (c) 2019, The Linux Foundation. All rights reserved. */ +#define CONFIG_SPECTRA_CAMERA_KONA 1 #define CONFIG_SPECTRA_CAMERA 1 -