diff --git a/payloads/Makefile.inc b/payloads/Makefile.inc
index e735443a76..a2336aa876 100644
--- a/payloads/Makefile.inc
+++ b/payloads/Makefile.inc
@@ -50,7 +50,7 @@ print-repo-info-payloads:
 	-$(foreach payload, $(PAYLOADS_LIST), $(MAKE) -C $(payload) print-repo-info 2>/dev/null; )
 
 ifeq ($(CONFIG_PAYLOAD_NONE),y)
-files_added:: warn_no_payload
+show_notices:: warn_no_payload
 endif
 
 warn_no_payload:
diff --git a/src/drivers/intel/fsp2_0/Makefile.inc b/src/drivers/intel/fsp2_0/Makefile.inc
index 4af4158903..5463405d63 100644
--- a/src/drivers/intel/fsp2_0/Makefile.inc
+++ b/src/drivers/intel/fsp2_0/Makefile.inc
@@ -162,7 +162,7 @@ $(error No second FSP-S binary file specified.)
 endif # CONFIG_FSP_S_FILE_2
 endif # CONFIG_PLATFORM_USES_SECOND_FSP
 else # CONFIG_ADD_FSP_BINARIES
-build_complete:: warn_no_fsp_binaries
+show_notices:: warn_no_fsp_binaries
 endif # CONFIG_ADD_FSP_BINARIES
 
 PHONY+=warn_no_fsp_binaries
diff --git a/src/ec/51nb/npce985la0dx/Makefile.inc b/src/ec/51nb/npce985la0dx/Makefile.inc
index 81f0694561..cef41aae27 100644
--- a/src/ec/51nb/npce985la0dx/Makefile.inc
+++ b/src/ec/51nb/npce985la0dx/Makefile.inc
@@ -7,7 +7,7 @@ ifeq ($(CONFIG_EC_51NB_NPCE985LA0DX_FIRMWARE),y)
 	$(CBFSTOOL) $(obj)/coreboot.rom write -r EC -f $(CONFIG_EC_51NB_NPCE985LA0DX_FW) --fill-upward
 endif
 
-build_complete::
+show_notices::
 ifeq ($(CONFIG_EC_51NB_NPCE985LA0DX_FIRMWARE),)
 	printf "\n** WARNING **\n"
 	printf "You haven't added the firmware blobs for 51NB EC.\n"
diff --git a/src/ec/hp/kbc1126/Makefile.inc b/src/ec/hp/kbc1126/Makefile.inc
index 3f7fa19b5d..5f22e132e2 100644
--- a/src/ec/hp/kbc1126/Makefile.inc
+++ b/src/ec/hp/kbc1126/Makefile.inc
@@ -17,7 +17,7 @@ ecfw2.bin-position := $(CONFIG_KBC1126_FW2_OFFSET)
 ecfw2.bin-type := raw
 endif
 
-build_complete::
+show_notices::
 ifeq ($(CONFIG_KBC1126_FIRMWARE),)
 	printf "\n** WARNING **\n"
 	printf "You haven't added the firmware blobs for KBC1126 EC.\n"
diff --git a/src/ec/starlabs/merlin/Makefile.inc b/src/ec/starlabs/merlin/Makefile.inc
index ac0d5e3fee..841b65959a 100644
--- a/src/ec/starlabs/merlin/Makefile.inc
+++ b/src/ec/starlabs/merlin/Makefile.inc
@@ -15,7 +15,7 @@ ifeq ($(CONFIG_EC_STARLABS_ADD_ITE_BIN),y)
 add_ite_fw: $(obj)/coreboot.pre
 	$(CBFSTOOL) $(obj)/coreboot.pre write -r EC -f $(CONFIG_EC_STARLABS_ITE_BIN_PATH) -u
 else
-files_added:: warn_no_ite_fw
+show_notices:: warn_no_ite_fw
 
 PHONY+=warn_no_ite_fw
 warn_no_ite_fw:
