diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile
index 6b9a8df9..e135097d 100644
--- a/drivers/media/i2c/Makefile
+++ b/drivers/media/i2c/Makefile
@@ -1,5 +1,5 @@
 # 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
 
@@ -7,6 +7,8 @@ obj-m += max9295.o
 obj-m += max9296.o
 ifndef CONFIG_TEGRA_SYSTEM_TYPE_ACK
 obj-m += max96712.o
+
+ifdef CONFIG_MEDIA_SUPPORT
 obj-m += ar1335_common.o
 obj-m += lt6911uxc.o
 obj-m += nv_imx185.o
@@ -17,7 +19,9 @@ obj-m += nv_imx390.o
 obj-m += nv_imx477.o
 obj-m += nv_ov5693.o
 obj-m += nv_ar0234.o
-obj-m += pca9570.o
 obj-m += nv_hawk_owl.o
+endif
+
+obj-m += pca9570.o
 obj-m += virtual_i2c_mux.o
 endif
diff --git a/drivers/media/platform/tegra/Makefile b/drivers/media/platform/tegra/Makefile
index 3a65d7b2..2476ee79 100644
--- a/drivers/media/platform/tegra/Makefile
+++ b/drivers/media/platform/tegra/Makefile
@@ -1,8 +1,10 @@
 # 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 += tpg/
+endif
 obj-m += isc/
 obj-m += camera/
-obj-m += tpg/
 obj-m += cam_fsync/
diff --git a/drivers/media/platform/tegra/camera/Makefile b/drivers/media/platform/tegra/camera/Makefile
index 4dd64ffd..7ad93167 100644
--- a/drivers/media/platform/tegra/camera/Makefile
+++ b/drivers/media/platform/tegra/camera/Makefile
@@ -1,6 +1,7 @@
 # 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
 LINUXINCLUDE += -I$(srctree.nvidia-oot)/drivers/video/tegra/camera
 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 += tests/
 endif
+endif
diff --git a/drivers/video/tegra/Makefile b/drivers/video/tegra/Makefile
index 74c389b8..1e6bcfb8 100644
--- a/drivers/video/tegra/Makefile
+++ b/drivers/video/tegra/Makefile
@@ -1,5 +1,5 @@
 # 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 += host/nvdla/
@@ -8,7 +8,9 @@ obj-m += tsec/
 obj-m += dc/bridge/
 obj-m += camera/
 obj-m += host/capture/
+ifdef CONFIG_MEDIA_SUPPORT
 obj-m += host/nvcsi/
 obj-m += host/vi/
 obj-m += host/isp/
+endif
 obj-m += virt/