summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Roth <gaumless@gmail.com>2024-01-18 16:33:55 -0700
committerFelix Singer <service+coreboot-gerrit@felixsinger.de>2024-01-24 10:15:10 +0000
commit354389365bac2c972749b9fc4fd21c6cd953cb59 (patch)
treeced96887bdc48548c77ada79b4e89ba8d0fb65b3
parentfd96da95c4a36ffae8118400aa8cdab0d50b5060 (diff)
payloads: Rename 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. Signed-off-by: Martin Roth <gaumless@gmail.com> Change-Id: Ie7038712de8cc646632d5e7d29550e3260bf2c62 Reviewed-on: https://review.coreboot.org/c/coreboot/+/80103 Reviewed-by: Felix Singer <service+coreboot-gerrit@felixsinger.de> Reviewed-by: Maximilian Brune <maximilian.brune@9elements.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--payloads/external/Makefile.mk (renamed from payloads/external/Makefile.inc)0
-rw-r--r--payloads/libpayload/Makefile12
-rw-r--r--payloads/libpayload/Makefile.mk (renamed from payloads/libpayload/Makefile.inc)0
-rw-r--r--payloads/libpayload/arch/arm/Makefile.mk (renamed from payloads/libpayload/arch/arm/Makefile.inc)0
-rw-r--r--payloads/libpayload/arch/arm64/Makefile.mk (renamed from payloads/libpayload/arch/arm64/Makefile.inc)0
-rw-r--r--payloads/libpayload/arch/mock/Makefile.mk (renamed from payloads/libpayload/arch/mock/Makefile.inc)0
-rw-r--r--payloads/libpayload/arch/x86/Makefile.mk (renamed from payloads/libpayload/arch/x86/Makefile.inc)0
-rw-r--r--payloads/libpayload/crypto/Makefile.mk (renamed from payloads/libpayload/crypto/Makefile.inc)0
-rw-r--r--payloads/libpayload/curses/Makefile.mk (renamed from payloads/libpayload/curses/Makefile.inc)0
-rw-r--r--payloads/libpayload/drivers/Makefile.mk (renamed from payloads/libpayload/drivers/Makefile.inc)0
-rw-r--r--payloads/libpayload/gdb/Makefile.mk (renamed from payloads/libpayload/gdb/Makefile.inc)0
-rw-r--r--payloads/libpayload/libc/Makefile.mk (renamed from payloads/libpayload/libc/Makefile.inc)0
-rw-r--r--payloads/libpayload/libcbfs/Makefile.mk (renamed from payloads/libpayload/libcbfs/Makefile.inc)0
-rw-r--r--payloads/libpayload/liblz4/Makefile.mk (renamed from payloads/libpayload/liblz4/Makefile.inc)0
-rw-r--r--payloads/libpayload/liblzma/Makefile.mk (renamed from payloads/libpayload/liblzma/Makefile.inc)0
-rw-r--r--payloads/libpayload/libpci/Makefile.mk (renamed from payloads/libpayload/libpci/Makefile.inc)0
-rw-r--r--payloads/libpayload/tests/Makefile.mk (renamed from payloads/libpayload/tests/Makefile.inc)2
-rw-r--r--payloads/libpayload/tests/drivers/Makefile.mk (renamed from payloads/libpayload/tests/drivers/Makefile.inc)0
-rw-r--r--payloads/libpayload/tests/libc/Makefile.mk (renamed from payloads/libpayload/tests/libc/Makefile.inc)0
-rw-r--r--payloads/libpayload/tests/libcbfs/Makefile.mk (renamed from payloads/libpayload/tests/libcbfs/Makefile.inc)0
-rw-r--r--payloads/libpayload/vboot/Makefile.mk (renamed from payloads/libpayload/vboot/Makefile.inc)0
-rwxr-xr-xutil/lint/kconfig_lint2
22 files changed, 8 insertions, 8 deletions
diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.mk
index c87f140da4..c87f140da4 100644
--- a/payloads/external/Makefile.inc
+++ b/payloads/external/Makefile.mk
diff --git a/payloads/libpayload/Makefile b/payloads/libpayload/Makefile
index 212e67ea79..71d60bce9b 100644
--- a/payloads/libpayload/Makefile
+++ b/payloads/libpayload/Makefile
@@ -56,7 +56,7 @@ export KCONFIG_NEGATIVES := 1
export KBUILD_KCONFIG := Kconfig
export CONFIG_ := CONFIG_LP_
-# directory containing the toplevel Makefile.inc
+# directory containing the toplevel Makefile.mk
TOPLEVEL := .
CONFIG_LP_SHELL := sh
@@ -159,8 +159,8 @@ $(xcompile): $(top)/../../util/xcompile/xcompile
\mv -f $@.tmp $@ 2> /dev/null
ifeq ($(NOCOMPILE),1)
-include $(TOPLEVEL)/Makefile.inc
-include $(TOPLEVEL)/tests/Makefile.inc
+include $(TOPLEVEL)/Makefile.mk
+include $(TOPLEVEL)/tests/Makefile.mk
real-all: config
else
@@ -285,7 +285,7 @@ add-special-class= \
$(eval $(1):=) \
$(eval special-classes+=$(1))
-# Clean -y variables, include Makefile.inc
+# Clean -y variables, include Makefile.mk
# Add paths to files in X-y to X-srcs
# Add subdirs-y to subdirs
includemakefiles= \
@@ -308,7 +308,7 @@ evaluate_subdirs= \
$(eval cursubdirs:=$(subdirs)) \
$(eval subdirs:=) \
$(foreach dir,$(cursubdirs), \
- $(eval $(call includemakefiles,$(dir)/Makefile.inc))) \
+ $(eval $(call includemakefiles,$(dir)/Makefile.mk))) \
$(if $(subdirs),$(eval $(call evaluate_subdirs)))
# collect all object files eligible for building or run unit-tests
@@ -316,7 +316,7 @@ ifneq ($(UNIT_TEST),1)
subdirs:=$(TOPLEVEL)
$(eval $(call evaluate_subdirs))
else
-include $(TOPLEVEL)/tests/Makefile.inc
+include $(TOPLEVEL)/tests/Makefile.mk
endif
# Converts one or more source file paths to the corresponding build/ paths.
diff --git a/payloads/libpayload/Makefile.inc b/payloads/libpayload/Makefile.mk
index 61f932f1d6..61f932f1d6 100644
--- a/payloads/libpayload/Makefile.inc
+++ b/payloads/libpayload/Makefile.mk
diff --git a/payloads/libpayload/arch/arm/Makefile.inc b/payloads/libpayload/arch/arm/Makefile.mk
index c9736010c8..c9736010c8 100644
--- a/payloads/libpayload/arch/arm/Makefile.inc
+++ b/payloads/libpayload/arch/arm/Makefile.mk
diff --git a/payloads/libpayload/arch/arm64/Makefile.inc b/payloads/libpayload/arch/arm64/Makefile.mk
index 6eb9fe8325..6eb9fe8325 100644
--- a/payloads/libpayload/arch/arm64/Makefile.inc
+++ b/payloads/libpayload/arch/arm64/Makefile.mk
diff --git a/payloads/libpayload/arch/mock/Makefile.inc b/payloads/libpayload/arch/mock/Makefile.mk
index 415886af60..415886af60 100644
--- a/payloads/libpayload/arch/mock/Makefile.inc
+++ b/payloads/libpayload/arch/mock/Makefile.mk
diff --git a/payloads/libpayload/arch/x86/Makefile.inc b/payloads/libpayload/arch/x86/Makefile.mk
index 653412ef5a..653412ef5a 100644
--- a/payloads/libpayload/arch/x86/Makefile.inc
+++ b/payloads/libpayload/arch/x86/Makefile.mk
diff --git a/payloads/libpayload/crypto/Makefile.inc b/payloads/libpayload/crypto/Makefile.mk
index 7e8e210e45..7e8e210e45 100644
--- a/payloads/libpayload/crypto/Makefile.inc
+++ b/payloads/libpayload/crypto/Makefile.mk
diff --git a/payloads/libpayload/curses/Makefile.inc b/payloads/libpayload/curses/Makefile.mk
index 99f8d70e05..99f8d70e05 100644
--- a/payloads/libpayload/curses/Makefile.inc
+++ b/payloads/libpayload/curses/Makefile.mk
diff --git a/payloads/libpayload/drivers/Makefile.inc b/payloads/libpayload/drivers/Makefile.mk
index 23471b83c4..23471b83c4 100644
--- a/payloads/libpayload/drivers/Makefile.inc
+++ b/payloads/libpayload/drivers/Makefile.mk
diff --git a/payloads/libpayload/gdb/Makefile.inc b/payloads/libpayload/gdb/Makefile.mk
index 60e18bcb01..60e18bcb01 100644
--- a/payloads/libpayload/gdb/Makefile.inc
+++ b/payloads/libpayload/gdb/Makefile.mk
diff --git a/payloads/libpayload/libc/Makefile.inc b/payloads/libpayload/libc/Makefile.mk
index 2d277da3b5..2d277da3b5 100644
--- a/payloads/libpayload/libc/Makefile.inc
+++ b/payloads/libpayload/libc/Makefile.mk
diff --git a/payloads/libpayload/libcbfs/Makefile.inc b/payloads/libpayload/libcbfs/Makefile.mk
index 53e6f7fa43..53e6f7fa43 100644
--- a/payloads/libpayload/libcbfs/Makefile.inc
+++ b/payloads/libpayload/libcbfs/Makefile.mk
diff --git a/payloads/libpayload/liblz4/Makefile.inc b/payloads/libpayload/liblz4/Makefile.mk
index 272a5a5c46..272a5a5c46 100644
--- a/payloads/libpayload/liblz4/Makefile.inc
+++ b/payloads/libpayload/liblz4/Makefile.mk
diff --git a/payloads/libpayload/liblzma/Makefile.inc b/payloads/libpayload/liblzma/Makefile.mk
index 5aef5c33ab..5aef5c33ab 100644
--- a/payloads/libpayload/liblzma/Makefile.inc
+++ b/payloads/libpayload/liblzma/Makefile.mk
diff --git a/payloads/libpayload/libpci/Makefile.inc b/payloads/libpayload/libpci/Makefile.mk
index 43574e8c97..43574e8c97 100644
--- a/payloads/libpayload/libpci/Makefile.inc
+++ b/payloads/libpayload/libpci/Makefile.mk
diff --git a/payloads/libpayload/tests/Makefile.inc b/payloads/libpayload/tests/Makefile.mk
index dede3404c5..e271a7cea8 100644
--- a/payloads/libpayload/tests/Makefile.inc
+++ b/payloads/libpayload/tests/Makefile.mk
@@ -105,7 +105,7 @@ define TEST_CC_template
$(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.mk\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.mk
index 7705473ef7..7705473ef7 100644
--- a/payloads/libpayload/tests/drivers/Makefile.inc
+++ b/payloads/libpayload/tests/drivers/Makefile.mk
diff --git a/payloads/libpayload/tests/libc/Makefile.inc b/payloads/libpayload/tests/libc/Makefile.mk
index 5f92bdf0a8..5f92bdf0a8 100644
--- a/payloads/libpayload/tests/libc/Makefile.inc
+++ b/payloads/libpayload/tests/libc/Makefile.mk
diff --git a/payloads/libpayload/tests/libcbfs/Makefile.inc b/payloads/libpayload/tests/libcbfs/Makefile.mk
index ad4efedcba..ad4efedcba 100644
--- a/payloads/libpayload/tests/libcbfs/Makefile.inc
+++ b/payloads/libpayload/tests/libcbfs/Makefile.mk
diff --git a/payloads/libpayload/vboot/Makefile.inc b/payloads/libpayload/vboot/Makefile.mk
index bdc9ad2ad6..bdc9ad2ad6 100644
--- a/payloads/libpayload/vboot/Makefile.inc
+++ b/payloads/libpayload/vboot/Makefile.mk
diff --git a/util/lint/kconfig_lint b/util/lint/kconfig_lint
index e64cf11c84..43b1630fc0 100755
--- a/util/lint/kconfig_lint
+++ b/util/lint/kconfig_lint
@@ -36,7 +36,7 @@ my $exclude_dirs_and_files =
'^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.mk payloads/external/Makefile.inc';
+my $payload_files_to_check='payloads/Makefile.mk payloads/external/Makefile.mk';
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