From e3df18451c518c0019f35b9b4d5d06ff6bd3d5f2 Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Thu, 18 Jan 2024 10:25:18 -0700 Subject: Makefiles: Rename top-level Makefiles from .inc to .mk The .inc suffix is confusing to various tools as it's not specific to Makefiles. This means that editors don't recognize the files, and don't open them with highlighting and any other specific editor functionality. This issue is also seen in the release notes generation script where Makefiles get renamed before running cloc. The rest of the Makefiles will be renamed in following commits. Signed-off-by: Martin Roth Change-Id: Idaf69c6871d0bc1ee5e2e53157b8631c55eb3db9 Reviewed-on: https://review.coreboot.org/c/coreboot/+/80063 Reviewed-by: Felix Singer Reviewed-by: Maximilian Brune Tested-by: build bot (Jenkins) Reviewed-by: Nico Huber --- payloads/Makefile.inc | 64 -------------------------------------------- payloads/Makefile.mk | 64 ++++++++++++++++++++++++++++++++++++++++++++ payloads/coreinfo/Makefile | 2 +- payloads/libpayload/Makefile | 4 +-- 4 files changed, 67 insertions(+), 67 deletions(-) delete mode 100644 payloads/Makefile.inc create mode 100644 payloads/Makefile.mk (limited to 'payloads') diff --git a/payloads/Makefile.inc b/payloads/Makefile.inc deleted file mode 100644 index a2336aa876a7..000000000000 --- a/payloads/Makefile.inc +++ /dev/null @@ -1,64 +0,0 @@ -## -## -## Copyright (C) 2016 Google Inc. -## -## SPDX-License-Identifier: GPL-2.0-only - -cbfs-files-$(CONFIG_COREINFO_SECONDARY_PAYLOAD) += img/coreinfo -img/coreinfo-file := payloads/coreinfo/build/coreinfo.elf -img/coreinfo-type := payload -img/coreinfo-compression := $(CBFS_SECONDARY_PAYLOAD_COMPRESS_FLAG) - -cbfs-files-$(CONFIG_NVRAMCUI_SECONDARY_PAYLOAD) += img/nvramcui -img/nvramcui-file := payloads/nvramcui/build/nvramcui.elf -img/nvramcui-type := payload -img/nvramcui-compression := $(CBFS_SECONDARY_PAYLOAD_COMPRESS_FLAG) - -PAYLOADS_LIST=\ -payloads/coreinfo \ -payloads/nvramcui \ -payloads/libpayload \ -payloads/external/depthcharge \ -payloads/external/SeaBIOS \ -payloads/external/U-Boot \ -payloads/external/Memtest86Plus \ -payloads/external/iPXE \ -payloads/external/tint \ -payloads/external/edk2 \ -payloads/external/GRUB2 \ -payloads/external/LinuxBoot \ -payloads/external/skiboot \ -payloads/external/coreDOOM \ - -force-payload: - -payloads/coreinfo/build/coreinfo.elf coreinfo: export CCACHE := $(CCACHE) -payloads/coreinfo/build/coreinfo.elf coreinfo: force-payload - $(MAKE) -C payloads/coreinfo defaultbuild - -payloads/nvramcui/build/nvramcui.elf nvramcui: export CCACHE := $(CCACHE) -payloads/nvramcui/build/nvramcui.elf nvramcui: force-payload - $(MAKE) -C payloads/nvramcui - -clean-payloads: - $(foreach payload, $(PAYLOADS_LIST), $(MAKE) -C $(payload) clean; ) - -distclean-payloads: - $(foreach payload, $(PAYLOADS_LIST), $(MAKE) -C $(payload) distclean; ) - -print-repo-info-payloads: - -$(foreach payload, $(PAYLOADS_LIST), $(MAKE) -C $(payload) print-repo-info 2>/dev/null; ) - -ifeq ($(CONFIG_PAYLOAD_NONE),y) -show_notices:: warn_no_payload -endif - -warn_no_payload: - printf "\n\t** WARNING **\n" - printf "coreboot has been built without a payload. Writing\n" - printf "a coreboot image without a payload to your board's\n" - printf "flash chip will result in a non-booting system. You\n" - printf "can use cbfstool to add a payload to the image.\n\n" - -.PHONY: force-payload coreinfo nvramcui -.PHONY: clean-payloads distclean-payloads print-repo-info-payloads warn_no_payload diff --git a/payloads/Makefile.mk b/payloads/Makefile.mk new file mode 100644 index 000000000000..a2336aa876a7 --- /dev/null +++ b/payloads/Makefile.mk @@ -0,0 +1,64 @@ +## +## +## Copyright (C) 2016 Google Inc. +## +## SPDX-License-Identifier: GPL-2.0-only + +cbfs-files-$(CONFIG_COREINFO_SECONDARY_PAYLOAD) += img/coreinfo +img/coreinfo-file := payloads/coreinfo/build/coreinfo.elf +img/coreinfo-type := payload +img/coreinfo-compression := $(CBFS_SECONDARY_PAYLOAD_COMPRESS_FLAG) + +cbfs-files-$(CONFIG_NVRAMCUI_SECONDARY_PAYLOAD) += img/nvramcui +img/nvramcui-file := payloads/nvramcui/build/nvramcui.elf +img/nvramcui-type := payload +img/nvramcui-compression := $(CBFS_SECONDARY_PAYLOAD_COMPRESS_FLAG) + +PAYLOADS_LIST=\ +payloads/coreinfo \ +payloads/nvramcui \ +payloads/libpayload \ +payloads/external/depthcharge \ +payloads/external/SeaBIOS \ +payloads/external/U-Boot \ +payloads/external/Memtest86Plus \ +payloads/external/iPXE \ +payloads/external/tint \ +payloads/external/edk2 \ +payloads/external/GRUB2 \ +payloads/external/LinuxBoot \ +payloads/external/skiboot \ +payloads/external/coreDOOM \ + +force-payload: + +payloads/coreinfo/build/coreinfo.elf coreinfo: export CCACHE := $(CCACHE) +payloads/coreinfo/build/coreinfo.elf coreinfo: force-payload + $(MAKE) -C payloads/coreinfo defaultbuild + +payloads/nvramcui/build/nvramcui.elf nvramcui: export CCACHE := $(CCACHE) +payloads/nvramcui/build/nvramcui.elf nvramcui: force-payload + $(MAKE) -C payloads/nvramcui + +clean-payloads: + $(foreach payload, $(PAYLOADS_LIST), $(MAKE) -C $(payload) clean; ) + +distclean-payloads: + $(foreach payload, $(PAYLOADS_LIST), $(MAKE) -C $(payload) distclean; ) + +print-repo-info-payloads: + -$(foreach payload, $(PAYLOADS_LIST), $(MAKE) -C $(payload) print-repo-info 2>/dev/null; ) + +ifeq ($(CONFIG_PAYLOAD_NONE),y) +show_notices:: warn_no_payload +endif + +warn_no_payload: + printf "\n\t** WARNING **\n" + printf "coreboot has been built without a payload. Writing\n" + printf "a coreboot image without a payload to your board's\n" + printf "flash chip will result in a non-booting system. You\n" + printf "can use cbfstool to add a payload to the image.\n\n" + +.PHONY: force-payload coreinfo nvramcui +.PHONY: clean-payloads distclean-payloads print-repo-info-payloads warn_no_payload diff --git a/payloads/coreinfo/Makefile b/payloads/coreinfo/Makefile index 096e9c60cf4f..9655e24cc333 100644 --- a/payloads/coreinfo/Makefile +++ b/payloads/coreinfo/Makefile @@ -70,7 +70,7 @@ $(obj)/config.h: $(shell mkdir -p $(objk)/lxdialog $(KCONFIG_SPLITCONFIG)) -include $(srck)/Makefile.inc +include $(srck)/Makefile.mk .PHONY: $(PHONY) prepare all real-all defaultbuild diff --git a/payloads/libpayload/Makefile b/payloads/libpayload/Makefile index 0104a11fbc1c..212e67ea7965 100644 --- a/payloads/libpayload/Makefile +++ b/payloads/libpayload/Makefile @@ -103,7 +103,7 @@ endif # This include must come _before_ the pattern rules below! # Order _does_ matter for pattern rules. -include $(srck)/Makefile.inc +include $(srck)/Makefile.mk include $(HAVE_DOTCONFIG) @@ -127,7 +127,7 @@ ARCH-$(CONFIG_LP_ARCH_MOCK) := mock # 3. when make distclean is run # 4. when make help% or make clean% is run # 5. when make %-test or make %-tests or make %coverage-report is run -# Don't waste time on reading all Makefile.incs in these cases +# Don't waste time on reading all Makefiles in these cases ifeq ($(strip $(HAVE_DOTCONFIG)),) NOCOMPILE := 1 endif -- cgit v1.2.3