From ea198585628ea58a90d85957b7b87b8fd46b0176 Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Thu, 18 Jan 2024 12:37:22 -0700 Subject: soc/intel: 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: Ib479b93b7d0b2e790d0495b6a6b4b4298a515d9a Reviewed-on: https://review.coreboot.org/c/coreboot/+/80073 Reviewed-by: Arthur Heymans Reviewed-by: Michael Niewöhner Reviewed-by: Felix Singer Reviewed-by: Maximilian Brune Tested-by: build bot (Jenkins) --- src/soc/intel/xeon_sp/Makefile.inc | 26 -------------------------- src/soc/intel/xeon_sp/Makefile.mk | 26 ++++++++++++++++++++++++++ src/soc/intel/xeon_sp/cpx/Makefile.inc | 22 ---------------------- src/soc/intel/xeon_sp/cpx/Makefile.mk | 22 ++++++++++++++++++++++ src/soc/intel/xeon_sp/ebg/Makefile.inc | 7 ------- src/soc/intel/xeon_sp/ebg/Makefile.mk | 7 +++++++ src/soc/intel/xeon_sp/lbg/Makefile.inc | 7 ------- src/soc/intel/xeon_sp/lbg/Makefile.mk | 7 +++++++ src/soc/intel/xeon_sp/ras/Makefile.inc | 3 --- src/soc/intel/xeon_sp/ras/Makefile.mk | 3 +++ src/soc/intel/xeon_sp/skx/Makefile.inc | 30 ------------------------------ src/soc/intel/xeon_sp/skx/Makefile.mk | 30 ++++++++++++++++++++++++++++++ src/soc/intel/xeon_sp/spr/Makefile.inc | 22 ---------------------- src/soc/intel/xeon_sp/spr/Makefile.mk | 22 ++++++++++++++++++++++ 14 files changed, 117 insertions(+), 117 deletions(-) delete mode 100644 src/soc/intel/xeon_sp/Makefile.inc create mode 100644 src/soc/intel/xeon_sp/Makefile.mk delete mode 100644 src/soc/intel/xeon_sp/cpx/Makefile.inc create mode 100644 src/soc/intel/xeon_sp/cpx/Makefile.mk delete mode 100644 src/soc/intel/xeon_sp/ebg/Makefile.inc create mode 100644 src/soc/intel/xeon_sp/ebg/Makefile.mk delete mode 100644 src/soc/intel/xeon_sp/lbg/Makefile.inc create mode 100644 src/soc/intel/xeon_sp/lbg/Makefile.mk delete mode 100644 src/soc/intel/xeon_sp/ras/Makefile.inc create mode 100644 src/soc/intel/xeon_sp/ras/Makefile.mk delete mode 100644 src/soc/intel/xeon_sp/skx/Makefile.inc create mode 100644 src/soc/intel/xeon_sp/skx/Makefile.mk delete mode 100644 src/soc/intel/xeon_sp/spr/Makefile.inc create mode 100644 src/soc/intel/xeon_sp/spr/Makefile.mk (limited to 'src/soc/intel/xeon_sp') diff --git a/src/soc/intel/xeon_sp/Makefile.inc b/src/soc/intel/xeon_sp/Makefile.inc deleted file mode 100644 index a732c78b53..0000000000 --- a/src/soc/intel/xeon_sp/Makefile.inc +++ /dev/null @@ -1,26 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-or-later - -ifeq ($(CONFIG_XEON_SP_COMMON_BASE),y) - -subdirs-$(CONFIG_SOC_INTEL_SKYLAKE_SP) += skx lbg -subdirs-$(CONFIG_SOC_INTEL_COOPERLAKE_SP) += cpx lbg -subdirs-$(CONFIG_SOC_INTEL_SAPPHIRERAPIDS_SP) += spr ebg - -bootblock-y += bootblock.c spi.c lpc.c pch.c report_platform.c -romstage-y += romstage.c reset.c util.c spi.c pmutil.c memmap.c -romstage-y += ../../../cpu/intel/car/romstage.c -ramstage-y += uncore.c reset.c util.c lpc.c spi.c ramstage.c chip_common.c -ramstage-y += memmap.c pch.c lockdown.c finalize.c -ramstage-$(CONFIG_SOC_INTEL_COMMON_BLOCK_PMC) += pmc.c pmutil.c -ramstage-$(CONFIG_HAVE_ACPI_TABLES) += uncore_acpi.c acpi.c -ramstage-$(CONFIG_SOC_INTEL_HAS_CXL) += uncore_acpi_cxl.c -ramstage-$(CONFIG_HAVE_SMI_HANDLER) += smmrelocate.c -smm-y += smihandler.c pmutil.c -postcar-y += spi.c - -subdirs-$(CONFIG_SOC_INTEL_XEON_RAS) += ras - -CPPFLAGS_common += -I$(src)/soc/intel/xeon_sp/include -CPPFLAGS_common += -include $(src)/soc/intel/xeon_sp/include/soc/fsp_upd.h - -endif ## XEON_SP_COMMON_BASE diff --git a/src/soc/intel/xeon_sp/Makefile.mk b/src/soc/intel/xeon_sp/Makefile.mk new file mode 100644 index 0000000000..a732c78b53 --- /dev/null +++ b/src/soc/intel/xeon_sp/Makefile.mk @@ -0,0 +1,26 @@ +## SPDX-License-Identifier: GPL-2.0-or-later + +ifeq ($(CONFIG_XEON_SP_COMMON_BASE),y) + +subdirs-$(CONFIG_SOC_INTEL_SKYLAKE_SP) += skx lbg +subdirs-$(CONFIG_SOC_INTEL_COOPERLAKE_SP) += cpx lbg +subdirs-$(CONFIG_SOC_INTEL_SAPPHIRERAPIDS_SP) += spr ebg + +bootblock-y += bootblock.c spi.c lpc.c pch.c report_platform.c +romstage-y += romstage.c reset.c util.c spi.c pmutil.c memmap.c +romstage-y += ../../../cpu/intel/car/romstage.c +ramstage-y += uncore.c reset.c util.c lpc.c spi.c ramstage.c chip_common.c +ramstage-y += memmap.c pch.c lockdown.c finalize.c +ramstage-$(CONFIG_SOC_INTEL_COMMON_BLOCK_PMC) += pmc.c pmutil.c +ramstage-$(CONFIG_HAVE_ACPI_TABLES) += uncore_acpi.c acpi.c +ramstage-$(CONFIG_SOC_INTEL_HAS_CXL) += uncore_acpi_cxl.c +ramstage-$(CONFIG_HAVE_SMI_HANDLER) += smmrelocate.c +smm-y += smihandler.c pmutil.c +postcar-y += spi.c + +subdirs-$(CONFIG_SOC_INTEL_XEON_RAS) += ras + +CPPFLAGS_common += -I$(src)/soc/intel/xeon_sp/include +CPPFLAGS_common += -include $(src)/soc/intel/xeon_sp/include/soc/fsp_upd.h + +endif ## XEON_SP_COMMON_BASE diff --git a/src/soc/intel/xeon_sp/cpx/Makefile.inc b/src/soc/intel/xeon_sp/cpx/Makefile.inc deleted file mode 100644 index 745e032137..0000000000 --- a/src/soc/intel/xeon_sp/cpx/Makefile.inc +++ /dev/null @@ -1,22 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -ifeq ($(CONFIG_SOC_INTEL_COOPERLAKE_SP),y) - -subdirs-y += ../../../../cpu/intel/turbo -subdirs-y += ../../../../cpu/intel/microcode - -romstage-y += romstage.c ddr.c soc_util.c -romstage-$(CONFIG_DISPLAY_UPD_DATA) += upd_display.c -romstage-$(CONFIG_DISPLAY_HOBS) += hob_display.c - -ramstage-y += chip.c cpu.c soc_util.c soc_acpi.c -ramstage-$(CONFIG_DISPLAY_HOBS) += hob_display.c -ramstage-$(CONFIG_DISPLAY_UPD_DATA) += upd_display.c -smm-$(CONFIG_HAVE_SMI_HANDLER) += soc_smihandler_util.c - -CPPFLAGS_common += -I$(src)/soc/intel/xeon_sp/cpx/include -I$(src)/soc/intel/xeon_sp/cpx -CPPFLAGS_common += -I$(src)/vendorcode/intel/fsp/fsp2_0/cooperlake_sp - -cpu_microcode_bins += 3rdparty/intel-microcode/intel-ucode/06-55-0b - -endif ## CONFIG_SOC_INTEL_COOPERLAKE_SP diff --git a/src/soc/intel/xeon_sp/cpx/Makefile.mk b/src/soc/intel/xeon_sp/cpx/Makefile.mk new file mode 100644 index 0000000000..745e032137 --- /dev/null +++ b/src/soc/intel/xeon_sp/cpx/Makefile.mk @@ -0,0 +1,22 @@ +## SPDX-License-Identifier: GPL-2.0-only + +ifeq ($(CONFIG_SOC_INTEL_COOPERLAKE_SP),y) + +subdirs-y += ../../../../cpu/intel/turbo +subdirs-y += ../../../../cpu/intel/microcode + +romstage-y += romstage.c ddr.c soc_util.c +romstage-$(CONFIG_DISPLAY_UPD_DATA) += upd_display.c +romstage-$(CONFIG_DISPLAY_HOBS) += hob_display.c + +ramstage-y += chip.c cpu.c soc_util.c soc_acpi.c +ramstage-$(CONFIG_DISPLAY_HOBS) += hob_display.c +ramstage-$(CONFIG_DISPLAY_UPD_DATA) += upd_display.c +smm-$(CONFIG_HAVE_SMI_HANDLER) += soc_smihandler_util.c + +CPPFLAGS_common += -I$(src)/soc/intel/xeon_sp/cpx/include -I$(src)/soc/intel/xeon_sp/cpx +CPPFLAGS_common += -I$(src)/vendorcode/intel/fsp/fsp2_0/cooperlake_sp + +cpu_microcode_bins += 3rdparty/intel-microcode/intel-ucode/06-55-0b + +endif ## CONFIG_SOC_INTEL_COOPERLAKE_SP diff --git a/src/soc/intel/xeon_sp/ebg/Makefile.inc b/src/soc/intel/xeon_sp/ebg/Makefile.inc deleted file mode 100644 index ac73acbde9..0000000000 --- a/src/soc/intel/xeon_sp/ebg/Makefile.inc +++ /dev/null @@ -1,7 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -bootblock-y += soc_gpio.c soc_pch.c -romstage-y += soc_gpio.c soc_pmutil.c soc_pch.c -ramstage-y += lockdown.c soc_gpio.c soc_pch.c soc_pmutil.c - -CPPFLAGS_common += -I$(src)/soc/intel/xeon_sp/ebg/include diff --git a/src/soc/intel/xeon_sp/ebg/Makefile.mk b/src/soc/intel/xeon_sp/ebg/Makefile.mk new file mode 100644 index 0000000000..ac73acbde9 --- /dev/null +++ b/src/soc/intel/xeon_sp/ebg/Makefile.mk @@ -0,0 +1,7 @@ +## SPDX-License-Identifier: GPL-2.0-only + +bootblock-y += soc_gpio.c soc_pch.c +romstage-y += soc_gpio.c soc_pmutil.c soc_pch.c +ramstage-y += lockdown.c soc_gpio.c soc_pch.c soc_pmutil.c + +CPPFLAGS_common += -I$(src)/soc/intel/xeon_sp/ebg/include diff --git a/src/soc/intel/xeon_sp/lbg/Makefile.inc b/src/soc/intel/xeon_sp/lbg/Makefile.inc deleted file mode 100644 index 5dedc8368f..0000000000 --- a/src/soc/intel/xeon_sp/lbg/Makefile.inc +++ /dev/null @@ -1,7 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -bootblock-y += soc_pch.c soc_gpio.c -romstage-y += soc_pmutil.c soc_gpio.c -ramstage-y += soc_pmutil.c soc_pch.c soc_gpio.c lockdown.c - -CPPFLAGS_common += -I$(src)/soc/intel/xeon_sp/lbg/include diff --git a/src/soc/intel/xeon_sp/lbg/Makefile.mk b/src/soc/intel/xeon_sp/lbg/Makefile.mk new file mode 100644 index 0000000000..5dedc8368f --- /dev/null +++ b/src/soc/intel/xeon_sp/lbg/Makefile.mk @@ -0,0 +1,7 @@ +## SPDX-License-Identifier: GPL-2.0-only + +bootblock-y += soc_pch.c soc_gpio.c +romstage-y += soc_pmutil.c soc_gpio.c +ramstage-y += soc_pmutil.c soc_pch.c soc_gpio.c lockdown.c + +CPPFLAGS_common += -I$(src)/soc/intel/xeon_sp/lbg/include diff --git a/src/soc/intel/xeon_sp/ras/Makefile.inc b/src/soc/intel/xeon_sp/ras/Makefile.inc deleted file mode 100644 index 93c8705f94..0000000000 --- a/src/soc/intel/xeon_sp/ras/Makefile.inc +++ /dev/null @@ -1,3 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-or-later - -ramstage-$(CONFIG_SOC_ACPI_HEST) += hest.c diff --git a/src/soc/intel/xeon_sp/ras/Makefile.mk b/src/soc/intel/xeon_sp/ras/Makefile.mk new file mode 100644 index 0000000000..93c8705f94 --- /dev/null +++ b/src/soc/intel/xeon_sp/ras/Makefile.mk @@ -0,0 +1,3 @@ +## SPDX-License-Identifier: GPL-2.0-or-later + +ramstage-$(CONFIG_SOC_ACPI_HEST) += hest.c diff --git a/src/soc/intel/xeon_sp/skx/Makefile.inc b/src/soc/intel/xeon_sp/skx/Makefile.inc deleted file mode 100644 index 0f75eec864..0000000000 --- a/src/soc/intel/xeon_sp/skx/Makefile.inc +++ /dev/null @@ -1,30 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -ifeq ($(CONFIG_SOC_INTEL_SKYLAKE_SP),y) - -subdirs-y += ../../../../cpu/intel/microcode -subdirs-y += ../../../../cpu/intel/turbo - -postcar-y += soc_util.c - -romstage-y += soc_util.c -romstage-y += romstage.c -romstage-y += soc_util.c -romstage-y += hob_display.c -romstage-$(CONFIG_DISPLAY_UPD_DATA) += upd_display.c -romstage-$(CONFIG_DISPLAY_HOBS) += hob_display.c - -ramstage-y += soc_acpi.c -ramstage-y += chip.c -ramstage-y += soc_util.c -ramstage-y += cpu.c -ramstage-$(CONFIG_DISPLAY_UPD_DATA) += upd_display.c -ramstage-$(CONFIG_DISPLAY_HOBS) += hob_display.c -ramstage-y += hob_display.c -smm-$(CONFIG_HAVE_SMI_HANDLER) += soc_smihandler_util.c - -CPPFLAGS_common += -I$(src)/soc/intel/xeon_sp/skx/include -I$(src)/soc/intel/xeon_sp/skx - -cpu_microcode_bins += 3rdparty/intel-microcode/intel-ucode/06-55-04 - -endif ## CONFIG_SOC_INTEL_SKYLAKE_SP diff --git a/src/soc/intel/xeon_sp/skx/Makefile.mk b/src/soc/intel/xeon_sp/skx/Makefile.mk new file mode 100644 index 0000000000..0f75eec864 --- /dev/null +++ b/src/soc/intel/xeon_sp/skx/Makefile.mk @@ -0,0 +1,30 @@ +## SPDX-License-Identifier: GPL-2.0-only + +ifeq ($(CONFIG_SOC_INTEL_SKYLAKE_SP),y) + +subdirs-y += ../../../../cpu/intel/microcode +subdirs-y += ../../../../cpu/intel/turbo + +postcar-y += soc_util.c + +romstage-y += soc_util.c +romstage-y += romstage.c +romstage-y += soc_util.c +romstage-y += hob_display.c +romstage-$(CONFIG_DISPLAY_UPD_DATA) += upd_display.c +romstage-$(CONFIG_DISPLAY_HOBS) += hob_display.c + +ramstage-y += soc_acpi.c +ramstage-y += chip.c +ramstage-y += soc_util.c +ramstage-y += cpu.c +ramstage-$(CONFIG_DISPLAY_UPD_DATA) += upd_display.c +ramstage-$(CONFIG_DISPLAY_HOBS) += hob_display.c +ramstage-y += hob_display.c +smm-$(CONFIG_HAVE_SMI_HANDLER) += soc_smihandler_util.c + +CPPFLAGS_common += -I$(src)/soc/intel/xeon_sp/skx/include -I$(src)/soc/intel/xeon_sp/skx + +cpu_microcode_bins += 3rdparty/intel-microcode/intel-ucode/06-55-04 + +endif ## CONFIG_SOC_INTEL_SKYLAKE_SP diff --git a/src/soc/intel/xeon_sp/spr/Makefile.inc b/src/soc/intel/xeon_sp/spr/Makefile.inc deleted file mode 100644 index 7a0d9586c5..0000000000 --- a/src/soc/intel/xeon_sp/spr/Makefile.inc +++ /dev/null @@ -1,22 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -ifeq ($(CONFIG_SOC_INTEL_SAPPHIRERAPIDS_SP),y) - -subdirs-y += ../../../../cpu/intel/turbo -subdirs-y += ../../../../cpu/x86/lapic -subdirs-y += ../../../../cpu/x86/mtrr -subdirs-y += ../../../../cpu/x86/tsc -subdirs-y += ../../../../cpu/intel/microcode - -romstage-y += romstage.c soc_util.c ddr.c -romstage-$(CONFIG_DISPLAY_HOBS) += hob_display.c -romstage-$(CONFIG_DISPLAY_UPD_DATA) += upd_display.c - -ramstage-y += chip.c cpu.c soc_util.c ramstage.c soc_acpi.c xhci.c numa.c reset.c -ramstage-y += crashlog.c ioat.c -ramstage-$(CONFIG_DISPLAY_HOBS) += hob_display.c -ramstage-$(CONFIG_DISPLAY_UPD_DATA) += upd_display.c -smm-$(CONFIG_HAVE_SMI_HANDLER) += soc_smihandler_util.c -CPPFLAGS_common += -I$(src)/soc/intel/xeon_sp/spr/include -I$(src)/soc/intel/xeon_sp/spr - -endif ## CONFIG_SOC_INTEL_SAPPHIRERAPIDS_SP diff --git a/src/soc/intel/xeon_sp/spr/Makefile.mk b/src/soc/intel/xeon_sp/spr/Makefile.mk new file mode 100644 index 0000000000..7a0d9586c5 --- /dev/null +++ b/src/soc/intel/xeon_sp/spr/Makefile.mk @@ -0,0 +1,22 @@ +## SPDX-License-Identifier: GPL-2.0-only + +ifeq ($(CONFIG_SOC_INTEL_SAPPHIRERAPIDS_SP),y) + +subdirs-y += ../../../../cpu/intel/turbo +subdirs-y += ../../../../cpu/x86/lapic +subdirs-y += ../../../../cpu/x86/mtrr +subdirs-y += ../../../../cpu/x86/tsc +subdirs-y += ../../../../cpu/intel/microcode + +romstage-y += romstage.c soc_util.c ddr.c +romstage-$(CONFIG_DISPLAY_HOBS) += hob_display.c +romstage-$(CONFIG_DISPLAY_UPD_DATA) += upd_display.c + +ramstage-y += chip.c cpu.c soc_util.c ramstage.c soc_acpi.c xhci.c numa.c reset.c +ramstage-y += crashlog.c ioat.c +ramstage-$(CONFIG_DISPLAY_HOBS) += hob_display.c +ramstage-$(CONFIG_DISPLAY_UPD_DATA) += upd_display.c +smm-$(CONFIG_HAVE_SMI_HANDLER) += soc_smihandler_util.c +CPPFLAGS_common += -I$(src)/soc/intel/xeon_sp/spr/include -I$(src)/soc/intel/xeon_sp/spr + +endif ## CONFIG_SOC_INTEL_SAPPHIRERAPIDS_SP -- cgit v1.2.3