diff --git a/src/soc/amd/common/block/cpu/mca/Makefile.inc b/src/soc/amd/common/block/cpu/mca/Makefile.inc
index 02328057de..fd9e573e05 100644
--- a/src/soc/amd/common/block/cpu/mca/Makefile.inc
+++ b/src/soc/amd/common/block/cpu/mca/Makefile.inc
@@ -1,14 +1,14 @@
 ifeq ($(CONFIG_SOC_AMD_COMMON_BLOCK_MCA_COMMON),y)
 ramstage-y += mca_common.c
-ramstage-y += mca_common_bert.c
+ramstage-$(CONFIG_ACPI_BERT) += mca_common_bert.c
 endif # CONFIG_SOC_AMD_COMMON_BLOCK_MCA_COMMON
 
 ifeq ($(CONFIG_SOC_AMD_COMMON_BLOCK_MCA),y)
-ramstage-y += mca_bert.c
+ramstage-$(CONFIG_ACPI_BERT) += mca_bert.c
 ramstage-y += mca.c
 endif # CONFIG_SOC_AMD_COMMON_BLOCK_MCA
 
 ifeq ($(CONFIG_SOC_AMD_COMMON_BLOCK_MCAX),y)
-ramstage-y += mcax_bert.c
+ramstage-$(CONFIG_ACPI_BERT) += mcax_bert.c
 ramstage-y += mcax.c
 endif # CONFIG_SOC_AMD_COMMON_BLOCK_MCAX