3 files changed, 7 insertions, 3 deletions
diff --git a/src/soc/amd/common/block/acpi/Makefile.inc b/src/soc/amd/common/block/acpi/Makefile.inc
index 708631a5e9..f0b336d46d 100644
--- a/src/soc/amd/common/block/acpi/Makefile.inc
+++ b/src/soc/amd/common/block/acpi/Makefile.inc
@@ -1,5 +1,5 @@
 bootblock-$(CONFIG_SOC_AMD_COMMON_BLOCK_ACPI) += acpi.c
-verstage-$(CONFIG_SOC_AMD_COMMON_BLOCK_ACPI) += acpi.c
+verstage_x86-$(CONFIG_SOC_AMD_COMMON_BLOCK_ACPI) += acpi.c
 romstage-$(CONFIG_SOC_AMD_COMMON_BLOCK_ACPI) += acpi.c
 ramstage-$(CONFIG_SOC_AMD_COMMON_BLOCK_ACPI) += acpi.c
 postcar-$(CONFIG_SOC_AMD_COMMON_BLOCK_ACPI) += acpi.c
diff --git a/src/soc/amd/common/block/alink/Makefile.inc b/src/soc/amd/common/block/alink/Makefile.inc
index 720a7cbd82..9d27aec174 100644
--- a/src/soc/amd/common/block/alink/Makefile.inc
+++ b/src/soc/amd/common/block/alink/Makefile.inc
@@ -1,5 +1,5 @@
 bootblock-$(CONFIG_SOC_AMD_COMMON_BLOCK_ALINK) += alink.c
-verstage-$(CONFIG_SOC_AMD_COMMON_BLOCK_ALINK) += alink.c
+verstage_x86-$(CONFIG_SOC_AMD_COMMON_BLOCK_ALINK) += alink.c
 romstage-$(CONFIG_SOC_AMD_COMMON_BLOCK_ALINK) += alink.c
 postcar-$(CONFIG_SOC_AMD_COMMON_BLOCK_ALINK) += alink.c
 ramstage-$(CONFIG_SOC_AMD_COMMON_BLOCK_ALINK) += alink.c
diff --git a/src/soc/amd/common/block/pci/Makefile.inc b/src/soc/amd/common/block/pci/Makefile.inc
index 558a7ac736..baebb6c33f 100644
--- a/src/soc/amd/common/block/pci/Makefile.inc
+++ b/src/soc/amd/common/block/pci/Makefile.inc
@@ -1,4 +1,8 @@
 
 ramstage-$(CONFIG_SOC_AMD_COMMON_BLOCK_PCI) += amd_pci_util.c
 
-all-y += amd_pci_mmconf.c
+bootblock-y += amd_pci_mmconf.c
+verstage_x86-y += amd_pci_mmconf.c
+romstage-y += amd_pci_mmconf.c
+postcar-y += amd_pci_mmconf.c
+ramstage-y += amd_pci_mmconf.c