From b028636d02f63881e4663ff0f1ae435c00865615 Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Thu, 18 Jan 2024 10:48:28 -0700 Subject: cpu: Rename Makefiles from .inc to .mk MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: I552d487978906f5ea74c3d0d85373fe5b2de3f38 Reviewed-on: https://review.coreboot.org/c/coreboot/+/80068 Reviewed-by: Michael Niewöhner Tested-by: build bot (Jenkins) Reviewed-by: Felix Singer Reviewed-by: Maximilian Brune --- src/cpu/x86/64bit/Makefile.inc | 16 ---------------- src/cpu/x86/64bit/Makefile.mk | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 16 deletions(-) delete mode 100644 src/cpu/x86/64bit/Makefile.inc create mode 100644 src/cpu/x86/64bit/Makefile.mk (limited to 'src/cpu/x86/64bit') diff --git a/src/cpu/x86/64bit/Makefile.inc b/src/cpu/x86/64bit/Makefile.inc deleted file mode 100644 index 24a5a966fb..0000000000 --- a/src/cpu/x86/64bit/Makefile.inc +++ /dev/null @@ -1,16 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -all_x86-y += mode_switch.S -all_x86-y += mode_switch2.S - -# Add --defsym=_start=0 to suppress a linker warning. -$(objcbfs)/pt: $(dir)/pt.S $(obj)/config.h - $(CC_bootblock) $(CFLAGS_bootblock) $(CPPFLAGS_bootblock) -o $@.tmp $< -Wl,--section-start=.rodata=$(CONFIG_ARCH_X86_64_PGTBL_LOC),--defsym=_start=0 - $(OBJCOPY_ramstage) -Obinary -j .rodata $@.tmp $@ - rm $@.tmp - -cbfs-files-y += pagetables -pagetables-file := $(objcbfs)/pt -pagetables-type := raw -pagetables-compression := none -pagetables-COREBOOT-position := $(CONFIG_ARCH_X86_64_PGTBL_LOC) diff --git a/src/cpu/x86/64bit/Makefile.mk b/src/cpu/x86/64bit/Makefile.mk new file mode 100644 index 0000000000..24a5a966fb --- /dev/null +++ b/src/cpu/x86/64bit/Makefile.mk @@ -0,0 +1,16 @@ +## SPDX-License-Identifier: GPL-2.0-only + +all_x86-y += mode_switch.S +all_x86-y += mode_switch2.S + +# Add --defsym=_start=0 to suppress a linker warning. +$(objcbfs)/pt: $(dir)/pt.S $(obj)/config.h + $(CC_bootblock) $(CFLAGS_bootblock) $(CPPFLAGS_bootblock) -o $@.tmp $< -Wl,--section-start=.rodata=$(CONFIG_ARCH_X86_64_PGTBL_LOC),--defsym=_start=0 + $(OBJCOPY_ramstage) -Obinary -j .rodata $@.tmp $@ + rm $@.tmp + +cbfs-files-y += pagetables +pagetables-file := $(objcbfs)/pt +pagetables-type := raw +pagetables-compression := none +pagetables-COREBOOT-position := $(CONFIG_ARCH_X86_64_PGTBL_LOC) -- cgit v1.2.3