From 5d6d8008403d09a97188e345307c6b6d652c2576 Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Thu, 18 Jan 2024 16:10:01 -0700 Subject: mb/google/sarien to zork: 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: Ib8a2ae26ed4380592d15e1a7b2d682639413af01 Reviewed-on: https://review.coreboot.org/c/coreboot/+/80109 Tested-by: build bot (Jenkins) Reviewed-by: Felix Singer Reviewed-by: Maximilian Brune --- src/mainboard/google/slippy/Makefile.inc | 15 --------------- src/mainboard/google/slippy/Makefile.mk | 15 +++++++++++++++ src/mainboard/google/slippy/variants/falco/Makefile.inc | 13 ------------- src/mainboard/google/slippy/variants/falco/Makefile.mk | 13 +++++++++++++ src/mainboard/google/slippy/variants/leon/Makefile.inc | 12 ------------ src/mainboard/google/slippy/variants/leon/Makefile.mk | 12 ++++++++++++ src/mainboard/google/slippy/variants/peppy/Makefile.inc | 13 ------------- src/mainboard/google/slippy/variants/peppy/Makefile.mk | 13 +++++++++++++ src/mainboard/google/slippy/variants/wolf/Makefile.inc | 11 ----------- src/mainboard/google/slippy/variants/wolf/Makefile.mk | 11 +++++++++++ 10 files changed, 64 insertions(+), 64 deletions(-) delete mode 100644 src/mainboard/google/slippy/Makefile.inc create mode 100644 src/mainboard/google/slippy/Makefile.mk delete mode 100644 src/mainboard/google/slippy/variants/falco/Makefile.inc create mode 100644 src/mainboard/google/slippy/variants/falco/Makefile.mk delete mode 100644 src/mainboard/google/slippy/variants/leon/Makefile.inc create mode 100644 src/mainboard/google/slippy/variants/leon/Makefile.mk delete mode 100644 src/mainboard/google/slippy/variants/peppy/Makefile.inc create mode 100644 src/mainboard/google/slippy/variants/peppy/Makefile.mk delete mode 100644 src/mainboard/google/slippy/variants/wolf/Makefile.inc create mode 100644 src/mainboard/google/slippy/variants/wolf/Makefile.mk (limited to 'src/mainboard/google/slippy') diff --git a/src/mainboard/google/slippy/Makefile.inc b/src/mainboard/google/slippy/Makefile.inc deleted file mode 100644 index 2a2541d477..0000000000 --- a/src/mainboard/google/slippy/Makefile.inc +++ /dev/null @@ -1,15 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c - -romstage-$(CONFIG_CHROMEOS) += chromeos.c -ramstage-$(CONFIG_CHROMEOS) += chromeos.c - -romstage-y += variants/$(VARIANT_DIR)/gpio.c -romstage-y += variants/$(VARIANT_DIR)/romstage.c - -subdirs-y += variants/$(VARIANT_DIR) - -ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads - -CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/include diff --git a/src/mainboard/google/slippy/Makefile.mk b/src/mainboard/google/slippy/Makefile.mk new file mode 100644 index 0000000000..2a2541d477 --- /dev/null +++ b/src/mainboard/google/slippy/Makefile.mk @@ -0,0 +1,15 @@ +## SPDX-License-Identifier: GPL-2.0-only + +ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c + +romstage-$(CONFIG_CHROMEOS) += chromeos.c +ramstage-$(CONFIG_CHROMEOS) += chromeos.c + +romstage-y += variants/$(VARIANT_DIR)/gpio.c +romstage-y += variants/$(VARIANT_DIR)/romstage.c + +subdirs-y += variants/$(VARIANT_DIR) + +ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads + +CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/include diff --git a/src/mainboard/google/slippy/variants/falco/Makefile.inc b/src/mainboard/google/slippy/variants/falco/Makefile.inc deleted file mode 100644 index d8d748b726..0000000000 --- a/src/mainboard/google/slippy/variants/falco/Makefile.inc +++ /dev/null @@ -1,13 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -# Order of names in SPD_SOURCES is important! -SPD_SOURCES = Micron_4KTF25664HZ # 4GB / CH0 + CH1 (RAM_ID=000) -SPD_SOURCES += Hynix_HMT425S6AFR6A # 4GB / CH0 + CH1 (RAM_ID=001) -SPD_SOURCES += Elpida_EDJ4216EFBG # 4GB / CH0 + CH1 (RAM_ID=010) -SPD_SOURCES += Micron_4KTF25664HZ # 2GB / CH0 only (RAM_ID=011) -SPD_SOURCES += Hynix_HMT425S6AFR6A # 2GB / CH0 only (RAM_ID=100) -SPD_SOURCES += Elpida_EDJ4216EFBG # 2GB / CH0 only (RAM_ID=101) -SPD_SOURCES += Samsung_M471B5674QH0 # 4GB / CH0 + CH1 (RAM_ID=110) -SPD_SOURCES += Samsung_M471B5674QH0 # 2GB / CH0 only (RAM_ID=111) - -LIB_SPD_DEPS := $(foreach f, $(SPD_SOURCES), src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/spd/$(f).spd.hex) diff --git a/src/mainboard/google/slippy/variants/falco/Makefile.mk b/src/mainboard/google/slippy/variants/falco/Makefile.mk new file mode 100644 index 0000000000..d8d748b726 --- /dev/null +++ b/src/mainboard/google/slippy/variants/falco/Makefile.mk @@ -0,0 +1,13 @@ +## SPDX-License-Identifier: GPL-2.0-only + +# Order of names in SPD_SOURCES is important! +SPD_SOURCES = Micron_4KTF25664HZ # 4GB / CH0 + CH1 (RAM_ID=000) +SPD_SOURCES += Hynix_HMT425S6AFR6A # 4GB / CH0 + CH1 (RAM_ID=001) +SPD_SOURCES += Elpida_EDJ4216EFBG # 4GB / CH0 + CH1 (RAM_ID=010) +SPD_SOURCES += Micron_4KTF25664HZ # 2GB / CH0 only (RAM_ID=011) +SPD_SOURCES += Hynix_HMT425S6AFR6A # 2GB / CH0 only (RAM_ID=100) +SPD_SOURCES += Elpida_EDJ4216EFBG # 2GB / CH0 only (RAM_ID=101) +SPD_SOURCES += Samsung_M471B5674QH0 # 4GB / CH0 + CH1 (RAM_ID=110) +SPD_SOURCES += Samsung_M471B5674QH0 # 2GB / CH0 only (RAM_ID=111) + +LIB_SPD_DEPS := $(foreach f, $(SPD_SOURCES), src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/spd/$(f).spd.hex) diff --git a/src/mainboard/google/slippy/variants/leon/Makefile.inc b/src/mainboard/google/slippy/variants/leon/Makefile.inc deleted file mode 100644 index 213dadb006..0000000000 --- a/src/mainboard/google/slippy/variants/leon/Makefile.inc +++ /dev/null @@ -1,12 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -# Order of names in SPD_SOURCES is important! -SPD_SOURCES = Micron_4KTF25664HZ # 0: 4GB / CH0 + CH1 -SPD_SOURCES += Hynix_HMT425S6AFR6A # 1: 4GB / CH0 + CH1 -SPD_SOURCES += Samsung_K4B4G1646Q # 2: 4GB / CH0 + Ch1 -SPD_SOURCES += Micron_4KTF25664HZ # 3: space holder -SPD_SOURCES += Micron_4KTF25664HZ # 4: space holder -SPD_SOURCES += Hynix_HMT425S6AFR6A # 5: 2GB / CH0 -SPD_SOURCES += Samsung_K4B4G1646Q # 6: 2GB / CH0 - -LIB_SPD_DEPS := $(foreach f, $(SPD_SOURCES), src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/spd/$(f).spd.hex) diff --git a/src/mainboard/google/slippy/variants/leon/Makefile.mk b/src/mainboard/google/slippy/variants/leon/Makefile.mk new file mode 100644 index 0000000000..213dadb006 --- /dev/null +++ b/src/mainboard/google/slippy/variants/leon/Makefile.mk @@ -0,0 +1,12 @@ +## SPDX-License-Identifier: GPL-2.0-only + +# Order of names in SPD_SOURCES is important! +SPD_SOURCES = Micron_4KTF25664HZ # 0: 4GB / CH0 + CH1 +SPD_SOURCES += Hynix_HMT425S6AFR6A # 1: 4GB / CH0 + CH1 +SPD_SOURCES += Samsung_K4B4G1646Q # 2: 4GB / CH0 + Ch1 +SPD_SOURCES += Micron_4KTF25664HZ # 3: space holder +SPD_SOURCES += Micron_4KTF25664HZ # 4: space holder +SPD_SOURCES += Hynix_HMT425S6AFR6A # 5: 2GB / CH0 +SPD_SOURCES += Samsung_K4B4G1646Q # 6: 2GB / CH0 + +LIB_SPD_DEPS := $(foreach f, $(SPD_SOURCES), src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/spd/$(f).spd.hex) diff --git a/src/mainboard/google/slippy/variants/peppy/Makefile.inc b/src/mainboard/google/slippy/variants/peppy/Makefile.inc deleted file mode 100644 index f8c5b0d88f..0000000000 --- a/src/mainboard/google/slippy/variants/peppy/Makefile.inc +++ /dev/null @@ -1,13 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -# Order of names in SPD_SOURCES is important! -SPD_SOURCES = Micron_4KTF25664HZ # 0: 4GB / CH0 + CH1 -SPD_SOURCES += Hynix_HMT425S6AFR6A # 1: 4GB / CH0 + CH1 -SPD_SOURCES += Elpida_EDJ4216EFBG # 2: 4GB / CH0 + CH1 -SPD_SOURCES += Hynix_HMT425S6CFR6A # 3: 4GB / CH0 + CH1 -SPD_SOURCES += Micron_4KTF25664HZ # 4: 2GB / CH0 + CH1 -SPD_SOURCES += Hynix_HMT425S6AFR6A # 5: 2GB / CH0 + CH1 -SPD_SOURCES += Elpida_EDJ4216EFBG # 6: 2GB / CH0 + CH1 -SPD_SOURCES += Hynix_HMT425S6CFR6A # 7: 2GB / CH0 + CH1 - -LIB_SPD_DEPS := $(foreach f, $(SPD_SOURCES), src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/spd/$(f).spd.hex) diff --git a/src/mainboard/google/slippy/variants/peppy/Makefile.mk b/src/mainboard/google/slippy/variants/peppy/Makefile.mk new file mode 100644 index 0000000000..f8c5b0d88f --- /dev/null +++ b/src/mainboard/google/slippy/variants/peppy/Makefile.mk @@ -0,0 +1,13 @@ +## SPDX-License-Identifier: GPL-2.0-only + +# Order of names in SPD_SOURCES is important! +SPD_SOURCES = Micron_4KTF25664HZ # 0: 4GB / CH0 + CH1 +SPD_SOURCES += Hynix_HMT425S6AFR6A # 1: 4GB / CH0 + CH1 +SPD_SOURCES += Elpida_EDJ4216EFBG # 2: 4GB / CH0 + CH1 +SPD_SOURCES += Hynix_HMT425S6CFR6A # 3: 4GB / CH0 + CH1 +SPD_SOURCES += Micron_4KTF25664HZ # 4: 2GB / CH0 + CH1 +SPD_SOURCES += Hynix_HMT425S6AFR6A # 5: 2GB / CH0 + CH1 +SPD_SOURCES += Elpida_EDJ4216EFBG # 6: 2GB / CH0 + CH1 +SPD_SOURCES += Hynix_HMT425S6CFR6A # 7: 2GB / CH0 + CH1 + +LIB_SPD_DEPS := $(foreach f, $(SPD_SOURCES), src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/spd/$(f).spd.hex) diff --git a/src/mainboard/google/slippy/variants/wolf/Makefile.inc b/src/mainboard/google/slippy/variants/wolf/Makefile.inc deleted file mode 100644 index cd38d98051..0000000000 --- a/src/mainboard/google/slippy/variants/wolf/Makefile.inc +++ /dev/null @@ -1,11 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -# Order of names in SPD_SOURCES is important! -SPD_SOURCES = Micron_4KTF25664HZ # 0: 4GB / CH0 + CH1 -SPD_SOURCES += Hynix_HMT425S6AFR6A # 1: 4GB / CH0 + CH1 -SPD_SOURCES += Samsung_K4B4G1646B # 2: 4GB / CH0 + CH1 -SPD_SOURCES += Micron_4KTF25664HZ # 3: 2GB / CH0 -SPD_SOURCES += Hynix_HMT425S6AFR6A # 4: 2GB / CH0 -SPD_SOURCES += Samsung_K4B4G1646B # 4: 2GB / CH0 - -LIB_SPD_DEPS := $(foreach f, $(SPD_SOURCES), src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/spd/$(f).spd.hex) diff --git a/src/mainboard/google/slippy/variants/wolf/Makefile.mk b/src/mainboard/google/slippy/variants/wolf/Makefile.mk new file mode 100644 index 0000000000..cd38d98051 --- /dev/null +++ b/src/mainboard/google/slippy/variants/wolf/Makefile.mk @@ -0,0 +1,11 @@ +## SPDX-License-Identifier: GPL-2.0-only + +# Order of names in SPD_SOURCES is important! +SPD_SOURCES = Micron_4KTF25664HZ # 0: 4GB / CH0 + CH1 +SPD_SOURCES += Hynix_HMT425S6AFR6A # 1: 4GB / CH0 + CH1 +SPD_SOURCES += Samsung_K4B4G1646B # 2: 4GB / CH0 + CH1 +SPD_SOURCES += Micron_4KTF25664HZ # 3: 2GB / CH0 +SPD_SOURCES += Hynix_HMT425S6AFR6A # 4: 2GB / CH0 +SPD_SOURCES += Samsung_K4B4G1646B # 4: 2GB / CH0 + +LIB_SPD_DEPS := $(foreach f, $(SPD_SOURCES), src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/spd/$(f).spd.hex) -- cgit v1.2.3