From 1f30b244b296a131f4eaf95962bab048f8b3d481 Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Thu, 18 Jan 2024 18:46:58 -0700 Subject: [PATCH] util: 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 Change-Id: I434940ebb46853980596f7ad55d27a62c90280fa Reviewed-on: https://review.coreboot.org/c/coreboot/+/80123 Tested-by: build bot (Jenkins) Reviewed-by: Felix Singer Reviewed-by: Felix Held --- Makefile.mk | 2 +- util/amdfwtool/{Makefile.inc => Makefile.mk} | 0 util/bincfg/{Makefile.inc => Makefile.mk} | 0 util/cbfstool/Makefile | 2 +- util/cbfstool/{Makefile.inc => Makefile.mk} | 4 ++-- util/cbfstool/bpdt_formats/{Makefile.inc => Makefile.mk} | 0 util/cbfstool/fpt_formats/{Makefile.inc => Makefile.mk} | 0 util/crossgcc/{Makefile.inc => Makefile.mk} | 0 util/futility/Makefile | 2 +- util/futility/{Makefile.inc => Makefile.mk} | 0 util/ifdtool/Makefile | 2 +- util/ifdtool/{Makefile.inc => Makefile.mk} | 0 util/marvell/{Makefile.inc => Makefile.mk} | 0 util/marvell/doimage_mv/{Makefile.inc => Makefile.mk} | 0 util/nvidia/{Makefile.inc => Makefile.mk} | 0 util/nvramtool/{Makefile.inc => Makefile.mk} | 0 util/qemu/{Makefile.inc => Makefile.mk} | 4 ++-- util/sconfig/{Makefile.inc => Makefile.mk} | 0 util/supermicro/{Makefile.inc => Makefile.mk} | 0 19 files changed, 8 insertions(+), 8 deletions(-) rename util/amdfwtool/{Makefile.inc => Makefile.mk} (100%) rename util/bincfg/{Makefile.inc => Makefile.mk} (100%) rename util/cbfstool/{Makefile.inc => Makefile.mk} (98%) rename util/cbfstool/bpdt_formats/{Makefile.inc => Makefile.mk} (100%) rename util/cbfstool/fpt_formats/{Makefile.inc => Makefile.mk} (100%) rename util/crossgcc/{Makefile.inc => Makefile.mk} (100%) rename util/futility/{Makefile.inc => Makefile.mk} (100%) rename util/ifdtool/{Makefile.inc => Makefile.mk} (100%) rename util/marvell/{Makefile.inc => Makefile.mk} (100%) rename util/marvell/doimage_mv/{Makefile.inc => Makefile.mk} (100%) rename util/nvidia/{Makefile.inc => Makefile.mk} (100%) rename util/nvramtool/{Makefile.inc => Makefile.mk} (100%) rename util/qemu/{Makefile.inc => Makefile.mk} (93%) rename util/sconfig/{Makefile.inc => Makefile.mk} (100%) rename util/supermicro/{Makefile.inc => Makefile.mk} (100%) diff --git a/Makefile.mk b/Makefile.mk index 87c6bcb247..f7b98c7c8d 100644 --- a/Makefile.mk +++ b/Makefile.mk @@ -768,7 +768,7 @@ gitconfig: install-git-commit-clangfmt: cp util/scripts/prepare-commit-msg.clang-format .git/hooks/prepare-commit-msg -include util/crossgcc/Makefile.inc +include util/crossgcc/Makefile.mk .PHONY: tools tools: $(objutil)/kconfig/conf $(objutil)/kconfig/toada $(CBFSTOOL) $(objutil)/cbfstool/cbfs-compression-tool $(FMAPTOOL) $(RMODTOOL) $(IFWITOOL) $(objutil)/nvramtool/nvramtool $(objutil)/sconfig/sconfig $(IFDTOOL) $(CBOOTIMAGE) $(AMDFWTOOL) $(AMDCOMPRESS) $(FUTILITY) $(BINCFG) $(IFITTOOL) $(objutil)/supermicro/smcbiosinfo $(CSE_FPT) $(CSE_SERGER) $(AMDFWREAD) diff --git a/util/amdfwtool/Makefile.inc b/util/amdfwtool/Makefile.mk similarity index 100% rename from util/amdfwtool/Makefile.inc rename to util/amdfwtool/Makefile.mk diff --git a/util/bincfg/Makefile.inc b/util/bincfg/Makefile.mk similarity index 100% rename from util/bincfg/Makefile.inc rename to util/bincfg/Makefile.mk diff --git a/util/cbfstool/Makefile b/util/cbfstool/Makefile index 034aca26a6..8dde77ba52 100644 --- a/util/cbfstool/Makefile +++ b/util/cbfstool/Makefile @@ -91,7 +91,7 @@ ifneq ($(V),1) .SILENT: endif -include Makefile.inc +include Makefile.mk $(objutil)/cbfstool/cbfstool.o: $(VBOOT_SOURCE)/firmware/include/vb2_sha.h $(objutil)/cbfstool/elogtool.o: $(VBOOT_SOURCE)/firmware/include/vb2_sha.h diff --git a/util/cbfstool/Makefile.inc b/util/cbfstool/Makefile.mk similarity index 98% rename from util/cbfstool/Makefile.inc rename to util/cbfstool/Makefile.mk index 80aab6720d..8577874044 100644 --- a/util/cbfstool/Makefile.inc +++ b/util/cbfstool/Makefile.mk @@ -98,14 +98,14 @@ elogobj += elog.o elogobj += common.o elogobj += flashrom.o -include $(top)/util/cbfstool/fpt_formats/Makefile.inc +include $(top)/util/cbfstool/fpt_formats/Makefile.mk cse_fpt_obj := cse_fpt_obj += cse_fpt.o cse_fpt_obj += common.o cse_fpt_obj += cse_helpers.o cse_fpt_obj += $(foreach var, $(fpt_formats_obj), $(var)) -include $(top)/util/cbfstool/bpdt_formats/Makefile.inc +include $(top)/util/cbfstool/bpdt_formats/Makefile.mk cse_serger_obj := cse_serger_obj += cse_serger.o cse_serger_obj += common.o diff --git a/util/cbfstool/bpdt_formats/Makefile.inc b/util/cbfstool/bpdt_formats/Makefile.mk similarity index 100% rename from util/cbfstool/bpdt_formats/Makefile.inc rename to util/cbfstool/bpdt_formats/Makefile.mk diff --git a/util/cbfstool/fpt_formats/Makefile.inc b/util/cbfstool/fpt_formats/Makefile.mk similarity index 100% rename from util/cbfstool/fpt_formats/Makefile.inc rename to util/cbfstool/fpt_formats/Makefile.mk diff --git a/util/crossgcc/Makefile.inc b/util/crossgcc/Makefile.mk similarity index 100% rename from util/crossgcc/Makefile.inc rename to util/crossgcc/Makefile.mk diff --git a/util/futility/Makefile b/util/futility/Makefile index 6901948fa0..14d5f8204c 100644 --- a/util/futility/Makefile +++ b/util/futility/Makefile @@ -23,4 +23,4 @@ ifneq ($(Q),) endif endif -include Makefile.inc +include Makefile.mk diff --git a/util/futility/Makefile.inc b/util/futility/Makefile.mk similarity index 100% rename from util/futility/Makefile.inc rename to util/futility/Makefile.mk diff --git a/util/ifdtool/Makefile b/util/ifdtool/Makefile index c0210693d8..72a4dabe5c 100644 --- a/util/ifdtool/Makefile +++ b/util/ifdtool/Makefile @@ -10,7 +10,7 @@ HOSTCC ?= $(CC) HOSTCFLAGS ?= $(CFLAGS) top := ../.. objutil := .. -include Makefile.inc +include Makefile.mk PROGRAM=$(objutil)/ifdtool/ifdtool diff --git a/util/ifdtool/Makefile.inc b/util/ifdtool/Makefile.mk similarity index 100% rename from util/ifdtool/Makefile.inc rename to util/ifdtool/Makefile.mk diff --git a/util/marvell/Makefile.inc b/util/marvell/Makefile.mk similarity index 100% rename from util/marvell/Makefile.inc rename to util/marvell/Makefile.mk diff --git a/util/marvell/doimage_mv/Makefile.inc b/util/marvell/doimage_mv/Makefile.mk similarity index 100% rename from util/marvell/doimage_mv/Makefile.inc rename to util/marvell/doimage_mv/Makefile.mk diff --git a/util/nvidia/Makefile.inc b/util/nvidia/Makefile.mk similarity index 100% rename from util/nvidia/Makefile.inc rename to util/nvidia/Makefile.mk diff --git a/util/nvramtool/Makefile.inc b/util/nvramtool/Makefile.mk similarity index 100% rename from util/nvramtool/Makefile.inc rename to util/nvramtool/Makefile.mk diff --git a/util/qemu/Makefile.inc b/util/qemu/Makefile.mk similarity index 93% rename from util/qemu/Makefile.inc rename to util/qemu/Makefile.mk index e1181ade73..077fde772d 100644 --- a/util/qemu/Makefile.inc +++ b/util/qemu/Makefile.mk @@ -2,10 +2,10 @@ # This automatically adds a `qemu` make target if a compatible # configuration is selected. There are some notable variables -# that can be set or adapted in `Makefile.inc` files, the make +# that can be set or adapted in `Makefile.mk` files, the make # command line or the environment: # -# Primarily for `Makefile.inc` use: +# Primarily for `Makefile.mk` use: # QEMU-y the QEMU executable # QEMU_CFG-y a QEMU config that sets the available default devices, # used to run more comprehensive tests by default, diff --git a/util/sconfig/Makefile.inc b/util/sconfig/Makefile.mk similarity index 100% rename from util/sconfig/Makefile.inc rename to util/sconfig/Makefile.mk diff --git a/util/supermicro/Makefile.inc b/util/supermicro/Makefile.mk similarity index 100% rename from util/supermicro/Makefile.inc rename to util/supermicro/Makefile.mk