Attention is currently required from: Jakub Czapiga, Julius Werner, Stefan Reinauer.
Martin L Roth has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/80103?usp=email )
Change subject: payloads: Rename Makefiles from .inc to .mak ......................................................................
payloads: Rename Makefiles from .inc to .mak
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.
Signed-off-by: Martin Roth gaumless@gmail.com Change-Id: Ie7038712de8cc646632d5e7d29550e3260bf2c62 --- R payloads/external/Makefile.mak M payloads/libpayload/Makefile R payloads/libpayload/Makefile.mak R payloads/libpayload/arch/arm/Makefile.mak R payloads/libpayload/arch/arm64/Makefile.mak R payloads/libpayload/arch/mock/Makefile.mak R payloads/libpayload/arch/x86/Makefile.mak R payloads/libpayload/crypto/Makefile.mak R payloads/libpayload/curses/Makefile.mak R payloads/libpayload/drivers/Makefile.mak R payloads/libpayload/gdb/Makefile.mak R payloads/libpayload/libc/Makefile.mak R payloads/libpayload/libcbfs/Makefile.mak R payloads/libpayload/liblz4/Makefile.mak R payloads/libpayload/liblzma/Makefile.mak R payloads/libpayload/libpci/Makefile.mak R payloads/libpayload/tests/Makefile.mak R payloads/libpayload/tests/drivers/Makefile.mak R payloads/libpayload/tests/libc/Makefile.mak R payloads/libpayload/tests/libcbfs/Makefile.mak R payloads/libpayload/vboot/Makefile.mak M util/lint/kconfig_lint 22 files changed, 8 insertions(+), 8 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/03/80103/1
diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.mak similarity index 100% rename from payloads/external/Makefile.inc rename to payloads/external/Makefile.mak diff --git a/payloads/libpayload/Makefile b/payloads/libpayload/Makefile index 4c72dc1..3c88e7c 100644 --- a/payloads/libpayload/Makefile +++ b/payloads/libpayload/Makefile @@ -56,7 +56,7 @@ export KBUILD_KCONFIG := Kconfig export CONFIG_ := CONFIG_LP_
-# directory containing the toplevel Makefile.inc +# directory containing the toplevel Makefile.mak TOPLEVEL := .
CONFIG_LP_SHELL := sh @@ -159,8 +159,8 @@ \mv -f $@.tmp $@ 2> /dev/null
ifeq ($(NOCOMPILE),1) -include $(TOPLEVEL)/Makefile.inc -include $(TOPLEVEL)/tests/Makefile.inc +include $(TOPLEVEL)/Makefile.mak +include $(TOPLEVEL)/tests/Makefile.mak real-all: config
else @@ -285,7 +285,7 @@ $(eval $(1):=) \ $(eval special-classes+=$(1))
-# Clean -y variables, include Makefile.inc +# Clean -y variables, include Makefile.mak # Add paths to files in X-y to X-srcs # Add subdirs-y to subdirs includemakefiles= \ @@ -308,7 +308,7 @@ $(eval cursubdirs:=$(subdirs)) \ $(eval subdirs:=) \ $(foreach dir,$(cursubdirs), \ - $(eval $(call includemakefiles,$(dir)/Makefile.inc))) \ + $(eval $(call includemakefiles,$(dir)/Makefile.mak))) \ $(if $(subdirs),$(eval $(call evaluate_subdirs)))
# collect all object files eligible for building or run unit-tests @@ -316,7 +316,7 @@ subdirs:=$(TOPLEVEL) $(eval $(call evaluate_subdirs)) else -include $(TOPLEVEL)/tests/Makefile.inc +include $(TOPLEVEL)/tests/Makefile.mak endif
# Converts one or more source file paths to the corresponding build/ paths. diff --git a/payloads/libpayload/Makefile.inc b/payloads/libpayload/Makefile.mak similarity index 100% rename from payloads/libpayload/Makefile.inc rename to payloads/libpayload/Makefile.mak diff --git a/payloads/libpayload/arch/arm/Makefile.inc b/payloads/libpayload/arch/arm/Makefile.mak similarity index 100% rename from payloads/libpayload/arch/arm/Makefile.inc rename to payloads/libpayload/arch/arm/Makefile.mak diff --git a/payloads/libpayload/arch/arm64/Makefile.inc b/payloads/libpayload/arch/arm64/Makefile.mak similarity index 100% rename from payloads/libpayload/arch/arm64/Makefile.inc rename to payloads/libpayload/arch/arm64/Makefile.mak diff --git a/payloads/libpayload/arch/mock/Makefile.inc b/payloads/libpayload/arch/mock/Makefile.mak similarity index 100% rename from payloads/libpayload/arch/mock/Makefile.inc rename to payloads/libpayload/arch/mock/Makefile.mak diff --git a/payloads/libpayload/arch/x86/Makefile.inc b/payloads/libpayload/arch/x86/Makefile.mak similarity index 100% rename from payloads/libpayload/arch/x86/Makefile.inc rename to payloads/libpayload/arch/x86/Makefile.mak diff --git a/payloads/libpayload/crypto/Makefile.inc b/payloads/libpayload/crypto/Makefile.mak similarity index 100% rename from payloads/libpayload/crypto/Makefile.inc rename to payloads/libpayload/crypto/Makefile.mak diff --git a/payloads/libpayload/curses/Makefile.inc b/payloads/libpayload/curses/Makefile.mak similarity index 100% rename from payloads/libpayload/curses/Makefile.inc rename to payloads/libpayload/curses/Makefile.mak diff --git a/payloads/libpayload/drivers/Makefile.inc b/payloads/libpayload/drivers/Makefile.mak similarity index 100% rename from payloads/libpayload/drivers/Makefile.inc rename to payloads/libpayload/drivers/Makefile.mak diff --git a/payloads/libpayload/gdb/Makefile.inc b/payloads/libpayload/gdb/Makefile.mak similarity index 100% rename from payloads/libpayload/gdb/Makefile.inc rename to payloads/libpayload/gdb/Makefile.mak diff --git a/payloads/libpayload/libc/Makefile.inc b/payloads/libpayload/libc/Makefile.mak similarity index 100% rename from payloads/libpayload/libc/Makefile.inc rename to payloads/libpayload/libc/Makefile.mak diff --git a/payloads/libpayload/libcbfs/Makefile.inc b/payloads/libpayload/libcbfs/Makefile.mak similarity index 100% rename from payloads/libpayload/libcbfs/Makefile.inc rename to payloads/libpayload/libcbfs/Makefile.mak diff --git a/payloads/libpayload/liblz4/Makefile.inc b/payloads/libpayload/liblz4/Makefile.mak similarity index 100% rename from payloads/libpayload/liblz4/Makefile.inc rename to payloads/libpayload/liblz4/Makefile.mak diff --git a/payloads/libpayload/liblzma/Makefile.inc b/payloads/libpayload/liblzma/Makefile.mak similarity index 100% rename from payloads/libpayload/liblzma/Makefile.inc rename to payloads/libpayload/liblzma/Makefile.mak diff --git a/payloads/libpayload/libpci/Makefile.inc b/payloads/libpayload/libpci/Makefile.mak similarity index 100% rename from payloads/libpayload/libpci/Makefile.inc rename to payloads/libpayload/libpci/Makefile.mak diff --git a/payloads/libpayload/tests/Makefile.inc b/payloads/libpayload/tests/Makefile.mak similarity index 98% rename from payloads/libpayload/tests/Makefile.inc rename to payloads/libpayload/tests/Makefile.mak index dede340..c9aca15 100644 --- a/payloads/libpayload/tests/Makefile.inc +++ b/payloads/libpayload/tests/Makefile.mak @@ -105,7 +105,7 @@ $(1)-config-file := $(testobj)/$(1)/libpayload-config.h $$($(1)-config-file): $(TEST_KCONFIG_AUTOHEADER) mkdir -p $$(dir $$@); - printf '// File generated by tests/Makefile.inc\n// Do not change\n' > $$@; + printf '// File generated by tests/Makefile.mak\n// Do not change\n' > $$@; printf '#ifndef TEST_LIBPAYLOAD_CONFIG_H_\n' >> $$@; printf '#define TEST_LIBPAYLOAD_CONFIG_H_\n' >> $$@; printf '#include <%s>\n\n' "$(notdir $(TEST_KCONFIG_AUTOHEADER))" >> $$@; diff --git a/payloads/libpayload/tests/drivers/Makefile.inc b/payloads/libpayload/tests/drivers/Makefile.mak similarity index 100% rename from payloads/libpayload/tests/drivers/Makefile.inc rename to payloads/libpayload/tests/drivers/Makefile.mak diff --git a/payloads/libpayload/tests/libc/Makefile.inc b/payloads/libpayload/tests/libc/Makefile.mak similarity index 100% rename from payloads/libpayload/tests/libc/Makefile.inc rename to payloads/libpayload/tests/libc/Makefile.mak diff --git a/payloads/libpayload/tests/libcbfs/Makefile.inc b/payloads/libpayload/tests/libcbfs/Makefile.mak similarity index 100% rename from payloads/libpayload/tests/libcbfs/Makefile.inc rename to payloads/libpayload/tests/libcbfs/Makefile.mak diff --git a/payloads/libpayload/vboot/Makefile.inc b/payloads/libpayload/vboot/Makefile.mak similarity index 100% rename from payloads/libpayload/vboot/Makefile.inc rename to payloads/libpayload/vboot/Makefile.mak diff --git a/util/lint/kconfig_lint b/util/lint/kconfig_lint index 0a43769..af85071 100755 --- a/util/lint/kconfig_lint +++ b/util/lint/kconfig_lint @@ -36,7 +36,7 @@ '^build/|^coreboot-builds/|^configs/|^util/|^.git/|^payloads|^Documentation|^3rdparty' . '|' . # directories to exclude when searching for used symbols '.config|.txt$|.tex$|.tags|/kconfig.h|.fmd'; #files to exclude when looking for symbols -my $payload_files_to_check='payloads/Makefile.mak payloads/external/Makefile.inc'; +my $payload_files_to_check='payloads/Makefile.mak payloads/external/Makefile.mak'; my $config_file = ""; # name of config file to load symbol values from. my @wholeconfig; # document the entire kconfig structure my %loaded_files; # list of each Kconfig file loaded