nv-tegra-mirror/linux-nv-oot
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nv-oot.git synced 2025-12-22 17:25:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

camera: Fix build when CONFIG_MEDIA_SUPPORT is not enabled

Browse Source 
Some camera drivers are dependent upon CONFIG_MEDIA_SUPPORT being
enabled in the kernel and if it is not enabled, building these drivers
fail. Fix this by only building the camera drivers dependent upon
CONFIG_MEDIA_SUPPORT when this option is actually enabled.

Bug 4449072

Change-Id: I3637b5763667fbc9965bbeaf126115010e711c7e
Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3050559
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
This commit is contained in:
Jon Hunter
2024-01-10 21:50:49 +00:00
committed by mobile promotions
parent 6557f98a1c
commit 9de3e799ae
4 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/media/i2c/Makefile
View File

@@ -1,5 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
# Copyright (c) 2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved. # Copyright (c) 2023-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
subdir-ccflags-y += -Werror subdir-ccflags-y += -Werror
@@ -7,6 +7,8 @@ obj-m += max9295.o
obj-m += max9296.o obj-m += max9296.o
ifndef CONFIG_TEGRA_SYSTEM_TYPE_ACK ifndef CONFIG_TEGRA_SYSTEM_TYPE_ACK
obj-m += max96712.o obj-m += max96712.o
ifdef CONFIG_MEDIA_SUPPORT
obj-m += ar1335_common.o obj-m += ar1335_common.o
obj-m += lt6911uxc.o obj-m += lt6911uxc.o
obj-m += nv_imx185.o obj-m += nv_imx185.o
@@ -17,7 +19,9 @@ obj-m += nv_imx390.o
obj-m += nv_imx477.o obj-m += nv_imx477.o
obj-m += nv_ov5693.o obj-m += nv_ov5693.o
obj-m += nv_ar0234.o obj-m += nv_ar0234.o
obj-m += pca9570.o
obj-m += nv_hawk_owl.o obj-m += nv_hawk_owl.o
endif
obj-m += pca9570.o
obj-m += virtual_i2c_mux.o obj-m += virtual_i2c_mux.o
endif endif

6
drivers/media/platform/tegra/Makefile
View File

@@ -1,8 +1,10 @@
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
# Copyright (c) 2022-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved. # Copyright (c) 2022-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
ifdef CONFIG_MEDIA_SUPPORT
obj-m += cdi/ obj-m += cdi/
obj-m += tpg/
endif
obj-m += isc/ obj-m += isc/
obj-m += camera/ obj-m += camera/
obj-m += tpg/
obj-m += cam_fsync/ obj-m += cam_fsync/

4
drivers/media/platform/tegra/camera/Makefile
View File

@@ -1,6 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
# Copyright (c) 2022-2023, NVIDIA CORPORATION. All rights reserved. # Copyright (c) 2022-2024, NVIDIA CORPORATION. All rights reserved.
ifdef CONFIG_MEDIA_SUPPORT
ifndef CONFIG_TEGRA_SYSTEM_TYPE_ACK ifndef CONFIG_TEGRA_SYSTEM_TYPE_ACK
LINUXINCLUDE += -I$(srctree.nvidia-oot)/drivers/video/tegra/camera LINUXINCLUDE += -I$(srctree.nvidia-oot)/drivers/video/tegra/camera
LINUXINCLUDE += -I$(srctree.nvidia-oot)/drivers/media/platform/tegra LINUXINCLUDE += -I$(srctree.nvidia-oot)/drivers/media/platform/tegra
@@ -32,3 +33,4 @@ tegra-camera-objs += fusa-capture/capture-isp.o
obj-m += tegra-camera.o obj-m += tegra-camera.o
obj-m += tests/ obj-m += tests/
endif endif
endif

4
drivers/video/tegra/Makefile
View File

@@ -1,5 +1,5 @@
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
# Copyright (c) 2022-2023, NVIDIA CORPORATION. All rights reserved. # Copyright (c) 2022-2024, NVIDIA CORPORATION. All rights reserved.
obj-m += nvmap/ obj-m += nvmap/
obj-m += host/nvdla/ obj-m += host/nvdla/
@@ -8,7 +8,9 @@ obj-m += tsec/
obj-m += dc/bridge/ obj-m += dc/bridge/
obj-m += camera/ obj-m += camera/
obj-m += host/capture/ obj-m += host/capture/
ifdef CONFIG_MEDIA_SUPPORT
obj-m += host/nvcsi/ obj-m += host/nvcsi/
obj-m += host/vi/ obj-m += host/vi/
obj-m += host/isp/ obj-m += host/isp/
endif
obj-m += virt/ obj-m += virt/