treewide: Use show_notices target for warnings

This updates all warnings currently being printed under the files_added
and build_complete targets to the show_notices target.

Signed-off-by: Martin Roth <gaumless@gmail.com>
Change-Id: Ia14d790dd377f2892f047059b6d24e5b5c5ea823
Reviewed-on: https://review.coreboot.org/c/coreboot/+/79423
Reviewed-by: Felix Singer <service+coreboot-gerrit@felixsinger.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Martin Roth 2023-12-08 00:43:23 -07:00 committed by Felix Singer
parent 0cec2351e2
commit 372503fba6
18 changed files with 26 additions and 24 deletions

View File

@ -50,7 +50,7 @@ print-repo-info-payloads:
-$(foreach payload, $(PAYLOADS_LIST), $(MAKE) -C $(payload) print-repo-info 2>/dev/null; ) -$(foreach payload, $(PAYLOADS_LIST), $(MAKE) -C $(payload) print-repo-info 2>/dev/null; )
ifeq ($(CONFIG_PAYLOAD_NONE),y) ifeq ($(CONFIG_PAYLOAD_NONE),y)
files_added:: warn_no_payload show_notices:: warn_no_payload
endif endif
warn_no_payload: warn_no_payload:

View File

@ -162,7 +162,7 @@ $(error No second FSP-S binary file specified.)
endif # CONFIG_FSP_S_FILE_2 endif # CONFIG_FSP_S_FILE_2
endif # CONFIG_PLATFORM_USES_SECOND_FSP endif # CONFIG_PLATFORM_USES_SECOND_FSP
else # CONFIG_ADD_FSP_BINARIES else # CONFIG_ADD_FSP_BINARIES
build_complete:: warn_no_fsp_binaries show_notices:: warn_no_fsp_binaries
endif # CONFIG_ADD_FSP_BINARIES endif # CONFIG_ADD_FSP_BINARIES
PHONY+=warn_no_fsp_binaries PHONY+=warn_no_fsp_binaries

View File

@ -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 $(CBFSTOOL) $(obj)/coreboot.rom write -r EC -f $(CONFIG_EC_51NB_NPCE985LA0DX_FW) --fill-upward
endif endif
build_complete:: show_notices::
ifeq ($(CONFIG_EC_51NB_NPCE985LA0DX_FIRMWARE),) ifeq ($(CONFIG_EC_51NB_NPCE985LA0DX_FIRMWARE),)
printf "\n** WARNING **\n" printf "\n** WARNING **\n"
printf "You haven't added the firmware blobs for 51NB EC.\n" printf "You haven't added the firmware blobs for 51NB EC.\n"

View File

@ -17,7 +17,7 @@ ecfw2.bin-position := $(CONFIG_KBC1126_FW2_OFFSET)
ecfw2.bin-type := raw ecfw2.bin-type := raw
endif endif
build_complete:: show_notices::
ifeq ($(CONFIG_KBC1126_FIRMWARE),) ifeq ($(CONFIG_KBC1126_FIRMWARE),)
printf "\n** WARNING **\n" printf "\n** WARNING **\n"
printf "You haven't added the firmware blobs for KBC1126 EC.\n" printf "You haven't added the firmware blobs for KBC1126 EC.\n"

View File

@ -15,7 +15,7 @@ ifeq ($(CONFIG_EC_STARLABS_ADD_ITE_BIN),y)
add_ite_fw: $(obj)/coreboot.pre add_ite_fw: $(obj)/coreboot.pre
$(CBFSTOOL) $(obj)/coreboot.pre write -r EC -f $(CONFIG_EC_STARLABS_ITE_BIN_PATH) -u $(CBFSTOOL) $(obj)/coreboot.pre write -r EC -f $(CONFIG_EC_STARLABS_ITE_BIN_PATH) -u
else else
files_added:: warn_no_ite_fw show_notices:: warn_no_ite_fw
PHONY+=warn_no_ite_fw PHONY+=warn_no_ite_fw
warn_no_ite_fw: warn_no_ite_fw:

View File