diff --git a/src/mainboard/amd/birman/Makefile.inc b/src/mainboard/amd/birman/Makefile.inc
index 079e72b615..4dba53e6de 100644
--- a/src/mainboard/amd/birman/Makefile.inc
+++ b/src/mainboard/amd/birman/Makefile.inc
@@ -16,7 +16,7 @@ ifneq ($(wildcard $(MAINBOARD_BLOBS_DIR)/APCB_FP8_LPDDR5.bin),)
 APCB_SOURCES = $(MAINBOARD_BLOBS_DIR)/APCB_FP8_LPDDR5.bin
 APCB_SOURCES_RECOVERY = $(MAINBOARD_BLOBS_DIR)/APCB_FP8_LPDDR5_DefaultRecovery.bin
 else
-files_added:: warn_no_apcb
+show_notices:: warn_no_apcb
 endif
 
 ifeq ($(CONFIG_BIRMAN_HAVE_MCHP_FW),y)
@@ -25,7 +25,7 @@ $(call add_intermediate, add_mchp_fw)
 	$(CBFSTOOL) $(obj)/coreboot.pre write -r EC_BODY -f $(CONFIG_BIRMAN_MCHP_FW_FILE) --fill-upward
 
 else
-files_added:: warn_no_mchp
+show_notices:: warn_no_mchp
 endif # CONFIG_BIRMAN_HAVE_MCHP_FW
 
 PHONY+=warn_no_mchp
diff --git a/src/mainboard/amd/chausie/Makefile.inc b/src/mainboard/amd/chausie/Makefile.inc
index d2fd1851ff..a5954362ce 100644
--- a/src/mainboard/amd/chausie/Makefile.inc
+++ b/src/mainboard/amd/chausie/Makefile.inc
@@ -14,7 +14,7 @@ ifneq ($(wildcard $(MAINBOARD_BLOBS_DIR)/APCB_FT6.bin),)
 APCB_SOURCES = $(MAINBOARD_BLOBS_DIR)/APCB_FT6.bin
 APCB_SOURCES_RECOVERY = $(MAINBOARD_BLOBS_DIR)/APCB_FT6_DefaultRecovery.bin
 else
-files_added:: warn_no_apcb
+show_notices:: warn_no_apcb
 endif
 
 ifeq ($(CONFIG_CHAUSIE_HAVE_MCHP_FW),y)
@@ -32,7 +32,7 @@ ec/ecfw-position := $(CHAUSIE_EC_POSITION)
 ec/ecfw-type := raw
 
 else
-files_added:: warn_no_mchp
+show_notices:: warn_no_mchp
 endif # CONFIG_CHAUSIE_HAVE_MCHP_FW
 
 PHONY+=warn_no_mchp
diff --git a/src/mainboard/amd/majolica/Makefile.inc b/src/mainboard/amd/majolica/Makefile.inc
index dbd3a22442..8aaec21cdc 100644
--- a/src/mainboard/amd/majolica/Makefile.inc
+++ b/src/mainboard/amd/majolica/Makefile.inc
@@ -15,7 +15,7 @@ ifeq ($(CONFIG_MAJOLICA_HAVE_MCHP_FW),y)
 $(call add_intermediate, add_mchp_fw)
 	$(CBFSTOOL) $< write -r EC -f $(CONFIG_MAJOLICA_MCHP_FW_FILE) --fill-upward
 else
-files_added:: warn_no_mchp
+show_notices:: warn_no_mchp
 endif # CONFIG_MAJOLICA_HAVE_MCHP_FW
 
 PHONY+=warn_no_mchp
diff --git a/src/mainboard/amd/mandolin/Makefile.inc b/src/mainboard/amd/mandolin/Makefile.inc
index 6d11ee02bf..15d69d525a 100644
--- a/src/mainboard/amd/mandolin/Makefile.inc
+++ b/src/mainboard/amd/mandolin/Makefile.inc
@@ -22,7 +22,7 @@ $(call add_intermediate, add_mchp_fw)
 	$(CBFSTOOL) $< write -r EC -f $(CONFIG_MANDOLIN_MCHP_FW_FILE) --fill-upward
 
 else
-files_added:: warn_no_mchp
+show_notices:: warn_no_mchp
 endif # CONFIG_MANDOLIN_HAVE_MCHP_FW
 
 PHONY+=warn_no_mchp
