diff --git a/Makefile b/Makefile
index 829e5434..d3edf3a8 100644
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,9 @@ ccflags-y += -DCONFIG_TEGRA_FUSE_UPSTREAM
 LINUXINCLUDE += -I$(srctree.nvidia-oot)/include
 
 obj-m += drivers/
+
+ifdef CONFIG_SOUND
 obj-m += sound/soc/tegra/
 obj-m += sound/tegra-safety-audio/
 obj-m += sound/soc/tegra-virt-alt/
+endif
diff --git a/drivers/Makefile b/drivers/Makefile
index 34afe59a..71a1ba90 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -4,38 +4,60 @@
 LINUXINCLUDE += -I$(srctree.nvidia-oot)/include
 
 obj-m += block/tegra_virt_storage/
+ifdef CONFIG_PSTORE
 obj-m += block/tegra_oops_virt_storage/
+endif
 obj-m += c2c/
 obj-m += clink/
 obj-m += cpuidle/
 obj-m += crypto/
 obj-m += debug/
+ifdef CONFIG_PM_DEVFREQ
 obj-m += devfreq/
+endif
 obj-m += firmware/tegra/
+ifdef CONFIG_TEGRA_HOST1X
 obj-m += gpu/
+endif
 obj-m += hwmon/
+ifdef CONFIG_I2C
 obj-m += i2c/busses/
 obj-m += mfd/
+endif
+ifdef CONFIG_MTD
 obj-m += mtd/devices/
+endif
 obj-m += misc/
 obj-m += net/
 obj-m += nvpps/
 obj-m += nvpmodel/
+ifdef CONFIG_PCI
 obj-m += pci/
+endif
 obj-m += pinctrl/
 obj-m += platform/tegra/
 obj-m += pwm/
 obj-m += ras/
 obj-m += rtc/
 obj-m += cpuidle/
+ifdef CONFIG_SCSI
 obj-m += scsi/ufs/
+endif
 obj-m += soc/tegra/
+ifdef CONFIG_SPI
 obj-m += spi/
+endif
+ifdef CONFIG_I2C
 obj-m += thermal/
+endif
 obj-m += watchdog/
+ifdef CONFIG_TEGRA_HOST1X
 obj-m += video/tegra/
+endif
 obj-m += virt/tegra/
+ifdef CONFIG_TEGRA_HOST1X
 obj-m += media/
-obj-m  += staging/platform/tegra/gte/
+endif
+obj-m += staging/platform/tegra/gte/
 obj-m += staging/platform/tegra/gte_test/
 
diff --git a/drivers/crypto/Makefile b/drivers/crypto/Makefile
index 70f8f8cf..45a0cbfb 100644
--- a/drivers/crypto/Makefile
+++ b/drivers/crypto/Makefile
@@ -4,7 +4,9 @@ ccflags-y += -I$(srctree.nvidia)/drivers/gpu/host1x/include
 ccflags-y += -I$(srctree.nvidia)/include
 ccflags-y += -I$(srctree)/include
 
+ifdef CONFIG_TEGRA_HOST1X
 obj-m += tegra-se-nvhost.o
-obj-m += tegra-se-nvrng.o
-obj-m += tegra-nvvse-cryptodev.o
 obj-m += tegra-hv-vse-safety.o
+obj-m += tegra-nvvse-cryptodev.o
+endif
+obj-m += tegra-se-nvrng.o
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index bed46b65..868beb78 100644
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -3,6 +3,8 @@
 
 obj-m += mods/
 obj-m += nvsciipc/
+ifdef CONFIG_PCI
 obj-m += tegra-pcie-dma-test.o
+endif
 obj-m += bluedroid_pm.o
 obj-m += nvscic2c-pcie/
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 22d5db50..e90e87b6 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -3,5 +3,9 @@
 
 obj-m += ethernet/
 obj-m += tegra_hv_net.o
+ifdef CONFIG_CAN
 obj-m += can/
+endif
+ifdef CONFIG_WLAN
 obj-m += wireless/
+endif
diff --git a/drivers/net/ethernet/nvidia/Makefile b/drivers/net/ethernet/nvidia/Makefile
index a3cda4d8..a138081f 100644
--- a/drivers/net/ethernet/nvidia/Makefile
+++ b/drivers/net/ethernet/nvidia/Makefile
@@ -1,5 +1,7 @@
 #SPDX-License-Identifier: GPL-2.0-only
 #Copyright (c) 2019-2022, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 
+ifdef CONFIG_PCI
 obj-m += pcie/
+endif
 obj-m += nvethernet/
diff --git a/drivers/platform/tegra/Makefile b/drivers/platform/tegra/Makefile
index fcfaeeb8..1a2908e5 100644
--- a/drivers/platform/tegra/Makefile
+++ b/drivers/platform/tegra/Makefile
@@ -18,10 +18,14 @@ obj-m += tegra-fsicom.o
 tegra-camera-rtcpu-objs :=  tegra-camera-rtcpu-base.o rtcpu/tegra-rtcpu-trace.o rtcpu/rtcpu-monitor.o
 obj-m += tegra-camera-rtcpu.o
 
+ifdef CONFIG_TEGRA_HOST1X
 obj-m += cvnas/
+endif
 obj-m += hwpm/
 obj-m += mce/
+ifdef CONFIG_PERF_EVENTS
 obj-m += uncore_pmu/
+endif
 obj-m += mc-hwpm.o
 obj-m += mc-utils/
 obj-m += dce/
diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile
index d0d052c9..e4d3e728 100644
--- a/drivers/rtc/Makefile
+++ b/drivers/rtc/Makefile
@@ -1,4 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0
 # Copyright (c) 2022, NVIDIA CORPORATION.  All rights reserved.
 
+ifdef CONFIG_I2C
 obj-m += nvvrs-pseq-rtc.o
+endif