diff --git a/src/device/Kconfig b/src/device/Kconfig
index 439118f10c..b69a254b80 100644
--- a/src/device/Kconfig
+++ b/src/device/Kconfig
@@ -663,6 +663,9 @@ config SUBSYSTEM_VENDOR_ID
 	  This config option will override the devicetree settings for
 	  PCI Subsystem Vendor ID.
 
+	  Note: This option is not meant for a board's Kconfig; use the
+	  devicetree setting `subsystemid` instead.
+
 config SUBSYSTEM_DEVICE_ID
 	hex "Override PCI Subsystem Device ID"
 	depends on PCI
@@ -671,6 +674,9 @@ config SUBSYSTEM_DEVICE_ID
 	  This config option will override the devicetree settings for
 	  PCI Subsystem Device ID.
 
+	  Note: This option is not meant for a board's Kconfig; use the
+	  devicetree setting `subsystemid` instead.
+
 config VGA_BIOS
 	bool "Add a VGA BIOS image"
 	depends on ARCH_X86
diff --git a/util/lint/lint-stable-024-kconfig-no-subsystem b/util/lint/lint-stable-024-kconfig-no-subsystem
new file mode 100755
index 0000000000..46dbc971f0
--- /dev/null
+++ b/util/lint/lint-stable-024-kconfig-no-subsystem
@@ -0,0 +1,18 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
+# DESCR: Check that no board's Kconfig sets SUBSYSTEM_(VENDOR|DEVICE)_ID
+
+LC_ALL=C export LC_ALL
+FAIL=0
+
+for i in src/mainboard/*/* src/mainboard/*/*/variants/*; do
+  if [ -r $i/Kconfig ]; then
+    if grep -Eq "^\s*config\s+SUBSYSTEM_(VENDOR|DEVICE)_ID\>" $i/Kconfig; then
+      echo "$i: Mainboard sets SUBSYSTEM_*_ID. Set 'subsystemid' in devicetree instead!"
+      FAIL=1
+    fi
+  fi
+done
+
+exit $FAIL