diff --git a/src/mainboard/amd/mayan/Makefile.inc b/src/mainboard/amd/mayan/Makefile.inc
index 08a73546a3..6315fc27e3 100644
--- a/src/mainboard/amd/mayan/Makefile.inc
+++ b/src/mainboard/amd/mayan/Makefile.inc
@@ -14,7 +14,7 @@ ifneq ($(wildcard $(MAINBOARD_BLOBS_DIR)/APCB_Updatable.bin),)
 APCB_SOURCES = $(MAINBOARD_BLOBS_DIR)/APCB_Updatable.bin
 APCB_SOURCES_RECOVERY = $(MAINBOARD_BLOBS_DIR)/APCB_DefaultRecovery.bin
 else
-files_added:: warn_no_apcb
+show_notices:: warn_no_apcb
 endif
 
 ifeq ($(CONFIG_MAYAN_HAVE_MCHP_FW),y)
@@ -27,7 +27,7 @@ ec/ecfw-position := $(CONFIG_MAYAN_MCHP_FW_OFFSET)
 ec/ecfw-type := raw
 
 else
-files_added:: warn_no_mchp
+show_notices:: warn_no_mchp
 endif # CONFIG_MAYAN_HAVE_MCHP_FW
 
 PHONY+=warn_no_mchp
diff --git a/src/mainboard/amd/onyx_poc/Makefile.inc b/src/mainboard/amd/onyx_poc/Makefile.inc
index 323f9ee51e..4ebcf26d9c 100644
--- a/src/mainboard/amd/onyx_poc/Makefile.inc
+++ b/src/mainboard/amd/onyx_poc/Makefile.inc
@@ -7,5 +7,5 @@ APCB_SOURCES_RECOVERY = $(MAINBOARD_BLOBS_DIR)/Typex68_0_0_0_ApcbRec.bin
 APCB_SOURCES_RECOVERY1 = $(MAINBOARD_BLOBS_DIR)/Typex68_0_8_0_ApcbRec.bin
 APCB_SOURCES_RECOVERY2 = $(MAINBOARD_BLOBS_DIR)/Typex68_0_9_0_ApcbRec.bin
 else
-files_added:: warn_no_apcb
+show_notices:: warn_no_apcb
 endif
diff --git a/src/mainboard/google/myst/Makefile.inc b/src/mainboard/google/myst/Makefile.inc
index 59c11f46f1..4c5f80db8b 100644
--- a/src/mainboard/google/myst/Makefile.inc
+++ b/src/mainboard/google/myst/Makefile.inc
@@ -42,10 +42,10 @@ $(obj)/$(APCB_NAME).gen: $(SPD_SOURCES) \
 			     --spd_sources $(SPD_SOURCES)
 else
 $(info SPD sources not found.  Skipping APCB.)
-files_added:: die_no_apcb
+show_notices:: die_no_apcb
 endif
 
 else
 $(info APCB sources not found.  Skipping APCB.)
-files_added:: warn_no_apcb
+show_notices:: warn_no_apcb
 endif
diff --git a/src/mainboard/google/skyrim/Makefile.inc b/src/mainboard/google/skyrim/Makefile.inc
index f4f9d68537..2b65b3f212 100644
--- a/src/mainboard/google/skyrim/Makefile.inc
+++ b/src/mainboard/google/skyrim/Makefile.inc
@@ -40,9 +40,9 @@ $(obj)/$(APCB_NAME).gen: $(SPD_SOURCES) \
 			     --mem_type 'lp5'
 else
 $(info SPD sources not found.  Skipping APCB.)
-files_added:: die_no_apcb
+show_notices:: die_no_apcb
 endif
 else
 $(info APCB sources not found.  Skipping APCB.)
-files_added:: die_no_apcb
+show_notices:: die_no_apcb
 endif
diff --git a/src/security/intel/cbnt/Makefile.inc b/src/security/intel/cbnt/Makefile.inc
index e166634351..e912bf0726 100644
--- a/src/security/intel/cbnt/Makefile.inc
+++ b/src/security/intel/cbnt/Makefile.inc
@@ -74,6 +74,8 @@ endif
 
 ifeq ($(CONFIG_INTEL_CBNT_BPM_ONLY_UNSIGNED),y)
 build_complete:: $(obj)/bpm_unsigned.bin
+
+show_notices::
 	@printf "\n** WARNING **\n"
 	@printf "Build generated an unsigned BPM image: build/bpm_unsigned.bin.\n"
 	@printf "The resulting image will not work with CBnT.\n"
