diff --git a/src/soc/intel/common/block/p2sb/Kconfig b/src/soc/intel/common/block/p2sb/Kconfig
index 7f292cde9e..ff20255613 100644
--- a/src/soc/intel/common/block/p2sb/Kconfig
+++ b/src/soc/intel/common/block/p2sb/Kconfig
@@ -1,5 +1,11 @@
-config SOC_INTEL_COMMON_BLOCK_P2SB
+config SOC_INTEL_COMMON_BLOCK_BASE_P2SB
 	bool
 	depends on SOC_INTEL_COMMON_BLOCK_PCR
 	help
-	  Intel Processor common P2SB driver
+	  Intel Processor common P2SB base driver
+
+config SOC_INTEL_COMMON_BLOCK_P2SB
+	bool
+	select SOC_INTEL_COMMON_BLOCK_BASE_P2SB
+	help
+	  Intel Processor common P2SB driver for PCH or SoC die
diff --git a/src/soc/intel/common/block/p2sb/Makefile.inc b/src/soc/intel/common/block/p2sb/Makefile.inc
index 5c6378e2a4..dbf45452a2 100644
--- a/src/soc/intel/common/block/p2sb/Makefile.inc
+++ b/src/soc/intel/common/block/p2sb/Makefile.inc
@@ -1,8 +1,8 @@
-ifeq ($(CONFIG_SOC_INTEL_COMMON_BLOCK_P2SB),y)
-bootblock-y += p2sb.c
-romstage-y += p2sb.c
-ramstage-y += p2sb.c
-ramstage-y += p2sblib.c
-smm-y += p2sb.c
-smm-y += p2sblib.c
-endif
+ramstage-$(CONFIG_SOC_INTEL_COMMON_BLOCK_BASE_P2SB) += p2sblib.c
+smm-$(CONFIG_SOC_INTEL_COMMON_BLOCK_BASE_P2SB) += p2sblib.c
+
+# p2sb.c for PCH and SoC die P2SB IP
+bootblock-$(CONFIG_SOC_INTEL_COMMON_BLOCK_P2SB) += p2sb.c
+romstage-$(CONFIG_SOC_INTEL_COMMON_BLOCK_P2SB) += p2sb.c
+ramstage-$(CONFIG_SOC_INTEL_COMMON_BLOCK_P2SB) += p2sb.c
+smm-$(CONFIG_SOC_INTEL_COMMON_BLOCK_P2SB) += p2sb.c