diff --git a/src/soc/amd/common/block/lpc/Makefile.inc b/src/soc/amd/common/block/lpc/Makefile.inc
index 7900b10d13..b1fed7eb01 100644
--- a/src/soc/amd/common/block/lpc/Makefile.inc
+++ b/src/soc/amd/common/block/lpc/Makefile.inc
@@ -21,11 +21,4 @@ ramstage-y += spi_dma.c
 smm-y += spi_dma.c
 endif # CONFIG_SOC_AMD_COMMON_BLOCK_LPC_SPI_DMA
 
-ifeq ($(CONFIG_SOC_AMD_COMMON_BLOCK_USE_ESPI),y)
-
-bootblock-y += espi_util.c
-romstage-y += espi_util.c
-ramstage-y += espi_util.c
-verstage-y += espi_util.c
-
-endif # CONFIG_SOC_AMD_COMMON_BLOCK_USE_ESPI
+all-$(CONFIG_SOC_AMD_COMMON_BLOCK_USE_ESPI) += espi_util.c