@@ -141,7 +143,7 @@ ifeq ($(CONFIG_INTEL_CBNT_KM_ONLY_UNSIGNED),y)
 $(call add_intermediate, gen_unsigned_km, $(obj)/km_unsigned.bin)
 	@printf "Generating unsgined KM\n"
 
-build_complete::
+show_notices::
 	@printf "\n** WARNING **\n"
 	@printf "Build generated an unsigned KM image: build/km_unsiged.bin.\n"
 	@printf "The resulting image will not work with CBnT.\n"
diff --git a/src/security/vboot/Makefile.inc b/src/security/vboot/Makefile.inc
index f5e7420e07..fadc67320f 100644
--- a/src/security/vboot/Makefile.inc
+++ b/src/security/vboot/Makefile.inc
@@ -386,7 +386,7 @@ files_added:: $(obj)/coreboot.rom $(FUTILITY) $(CBFSTOOL)
 		printf "    FLASHMAP Layout generated for RO and A partition.\n"; \
 	fi
 else
-files_added::
+show_notices::
 	@printf "    FLASHMAP Layout generated for RO partition only.\n"
 	@printf "             Beware that there is no failure safety in case of update now!\n"
 endif
diff --git a/src/soc/amd/stoneyridge/Makefile.inc b/src/soc/amd/stoneyridge/Makefile.inc
index 93f3a920f6..c1c74ea2ea 100644
--- a/src/soc/amd/stoneyridge/Makefile.inc
+++ b/src/soc/amd/stoneyridge/Makefile.inc
@@ -185,7 +185,7 @@ warn_no_amdfw:
 
 PHONY+=warn_no_amdfw
 
-files_added:: warn_no_amdfw
+show_notices:: warn_no_amdfw
 
 endif # ifneq ($(FIRMWARE_LOCATION),)
 
diff --git a/src/southbridge/intel/common/firmware/Makefile.inc b/src/southbridge/intel/common/firmware/Makefile.inc
index 32b4eb5858..1425d5a352 100644
--- a/src/southbridge/intel/common/firmware/Makefile.inc
+++ b/src/southbridge/intel/common/firmware/Makefile.inc
@@ -9,7 +9,7 @@ ifeq ($(CONFIG_HAVE_INTEL_FIRMWARE),y)
 ifeq ($(CONFIG_HAVE_IFD_BIN),y)
 $(call add_intermediate, add_intel_firmware)
 else ifeq ($(CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED),y)
-files_added:: warn_intel_firmware
+show_notices:: warn_intel_firmware
 endif
 
 IFD_BIN_PATH := $(CONFIG_IFD_BIN_PATH)
diff --git a/src/vendorcode/amd/pi/00670F00/Makefile.inc b/src/vendorcode/amd/pi/00670F00/Makefile.inc
index 08c8c1b039..330bfd7631 100644
--- a/src/vendorcode/amd/pi/00670F00/Makefile.inc
+++ b/src/vendorcode/amd/pi/00670F00/Makefile.inc
@@ -103,7 +103,7 @@ AGESA_POST_MEM_INPUT_ELF = $(call strip_quotes,$(CONFIG_AGESA_POST_MEMORY_BINARY
 
 # If no post-mem file then also skip pre-mem file
 ifeq ($(AGESA_POST_MEM_INPUT_ELF),)
-files_added:: warn_no_agesa
+show_notices:: warn_no_agesa
 else
 AGESA_POST_MEM_ELF = $(objcbfs)/$(patsubst %.elf,%.debug,$(notdir $(AGESA_POST_MEM_INPUT_ELF)))
 AGESA_POST_MEM_ELF_RMOD = $(AGESA_POST_MEM_ELF).rmod
@@ -132,7 +132,7 @@ else # CONFIG_AGESA_SPLIT_MEMORY_FILES
 
 AGESA_BINARYPI_INPUT_FILE = $(call strip_quotes,$(CONFIG_AGESA_BINARY_PI_FILE))
 ifeq ($(AGESA_BINARYPI_INPUT_FILE),)
-files_added:: warn_no_agesa
+show_notices:: warn_no_agesa
 else
 
 cbfs-files-y += $(CONFIG_AGESA_CBFS_NAME)