1 files changed, 21 insertions, 13 deletions
diff --git a/src/soc/amd/common/block/lpc/Makefile.inc b/src/soc/amd/common/block/lpc/Makefile.inc
index 7db176b31d..68e528ffa2 100644
--- a/src/soc/amd/common/block/lpc/Makefile.inc
+++ b/src/soc/amd/common/block/lpc/Makefile.inc
@@ -1,13 +1,21 @@
-ramstage-$(CONFIG_SOC_AMD_COMMON_BLOCK_LPC) += lpc.c
-
-bootblock-$(CONFIG_SOC_AMD_COMMON_BLOCK_LPC) += lpc_util.c
-verstage-$(CONFIG_SOC_AMD_COMMON_BLOCK_LPC) += lpc_util.c
-romstage-$(CONFIG_SOC_AMD_COMMON_BLOCK_LPC) += lpc_util.c
-postcar-$(CONFIG_SOC_AMD_COMMON_BLOCK_LPC) += lpc_util.c
-ramstage-$(CONFIG_SOC_AMD_COMMON_BLOCK_LPC) += lpc_util.c
-smm-$(CONFIG_SOC_AMD_COMMON_BLOCK_LPC) += lpc_util.c
-
-bootblock-$(CONFIG_SOC_AMD_COMMON_BLOCK_USE_ESPI) += espi_util.c
-romstage-$(CONFIG_SOC_AMD_COMMON_BLOCK_USE_ESPI) += espi_util.c
-ramstage-$(CONFIG_SOC_AMD_COMMON_BLOCK_USE_ESPI) += espi_util.c
-verstage-$(CONFIG_SOC_AMD_COMMON_BLOCK_USE_ESPI) += espi_util.c
+ifeq ($(CONFIG_SOC_AMD_COMMON_BLOCK_LPC),y)
+
+ramstage-y += lpc.c
+
+bootblock-y += lpc_util.c
+verstage-y += lpc_util.c
+romstage-y += lpc_util.c
+postcar-y += lpc_util.c
+ramstage-y += lpc_util.c
+smm-y += lpc_util.c
+
+endif # CONFIG_SOC_AMD_COMMON_BLOCK_LPC
+
+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