@ -16,7 +16,7 @@ ifneq ($(wildcard $(MAINBOARD_BLOBS_DIR)/APCB_FP8_LPDDR5.bin),)
APCB_SOURCES = $(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 APCB_SOURCES_RECOVERY = $(MAINBOARD_BLOBS_DIR)/APCB_FP8_LPDDR5_DefaultRecovery.bin
else else
files_added:: warn_no_apcb show_notices:: warn_no_apcb
endif endif
ifeq ($(CONFIG_BIRMAN_HAVE_MCHP_FW),y) 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 $(CBFSTOOL) $(obj)/coreboot.pre write -r EC_BODY -f $(CONFIG_BIRMAN_MCHP_FW_FILE) --fill-upward
else else
files_added:: warn_no_mchp show_notices:: warn_no_mchp
endif # CONFIG_BIRMAN_HAVE_MCHP_FW endif # CONFIG_BIRMAN_HAVE_MCHP_FW
PHONY+=warn_no_mchp PHONY+=warn_no_mchp

View File

@ -14,7 +14,7 @@ ifneq ($(wildcard $(MAINBOARD_BLOBS_DIR)/APCB_FT6.bin),)
APCB_SOURCES = $(MAINBOARD_BLOBS_DIR)/APCB_FT6.bin APCB_SOURCES = $(MAINBOARD_BLOBS_DIR)/APCB_FT6.bin
APCB_SOURCES_RECOVERY = $(MAINBOARD_BLOBS_DIR)/APCB_FT6_DefaultRecovery.bin APCB_SOURCES_RECOVERY = $(MAINBOARD_BLOBS_DIR)/APCB_FT6_DefaultRecovery.bin
else else
files_added:: warn_no_apcb show_notices:: warn_no_apcb
endif endif
ifeq ($(CONFIG_CHAUSIE_HAVE_MCHP_FW),y) ifeq ($(CONFIG_CHAUSIE_HAVE_MCHP_FW),y)
@ -32,7 +32,7 @@ ec/ecfw-position := $(CHAUSIE_EC_POSITION)
ec/ecfw-type := raw ec/ecfw-type := raw
else else
files_added:: warn_no_mchp show_notices:: warn_no_mchp
endif # CONFIG_CHAUSIE_HAVE_MCHP_FW endif # CONFIG_CHAUSIE_HAVE_MCHP_FW
PHONY+=warn_no_mchp PHONY+=warn_no_mchp

View File

@ -15,7 +15,7 @@ ifeq ($(CONFIG_MAJOLICA_HAVE_MCHP_FW),y)
$(call add_intermediate, add_mchp_fw) $(call add_intermediate, add_mchp_fw)
$(CBFSTOOL) $< write -r EC -f $(CONFIG_MAJOLICA_MCHP_FW_FILE) --fill-upward $(CBFSTOOL) $< write -r EC -f $(CONFIG_MAJOLICA_MCHP_FW_FILE) --fill-upward
else else
files_added:: warn_no_mchp show_notices:: warn_no_mchp
endif # CONFIG_MAJOLICA_HAVE_MCHP_FW endif # CONFIG_MAJOLICA_HAVE_MCHP_FW
PHONY+=warn_no_mchp PHONY+=warn_no_mchp

View File

@ -22,7 +22,7 @@ $(call add_intermediate, add_mchp_fw)
$(CBFSTOOL) $< write -r EC -f $(CONFIG_MANDOLIN_MCHP_FW_FILE) --fill-upward $(CBFSTOOL) $< write -r EC -f $(CONFIG_MANDOLIN_MCHP_FW_FILE) --fill-upward
else else
files_added:: warn_no_mchp show_notices:: warn_no_mchp
endif # CONFIG_MANDOLIN_HAVE_MCHP_FW endif # CONFIG_MANDOLIN_HAVE_MCHP_FW
PHONY+=warn_no_mchp PHONY+=warn_no_mchp

View File

@ -14,7 +14,7 @@ ifneq ($(wildcard $(MAINBOARD_BLOBS_DIR)/APCB_Updatable.bin),)
APCB_SOURCES = $(MAINBOARD_BLOBS_DIR)/APCB_Updatable.bin APCB_SOURCES = $(MAINBOARD_BLOBS_DIR)/APCB_Updatable.bin
APCB_SOURCES_RECOVERY = $(MAINBOARD_BLOBS_DIR)/APCB_DefaultRecovery.bin APCB_SOURCES_RECOVERY = $(MAINBOARD_BLOBS_DIR)/APCB_DefaultRecovery.bin
else else
files_added:: warn_no_apcb show_notices:: warn_no_apcb
endif endif
ifeq ($(CONFIG_MAYAN_HAVE_MCHP_FW),y) ifeq ($(CONFIG_MAYAN_HAVE_MCHP_FW),y)
@ -27,7 +27,7 @@ ec/ecfw-position := $(CONFIG_MAYAN_MCHP_FW_OFFSET)
ec/ecfw-type := raw ec/ecfw-type := raw
else else
files_added:: warn_no_mchp show_notices:: warn_no_mchp
endif # CONFIG_MAYAN_HAVE_MCHP_FW endif # CONFIG_MAYAN_HAVE_MCHP_FW
PHONY+=warn_no_mchp PHONY+=warn_no_mchp

View File

@ -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_RECOVERY1 = $(MAINBOARD_BLOBS_DIR)/Typex68_0_8_0_ApcbRec.bin
APCB_SOURCES_RECOVERY2 = $(MAINBOARD_BLOBS_DIR)/Typex68_0_9_0_ApcbRec.bin APCB_SOURCES_RECOVERY2 = $(MAINBOARD_BLOBS_DIR)/Typex68_0_9_0_ApcbRec.bin
else else
files_added:: warn_no_apcb show_notices:: warn_no_apcb
endif endif

View File

@ -42,10 +42,10 @@ $(obj)/$(APCB_NAME).gen: $(SPD_SOURCES) \
--spd_sources $(SPD_SOURCES) --spd_sources $(SPD_SOURCES)
else else
$(info SPD sources not found. Skipping APCB.) $(info SPD sources not found. Skipping APCB.)
files_added:: die_no_apcb show_notices:: die_no_apcb
endif endif
else else
$(info APCB sources not found. Skipping APCB.) $(info APCB sources not found. Skipping APCB.)
files_added:: warn_no_apcb show_notices:: warn_no_apcb
endif endif

View File

@ -40,9 +40,9 @@ $(obj)/$(APCB_NAME).gen: $(SPD_SOURCES) \
--mem_type 'lp5' --mem_type 'lp5'
else else
$(info SPD sources not found. Skipping APCB.) $(info SPD sources not found. Skipping APCB.)
files_added:: die_no_apcb show_notices:: die_no_apcb
endif endif
else else
$(info APCB sources not found. Skipping APCB.) $(info APCB sources not found. Skipping APCB.)
files_added:: die_no_apcb show_notices:: die_no_apcb
endif endif

View File

@ -74,6 +74,8 @@ endif
ifeq ($(CONFIG_INTEL_CBNT_BPM_ONLY_UNSIGNED),y) ifeq ($(CONFIG_INTEL_CBNT_BPM_ONLY_UNSIGNED),y)
build_complete:: $(obj)/bpm_unsigned.bin build_complete:: $(obj)/bpm_unsigned.bin
show_notices::
@printf "\n** WARNING **\n" @printf "\n** WARNING **\n"
@printf "Build generated an unsigned BPM image: build/bpm_unsigned.bin.\n" @printf "Build generated an unsigned BPM image: build/bpm_unsigned.bin.\n"
@printf "The resulting image will not work with CBnT.\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) $(call add_intermediate, gen_unsigned_km, $(obj)/km_unsigned.bin)
@printf "Generating unsgined KM\n" @printf "Generating unsgined KM\n"
build_complete:: show_notices::
@printf "\n** WARNING **\n" @printf "\n** WARNING **\n"
@printf "Build generated an unsigned KM image: build/km_unsiged.bin.\n" @printf "Build generated an unsigned KM image: build/km_unsiged.bin.\n"
@printf "The resulting image will not work with CBnT.\n" @printf "The resulting image will not work with CBnT.\n"

View File

@ -386,7 +386,7 @@ files_added:: $(obj)/coreboot.rom $(FUTILITY) $(CBFSTOOL)
printf " FLASHMAP Layout generated for RO and A partition.\n"; \ printf " FLASHMAP Layout generated for RO and A partition.\n"; \
fi fi
else else
files_added:: show_notices::
@printf " FLASHMAP Layout generated for RO partition only.\n" @printf " FLASHMAP Layout generated for RO partition only.\n"
@printf " Beware that there is no failure safety in case of update now!\n" @printf " Beware that there is no failure safety in case of update now!\n"
endif endif

View File

@ -185,7 +185,7 @@ warn_no_amdfw:
PHONY+=warn_no_amdfw PHONY+=warn_no_amdfw
files_added:: warn_no_amdfw show_notices:: warn_no_amdfw
endif # ifneq ($(FIRMWARE_LOCATION),) endif # ifneq ($(FIRMWARE_LOCATION),)

View File

@ -9,7 +9,7 @@ ifeq ($(CONFIG_HAVE_INTEL_FIRMWARE),y)
ifeq ($(CONFIG_HAVE_IFD_BIN),y) ifeq ($(CONFIG_HAVE_IFD_BIN),y)
$(call add_intermediate, add_intel_firmware) $(call add_intermediate, add_intel_firmware)
else ifeq ($(CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED),y) else ifeq ($(CONFIG_INTEL_DESCRIPTOR_MODE_REQUIRED),y)
files_added:: warn_intel_firmware show_notices:: warn_intel_firmware
endif endif
IFD_BIN_PATH := $(CONFIG_IFD_BIN_PATH) IFD_BIN_PATH := $(CONFIG_IFD_BIN_PATH)

View File

@ -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 # If no post-mem file then also skip pre-mem file
ifeq ($(AGESA_POST_MEM_INPUT_ELF),) ifeq ($(AGESA_POST_MEM_INPUT_ELF),)
files_added:: warn_no_agesa show_notices:: warn_no_agesa
else else
AGESA_POST_MEM_ELF = $(objcbfs)/$(patsubst %.elf,%.debug,$(notdir $(AGESA_POST_MEM_INPUT_ELF))) AGESA_POST_MEM_ELF = $(objcbfs)/$(patsubst %.elf,%.debug,$(notdir $(AGESA_POST_MEM_INPUT_ELF)))
AGESA_POST_MEM_ELF_RMOD = $(AGESA_POST_MEM_ELF).rmod 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)) AGESA_BINARYPI_INPUT_FILE = $(call strip_quotes,$(CONFIG_AGESA_BINARY_PI_FILE))
ifeq ($(AGESA_BINARYPI_INPUT_FILE),) ifeq ($(AGESA_BINARYPI_INPUT_FILE),)
files_added:: warn_no_agesa show_notices:: warn_no_agesa
else else
cbfs-files-y += $(CONFIG_AGESA_CBFS_NAME) cbfs-files-y += $(CONFIG_AGESA_CBFS_NAME)