diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 92dab880..f6804417 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -411,7 +411,15 @@ BOARD_VENDOR_KERNEL_MODULES_LOAD := $(strip $(shell cat $(KERNEL_MODULE_DIR)/ven
 ifndef BOARD_VENDOR_KERNEL_MODULES_LOAD
 $(error vendor_dlkm.modules.load not found or empty)
 endif
+
+# staging kernels might have modules split between system/vendor_dlkm. If
+# the target defined modules on the system_dlkm image, honor the split.
+# Otherwise, assume all modules are stored on the vendor_dlkm image.
+ifneq ($(BOARD_SYSTEM_KERNEL_MODULES),)
+BOARD_VENDOR_KERNEL_MODULES := $(addprefix $(KERNEL_MODULE_DIR)/, $(notdir $(BOARD_VENDOR_KERNEL_MODULES_LOAD)))
+else
 BOARD_VENDOR_KERNEL_MODULES := $(KERNEL_MODULES)
+endif
 
 # Using BUILD_COPY_HEADERS
 BUILD_BROKEN_USES_BUILD_COPY_HEADERS := true