diff --git a/src/soc/amd/common/Makefile.inc b/src/soc/amd/common/Makefile.inc
index b485bb3479..103c3bfad8 100644
--- a/src/soc/amd/common/Makefile.inc
+++ b/src/soc/amd/common/Makefile.inc
@@ -2,19 +2,6 @@ ifeq ($(CONFIG_SOC_AMD_COMMON),y)
 
 CPPFLAGS_common += -I$(src)/soc/amd/common
 
-bootblock-y += agesawrapper.c
-bootblock-y += def_callouts.c
-bootblock-y += heapmanager.c
-
-romstage-y += agesawrapper.c
-romstage-y += def_callouts.c
-romstage-y += heapmanager.c
-
-ramstage-y += agesawrapper.c
-ramstage-y += amd_late_init.c
-ramstage-y += def_callouts.c
-ramstage-y += heapmanager.c
-
 subdirs-$(CONFIG_SOC_AMD_COMMON_BLOCK) += block
 
 endif
diff --git a/src/soc/amd/common/block/pi/Kconfig b/src/soc/amd/common/block/pi/Kconfig
new file mode 100644
index 0000000000..273598b0bd
--- /dev/null
+++ b/src/soc/amd/common/block/pi/Kconfig
@@ -0,0 +1,5 @@
+config SOC_AMD_COMMON_BLOCK_PI
+	bool
+	default n
+	help
+	  This option builds functions that interface AMD's AGESA.
diff --git a/src/soc/amd/common/block/pi/Makefile.inc b/src/soc/amd/common/block/pi/Makefile.inc
new file mode 100644
index 0000000000..de6bf78b03
--- /dev/null
+++ b/src/soc/amd/common/block/pi/Makefile.inc
@@ -0,0 +1,16 @@
+ifeq ($(CONFIG_SOC_AMD_COMMON_BLOCK_PI),y)
+
+bootblock-y += agesawrapper.c
+bootblock-y += def_callouts.c
+bootblock-y += heapmanager.c
+
+romstage-y += agesawrapper.c
+romstage-y += def_callouts.c
+romstage-y += heapmanager.c
+
+ramstage-y += agesawrapper.c
+ramstage-y += amd_late_init.c
+ramstage-y += def_callouts.c
+ramstage-y += heapmanager.c
+
+endif
diff --git a/src/soc/amd/common/agesawrapper.c b/src/soc/amd/common/block/pi/agesawrapper.c
similarity index 100%
rename from src/soc/amd/common/agesawrapper.c
rename to src/soc/amd/common/block/pi/agesawrapper.c
diff --git a/src/soc/amd/common/amd_late_init.c b/src/soc/amd/common/block/pi/amd_late_init.c
similarity index 100%
rename from src/soc/amd/common/amd_late_init.c
rename to src/soc/amd/common/block/pi/amd_late_init.c
diff --git a/src/soc/amd/common/def_callouts.c b/src/soc/amd/common/block/pi/def_callouts.c
similarity index 100%
rename from src/soc/amd/common/def_callouts.c
rename to src/soc/amd/common/block/pi/def_callouts.c
diff --git a/src/soc/amd/common/heapmanager.c b/src/soc/amd/common/block/pi/heapmanager.c
similarity index 100%
rename from src/soc/amd/common/heapmanager.c
rename to src/soc/amd/common/block/pi/heapmanager.c
diff --git a/src/soc/amd/stoneyridge/Kconfig b/src/soc/amd/stoneyridge/Kconfig
index 8b9111e81e..4455f54671 100644
--- a/src/soc/amd/stoneyridge/Kconfig
+++ b/src/soc/amd/stoneyridge/Kconfig
@@ -47,6 +47,7 @@ config CPU_SPECIFIC_OPTIONS
 	select SOC_AMD_COMMON
 	select SOC_AMD_COMMON_BLOCK
 	select SOC_AMD_COMMON_BLOCK_PCI
+	select SOC_AMD_COMMON_BLOCK_PI
 	select SOC_AMD_COMMON_BLOCK_PSP
 	select SOC_AMD_COMMON_BLOCK_CAR
 	select SOC_AMD_COMMON_BLOCK_S3