Felix Singer has submitted this change. ( https://review.coreboot.org/c/coreboot/+/80109?usp=email )
(
3 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: mb/google/sarien to zork: Rename Makefiles from .inc to .mk ......................................................................
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 gaumless@gmail.com Change-Id: Ib8a2ae26ed4380592d15e1a7b2d682639413af01 Reviewed-on: https://review.coreboot.org/c/coreboot/+/80109 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Felix Singer service+coreboot-gerrit@felixsinger.de Reviewed-by: Maximilian Brune maximilian.brune@9elements.com --- R src/mainboard/google/sarien/Makefile.mk R src/mainboard/google/sarien/variants/arcada/Makefile.mk R src/mainboard/google/sarien/variants/sarien/Makefile.mk R src/mainboard/google/skyrim/Makefile.mk R src/mainboard/google/skyrim/variants/baseboard/Makefile.mk R src/mainboard/google/skyrim/variants/crystaldrift/Makefile.mk R src/mainboard/google/skyrim/variants/crystaldrift/memory/Makefile.mk R src/mainboard/google/skyrim/variants/frostflow/Makefile.mk R src/mainboard/google/skyrim/variants/frostflow/memory/Makefile.mk R src/mainboard/google/skyrim/variants/markarth/Makefile.mk R src/mainboard/google/skyrim/variants/markarth/memory/Makefile.mk R src/mainboard/google/skyrim/variants/skyrim/Makefile.mk R src/mainboard/google/skyrim/variants/skyrim/memory/Makefile.mk R src/mainboard/google/skyrim/variants/winterhold/Makefile.mk R src/mainboard/google/skyrim/variants/winterhold/memory/Makefile.mk R src/mainboard/google/slippy/Makefile.mk R src/mainboard/google/slippy/variants/falco/Makefile.mk R src/mainboard/google/slippy/variants/leon/Makefile.mk R src/mainboard/google/slippy/variants/peppy/Makefile.mk R src/mainboard/google/slippy/variants/wolf/Makefile.mk R src/mainboard/google/smaug/Makefile.mk R src/mainboard/google/smaug/bct/Makefile.mk R src/mainboard/google/storm/Makefile.mk R src/mainboard/google/stout/Makefile.mk R src/mainboard/google/trogdor/Makefile.mk R src/mainboard/google/veyron/Makefile.mk R src/mainboard/google/veyron_mickey/Makefile.mk R src/mainboard/google/veyron_rialto/Makefile.mk R src/mainboard/google/volteer/Makefile.mk R src/mainboard/google/volteer/spd/Makefile.mk R src/mainboard/google/volteer/variants/baseboard/Makefile.mk R src/mainboard/google/volteer/variants/chronicler/Makefile.mk R src/mainboard/google/volteer/variants/chronicler/memory/Makefile.mk R src/mainboard/google/volteer/variants/collis/Makefile.mk R src/mainboard/google/volteer/variants/collis/memory/Makefile.mk R src/mainboard/google/volteer/variants/copano/Makefile.mk R src/mainboard/google/volteer/variants/copano/memory/Makefile.mk R src/mainboard/google/volteer/variants/delbin/Makefile.mk R src/mainboard/google/volteer/variants/delbin/memory/Makefile.mk R src/mainboard/google/volteer/variants/drobit/Makefile.mk R src/mainboard/google/volteer/variants/drobit/memory/Makefile.mk R src/mainboard/google/volteer/variants/eldrid/Makefile.mk R src/mainboard/google/volteer/variants/eldrid/memory/Makefile.mk R src/mainboard/google/volteer/variants/elemi/Makefile.mk R src/mainboard/google/volteer/variants/elemi/memory/Makefile.mk R src/mainboard/google/volteer/variants/halvor/Makefile.mk R src/mainboard/google/volteer/variants/halvor/memory/Makefile.mk R src/mainboard/google/volteer/variants/lillipup/memory/Makefile.mk R src/mainboard/google/volteer/variants/lindar/Makefile.mk R src/mainboard/google/volteer/variants/lindar/memory/Makefile.mk R src/mainboard/google/volteer/variants/malefor/Makefile.mk R src/mainboard/google/volteer/variants/malefor/memory/Makefile.mk R src/mainboard/google/volteer/variants/terrador/Makefile.mk R src/mainboard/google/volteer/variants/terrador/memory/Makefile.mk R src/mainboard/google/volteer/variants/todor/Makefile.mk R src/mainboard/google/volteer/variants/todor/memory/Makefile.mk R src/mainboard/google/volteer/variants/trondo/Makefile.mk R src/mainboard/google/volteer/variants/trondo/memory/Makefile.mk R src/mainboard/google/volteer/variants/voema/Makefile.mk R src/mainboard/google/volteer/variants/voema/memory/Makefile.mk R src/mainboard/google/volteer/variants/volet/Makefile.mk R src/mainboard/google/volteer/variants/volet/memory/Makefile.mk R src/mainboard/google/volteer/variants/volteer/Makefile.mk R src/mainboard/google/volteer/variants/volteer/memory/Makefile.mk R src/mainboard/google/volteer/variants/volteer2/Makefile.mk R src/mainboard/google/volteer/variants/volteer2/memory/Makefile.mk R src/mainboard/google/volteer/variants/voxel/Makefile.mk R src/mainboard/google/volteer/variants/voxel/memory/Makefile.mk R src/mainboard/google/zork/Makefile.mk R src/mainboard/google/zork/spd/Makefile.mk R src/mainboard/google/zork/variants/baseboard/Makefile.mk R src/mainboard/google/zork/variants/baseboard/dalboz/Makefile.mk R src/mainboard/google/zork/variants/baseboard/trembyle/Makefile.mk R src/mainboard/google/zork/variants/berknip/Makefile.mk R src/mainboard/google/zork/variants/berknip/spd/Makefile.mk R src/mainboard/google/zork/variants/dalboz/Makefile.mk R src/mainboard/google/zork/variants/dalboz/spd/Makefile.mk R src/mainboard/google/zork/variants/dirinboz/Makefile.mk R src/mainboard/google/zork/variants/dirinboz/spd/Makefile.mk R src/mainboard/google/zork/variants/ezkinil/Makefile.mk R src/mainboard/google/zork/variants/ezkinil/spd/Makefile.mk R src/mainboard/google/zork/variants/gumboz/Makefile.mk R src/mainboard/google/zork/variants/gumboz/spd/Makefile.mk R src/mainboard/google/zork/variants/morphius/Makefile.mk R src/mainboard/google/zork/variants/morphius/spd/Makefile.mk R src/mainboard/google/zork/variants/shuboz/Makefile.mk R src/mainboard/google/zork/variants/shuboz/spd/Makefile.mk R src/mainboard/google/zork/variants/trembyle/Makefile.mk R src/mainboard/google/zork/variants/trembyle/spd/Makefile.mk R src/mainboard/google/zork/variants/vilboz/Makefile.mk R src/mainboard/google/zork/variants/vilboz/spd/Makefile.mk R src/mainboard/google/zork/variants/woomax/Makefile.mk R src/mainboard/google/zork/variants/woomax/spd/Makefile.mk 93 files changed, 1 insertion(+), 1 deletion(-)
Approvals: Felix Singer: Looks good to me, approved Maximilian Brune: Looks good to me, approved build bot (Jenkins): Verified
diff --git a/src/mainboard/google/sarien/Makefile.inc b/src/mainboard/google/sarien/Makefile.mk similarity index 100% rename from src/mainboard/google/sarien/Makefile.inc rename to src/mainboard/google/sarien/Makefile.mk diff --git a/src/mainboard/google/sarien/variants/arcada/Makefile.inc b/src/mainboard/google/sarien/variants/arcada/Makefile.mk similarity index 100% rename from src/mainboard/google/sarien/variants/arcada/Makefile.inc rename to src/mainboard/google/sarien/variants/arcada/Makefile.mk diff --git a/src/mainboard/google/sarien/variants/sarien/Makefile.inc b/src/mainboard/google/sarien/variants/sarien/Makefile.mk similarity index 100% rename from src/mainboard/google/sarien/variants/sarien/Makefile.inc rename to src/mainboard/google/sarien/variants/sarien/Makefile.mk diff --git a/src/mainboard/google/skyrim/Makefile.inc b/src/mainboard/google/skyrim/Makefile.mk similarity index 96% rename from src/mainboard/google/skyrim/Makefile.inc rename to src/mainboard/google/skyrim/Makefile.mk index 2b65b3f..9333413 100644 --- a/src/mainboard/google/skyrim/Makefile.inc +++ b/src/mainboard/google/skyrim/Makefile.mk @@ -25,7 +25,7 @@ ifneq ($(wildcard $(APCB_PATH)/$(APCB_NAME)),) $(info APCB sources present.)
-ifneq ($(wildcard $(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/memory/Makefile.inc),) +ifneq ($(wildcard $(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/memory/Makefile.mk),)
LIB_SPD_DEPS = $(SPD_SOURCES)
diff --git a/src/mainboard/google/skyrim/variants/baseboard/Makefile.inc b/src/mainboard/google/skyrim/variants/baseboard/Makefile.mk similarity index 100% rename from src/mainboard/google/skyrim/variants/baseboard/Makefile.inc rename to src/mainboard/google/skyrim/variants/baseboard/Makefile.mk diff --git a/src/mainboard/google/skyrim/variants/crystaldrift/Makefile.inc b/src/mainboard/google/skyrim/variants/crystaldrift/Makefile.mk similarity index 100% rename from src/mainboard/google/skyrim/variants/crystaldrift/Makefile.inc rename to src/mainboard/google/skyrim/variants/crystaldrift/Makefile.mk diff --git a/src/mainboard/google/skyrim/variants/crystaldrift/memory/Makefile.inc b/src/mainboard/google/skyrim/variants/crystaldrift/memory/Makefile.mk similarity index 100% rename from src/mainboard/google/skyrim/variants/crystaldrift/memory/Makefile.inc rename to src/mainboard/google/skyrim/variants/crystaldrift/memory/Makefile.mk diff --git a/src/mainboard/google/skyrim/variants/frostflow/Makefile.inc b/src/mainboard/google/skyrim/variants/frostflow/Makefile.mk similarity index 100% rename from src/mainboard/google/skyrim/variants/frostflow/Makefile.inc rename to src/mainboard/google/skyrim/variants/frostflow/Makefile.mk diff --git a/src/mainboard/google/skyrim/variants/frostflow/memory/Makefile.inc b/src/mainboard/google/skyrim/variants/frostflow/memory/Makefile.mk similarity index 100% rename from src/mainboard/google/skyrim/variants/frostflow/memory/Makefile.inc rename to src/mainboard/google/skyrim/variants/frostflow/memory/Makefile.mk diff --git a/src/mainboard/google/skyrim/variants/markarth/Makefile.inc b/src/mainboard/google/skyrim/variants/markarth/Makefile.mk similarity index 100% rename from src/mainboard/google/skyrim/variants/markarth/Makefile.inc rename to src/mainboard/google/skyrim/variants/markarth/Makefile.mk diff --git a/src/mainboard/google/skyrim/variants/markarth/memory/Makefile.inc b/src/mainboard/google/skyrim/variants/markarth/memory/Makefile.mk similarity index 100% rename from src/mainboard/google/skyrim/variants/markarth/memory/Makefile.inc rename to src/mainboard/google/skyrim/variants/markarth/memory/Makefile.mk diff --git a/src/mainboard/google/skyrim/variants/skyrim/Makefile.inc b/src/mainboard/google/skyrim/variants/skyrim/Makefile.mk similarity index 100% rename from src/mainboard/google/skyrim/variants/skyrim/Makefile.inc rename to src/mainboard/google/skyrim/variants/skyrim/Makefile.mk diff --git a/src/mainboard/google/skyrim/variants/skyrim/memory/Makefile.inc b/src/mainboard/google/skyrim/variants/skyrim/memory/Makefile.mk similarity index 100% rename from src/mainboard/google/skyrim/variants/skyrim/memory/Makefile.inc rename to src/mainboard/google/skyrim/variants/skyrim/memory/Makefile.mk diff --git a/src/mainboard/google/skyrim/variants/winterhold/Makefile.inc b/src/mainboard/google/skyrim/variants/winterhold/Makefile.mk similarity index 100% rename from src/mainboard/google/skyrim/variants/winterhold/Makefile.inc rename to src/mainboard/google/skyrim/variants/winterhold/Makefile.mk diff --git a/src/mainboard/google/skyrim/variants/winterhold/memory/Makefile.inc b/src/mainboard/google/skyrim/variants/winterhold/memory/Makefile.mk similarity index 100% rename from src/mainboard/google/skyrim/variants/winterhold/memory/Makefile.inc rename to src/mainboard/google/skyrim/variants/winterhold/memory/Makefile.mk diff --git a/src/mainboard/google/slippy/Makefile.inc b/src/mainboard/google/slippy/Makefile.mk similarity index 100% rename from src/mainboard/google/slippy/Makefile.inc rename to src/mainboard/google/slippy/Makefile.mk diff --git a/src/mainboard/google/slippy/variants/falco/Makefile.inc b/src/mainboard/google/slippy/variants/falco/Makefile.mk similarity index 100% rename from src/mainboard/google/slippy/variants/falco/Makefile.inc rename to src/mainboard/google/slippy/variants/falco/Makefile.mk diff --git a/src/mainboard/google/slippy/variants/leon/Makefile.inc b/src/mainboard/google/slippy/variants/leon/Makefile.mk similarity index 100% rename from src/mainboard/google/slippy/variants/leon/Makefile.inc rename to src/mainboard/google/slippy/variants/leon/Makefile.mk diff --git a/src/mainboard/google/slippy/variants/peppy/Makefile.inc b/src/mainboard/google/slippy/variants/peppy/Makefile.mk similarity index 100% rename from src/mainboard/google/slippy/variants/peppy/Makefile.inc rename to src/mainboard/google/slippy/variants/peppy/Makefile.mk diff --git a/src/mainboard/google/slippy/variants/wolf/Makefile.inc b/src/mainboard/google/slippy/variants/wolf/Makefile.mk similarity index 100% rename from src/mainboard/google/slippy/variants/wolf/Makefile.inc rename to src/mainboard/google/slippy/variants/wolf/Makefile.mk diff --git a/src/mainboard/google/smaug/Makefile.inc b/src/mainboard/google/smaug/Makefile.mk similarity index 100% rename from src/mainboard/google/smaug/Makefile.inc rename to src/mainboard/google/smaug/Makefile.mk diff --git a/src/mainboard/google/smaug/bct/Makefile.inc b/src/mainboard/google/smaug/bct/Makefile.mk similarity index 100% rename from src/mainboard/google/smaug/bct/Makefile.inc rename to src/mainboard/google/smaug/bct/Makefile.mk diff --git a/src/mainboard/google/storm/Makefile.inc b/src/mainboard/google/storm/Makefile.mk similarity index 100% rename from src/mainboard/google/storm/Makefile.inc rename to src/mainboard/google/storm/Makefile.mk diff --git a/src/mainboard/google/stout/Makefile.inc b/src/mainboard/google/stout/Makefile.mk similarity index 100% rename from src/mainboard/google/stout/Makefile.inc rename to src/mainboard/google/stout/Makefile.mk diff --git a/src/mainboard/google/trogdor/Makefile.inc b/src/mainboard/google/trogdor/Makefile.mk similarity index 100% rename from src/mainboard/google/trogdor/Makefile.inc rename to src/mainboard/google/trogdor/Makefile.mk diff --git a/src/mainboard/google/veyron/Makefile.inc b/src/mainboard/google/veyron/Makefile.mk similarity index 100% rename from src/mainboard/google/veyron/Makefile.inc rename to src/mainboard/google/veyron/Makefile.mk diff --git a/src/mainboard/google/veyron_mickey/Makefile.inc b/src/mainboard/google/veyron_mickey/Makefile.mk similarity index 100% rename from src/mainboard/google/veyron_mickey/Makefile.inc rename to src/mainboard/google/veyron_mickey/Makefile.mk diff --git a/src/mainboard/google/veyron_rialto/Makefile.inc b/src/mainboard/google/veyron_rialto/Makefile.mk similarity index 100% rename from src/mainboard/google/veyron_rialto/Makefile.inc rename to src/mainboard/google/veyron_rialto/Makefile.mk diff --git a/src/mainboard/google/volteer/Makefile.inc b/src/mainboard/google/volteer/Makefile.mk similarity index 100% rename from src/mainboard/google/volteer/Makefile.inc rename to src/mainboard/google/volteer/Makefile.mk diff --git a/src/mainboard/google/volteer/spd/Makefile.inc b/src/mainboard/google/volteer/spd/Makefile.mk similarity index 100% rename from src/mainboard/google/volteer/spd/Makefile.inc rename to src/mainboard/google/volteer/spd/Makefile.mk diff --git a/src/mainboard/google/volteer/variants/baseboard/Makefile.inc b/src/mainboard/google/volteer/variants/baseboard/Makefile.mk similarity index 100% rename from src/mainboard/google/volteer/variants/baseboard/Makefile.inc rename to src/mainboard/google/volteer/variants/baseboard/Makefile.mk diff --git a/src/mainboard/google/volteer/variants/chronicler/Makefile.inc b/src/mainboard/google/volteer/variants/chronicler/Makefile.mk similarity index 100% rename from src/mainboard/google/volteer/variants/chronicler/Makefile.inc rename to src/mainboard/google/volteer/variants/chronicler/Makefile.mk diff --git a/src/mainboard/google/volteer/variants/chronicler/memory/Makefile.inc b/src/mainboard/google/volteer/variants/chronicler/memory/Makefile.mk similarity index 100% rename from src/mainboard/google/volteer/variants/chronicler/memory/Makefile.inc rename to src/mainboard/google/volteer/variants/chronicler/memory/Makefile.mk diff --git a/src/mainboard/google/volteer/variants/collis/Makefile.inc b/src/mainboard/google/volteer/variants/collis/Makefile.mk similarity index 100% rename from src/mainboard/google/volteer/variants/collis/Makefile.inc rename to src/mainboard/google/volteer/variants/collis/Makefile.mk diff --git a/src/mainboard/google/volteer/variants/collis/memory/Makefile.inc b/src/mainboard/google/volteer/variants/collis/memory/Makefile.mk similarity index 100% rename from src/mainboard/google/volteer/variants/collis/memory/Makefile.inc rename to src/mainboard/google/volteer/variants/collis/memory/Makefile.mk diff --git a/src/mainboard/google/volteer/variants/copano/Makefile.inc b/src/mainboard/google/volteer/variants/copano/Makefile.mk similarity index 100% rename from src/mainboard/google/volteer/variants/copano/Makefile.inc rename to src/mainboard/google/volteer/variants/copano/Makefile.mk diff --git a/src/mainboard/google/volteer/variants/copano/memory/Makefile.inc b/src/mainboard/google/volteer/variants/copano/memory/Makefile.mk similarity index 100% rename from src/mainboard/google/volteer/variants/copano/memory/Makefile.inc rename to src/mainboard/google/volteer/variants/copano/memory/Makefile.mk diff --git a/src/mainboard/google/volteer/variants/delbin/Makefile.inc b/src/mainboard/google/volteer/variants/delbin/Makefile.mk similarity index 100% rename from src/mainboard/google/volteer/variants/delbin/Makefile.inc rename to src/mainboard/google/volteer/variants/delbin/Makefile.mk diff --git a/src/mainboard/google/volteer/variants/delbin/memory/Makefile.inc b/src/mainboard/google/volteer/variants/delbin/memory/Makefile.mk similarity index 100% rename from src/mainboard/google/volteer/variants/delbin/memory/Makefile.inc rename to src/mainboard/google/volteer/variants/delbin/memory/Makefile.mk diff --git a/src/mainboard/google/volteer/variants/drobit/Makefile.inc b/src/mainboard/google/volteer/variants/drobit/Makefile.mk similarity index 100% rename from src/mainboard/google/volteer/variants/drobit/Makefile.inc rename to src/mainboard/google/volteer/variants/drobit/Makefile.mk diff --git a/src/mainboard/google/volteer/variants/drobit/memory/Makefile.inc b/src/mainboard/google/volteer/variants/drobit/memory/Makefile.mk similarity index 100% rename from src/mainboard/google/volteer/variants/drobit/memory/Makefile.inc rename to src/mainboard/google/volteer/variants/drobit/memory/Makefile.mk diff --git a/src/mainboard/google/volteer/variants/eldrid/Makefile.inc b/src/mainboard/google/volteer/variants/eldrid/Makefile.mk similarity index 100% rename from src/mainboard/google/volteer/variants/eldrid/Makefile.inc rename to src/mainboard/google/volteer/variants/eldrid/Makefile.mk diff --git a/src/mainboard/google/volteer/variants/eldrid/memory/Makefile.inc b/src/mainboard/google/volteer/variants/eldrid/memory/Makefile.mk similarity index 100% rename from src/mainboard/google/volteer/variants/eldrid/memory/Makefile.inc rename to src/mainboard/google/volteer/variants/eldrid/memory/Makefile.mk diff --git a/src/mainboard/google/volteer/variants/elemi/Makefile.inc b/src/mainboard/google/volteer/variants/elemi/Makefile.mk similarity index 100% rename from src/mainboard/google/volteer/variants/elemi/Makefile.inc rename to src/mainboard/google/volteer/variants/elemi/Makefile.mk diff --git a/src/mainboard/google/volteer/variants/elemi/memory/Makefile.inc b/src/mainboard/google/volteer/variants/elemi/memory/Makefile.mk similarity index 100% rename from src/mainboard/google/volteer/variants/elemi/memory/Makefile.inc rename to src/mainboard/google/volteer/variants/elemi/memory/Makefile.mk diff --git a/src/mainboard/google/volteer/variants/halvor/Makefile.inc b/src/mainboard/google/volteer/variants/halvor/Makefile.mk similarity index 100% rename from src/mainboard/google/volteer/variants/halvor/Makefile.inc rename to src/mainboard/google/volteer/variants/halvor/Makefile.mk diff --git a/src/mainboard/google/volteer/variants/halvor/memory/Makefile.inc b/src/mainboard/google/volteer/variants/halvor/memory/Makefile.mk similarity index 100% rename from src/mainboard/google/volteer/variants/halvor/memory/Makefile.inc rename to src/mainboard/google/volteer/variants/halvor/memory/Makefile.mk diff --git a/src/mainboard/google/volteer/variants/lillipup/memory/Makefile.inc b/src/mainboard/google/volteer/variants/lillipup/memory/Makefile.mk similarity index 100% rename from src/mainboard/google/volteer/variants/lillipup/memory/Makefile.inc rename to src/mainboard/google/volteer/variants/lillipup/memory/Makefile.mk diff --git a/src/mainboard/google/volteer/variants/lindar/Makefile.inc b/src/mainboard/google/volteer/variants/lindar/Makefile.mk similarity index 100% rename from src/mainboard/google/volteer/variants/lindar/Makefile.inc rename to src/mainboard/google/volteer/variants/lindar/Makefile.mk diff --git a/src/mainboard/google/volteer/variants/lindar/memory/Makefile.inc b/src/mainboard/google/volteer/variants/lindar/memory/Makefile.mk similarity index 100% rename from src/mainboard/google/volteer/variants/lindar/memory/Makefile.inc rename to src/mainboard/google/volteer/variants/lindar/memory/Makefile.mk diff --git a/src/mainboard/google/volteer/variants/malefor/Makefile.inc b/src/mainboard/google/volteer/variants/malefor/Makefile.mk similarity index 100% rename from src/mainboard/google/volteer/variants/malefor/Makefile.inc rename to src/mainboard/google/volteer/variants/malefor/Makefile.mk diff --git a/src/mainboard/google/volteer/variants/malefor/memory/Makefile.inc b/src/mainboard/google/volteer/variants/malefor/memory/Makefile.mk similarity index 100% rename from src/mainboard/google/volteer/variants/malefor/memory/Makefile.inc rename to src/mainboard/google/volteer/variants/malefor/memory/Makefile.mk diff --git a/src/mainboard/google/volteer/variants/terrador/Makefile.inc b/src/mainboard/google/volteer/variants/terrador/Makefile.mk similarity index 100% rename from src/mainboard/google/volteer/variants/terrador/Makefile.inc rename to src/mainboard/google/volteer/variants/terrador/Makefile.mk diff --git a/src/mainboard/google/volteer/variants/terrador/memory/Makefile.inc b/src/mainboard/google/volteer/variants/terrador/memory/Makefile.mk similarity index 100% rename from src/mainboard/google/volteer/variants/terrador/memory/Makefile.inc rename to src/mainboard/google/volteer/variants/terrador/memory/Makefile.mk diff --git a/src/mainboard/google/volteer/variants/todor/Makefile.inc b/src/mainboard/google/volteer/variants/todor/Makefile.mk similarity index 100% rename from src/mainboard/google/volteer/variants/todor/Makefile.inc rename to src/mainboard/google/volteer/variants/todor/Makefile.mk diff --git a/src/mainboard/google/volteer/variants/todor/memory/Makefile.inc b/src/mainboard/google/volteer/variants/todor/memory/Makefile.mk similarity index 100% rename from src/mainboard/google/volteer/variants/todor/memory/Makefile.inc rename to src/mainboard/google/volteer/variants/todor/memory/Makefile.mk diff --git a/src/mainboard/google/volteer/variants/trondo/Makefile.inc b/src/mainboard/google/volteer/variants/trondo/Makefile.mk similarity index 100% rename from src/mainboard/google/volteer/variants/trondo/Makefile.inc rename to src/mainboard/google/volteer/variants/trondo/Makefile.mk diff --git a/src/mainboard/google/volteer/variants/trondo/memory/Makefile.inc b/src/mainboard/google/volteer/variants/trondo/memory/Makefile.mk similarity index 100% rename from src/mainboard/google/volteer/variants/trondo/memory/Makefile.inc rename to src/mainboard/google/volteer/variants/trondo/memory/Makefile.mk diff --git a/src/mainboard/google/volteer/variants/voema/Makefile.inc b/src/mainboard/google/volteer/variants/voema/Makefile.mk similarity index 100% rename from src/mainboard/google/volteer/variants/voema/Makefile.inc rename to src/mainboard/google/volteer/variants/voema/Makefile.mk diff --git a/src/mainboard/google/volteer/variants/voema/memory/Makefile.inc b/src/mainboard/google/volteer/variants/voema/memory/Makefile.mk similarity index 100% rename from src/mainboard/google/volteer/variants/voema/memory/Makefile.inc rename to src/mainboard/google/volteer/variants/voema/memory/Makefile.mk diff --git a/src/mainboard/google/volteer/variants/volet/Makefile.inc b/src/mainboard/google/volteer/variants/volet/Makefile.mk similarity index 100% rename from src/mainboard/google/volteer/variants/volet/Makefile.inc rename to src/mainboard/google/volteer/variants/volet/Makefile.mk diff --git a/src/mainboard/google/volteer/variants/volet/memory/Makefile.inc b/src/mainboard/google/volteer/variants/volet/memory/Makefile.mk similarity index 100% rename from src/mainboard/google/volteer/variants/volet/memory/Makefile.inc rename to src/mainboard/google/volteer/variants/volet/memory/Makefile.mk diff --git a/src/mainboard/google/volteer/variants/volteer/Makefile.inc b/src/mainboard/google/volteer/variants/volteer/Makefile.mk similarity index 100% rename from src/mainboard/google/volteer/variants/volteer/Makefile.inc rename to src/mainboard/google/volteer/variants/volteer/Makefile.mk diff --git a/src/mainboard/google/volteer/variants/volteer/memory/Makefile.inc b/src/mainboard/google/volteer/variants/volteer/memory/Makefile.mk similarity index 100% rename from src/mainboard/google/volteer/variants/volteer/memory/Makefile.inc rename to src/mainboard/google/volteer/variants/volteer/memory/Makefile.mk diff --git a/src/mainboard/google/volteer/variants/volteer2/Makefile.inc b/src/mainboard/google/volteer/variants/volteer2/Makefile.mk similarity index 100% rename from src/mainboard/google/volteer/variants/volteer2/Makefile.inc rename to src/mainboard/google/volteer/variants/volteer2/Makefile.mk diff --git a/src/mainboard/google/volteer/variants/volteer2/memory/Makefile.inc b/src/mainboard/google/volteer/variants/volteer2/memory/Makefile.mk similarity index 100% rename from src/mainboard/google/volteer/variants/volteer2/memory/Makefile.inc rename to src/mainboard/google/volteer/variants/volteer2/memory/Makefile.mk diff --git a/src/mainboard/google/volteer/variants/voxel/Makefile.inc b/src/mainboard/google/volteer/variants/voxel/Makefile.mk similarity index 100% rename from src/mainboard/google/volteer/variants/voxel/Makefile.inc rename to src/mainboard/google/volteer/variants/voxel/Makefile.mk diff --git a/src/mainboard/google/volteer/variants/voxel/memory/Makefile.inc b/src/mainboard/google/volteer/variants/voxel/memory/Makefile.mk similarity index 100% rename from src/mainboard/google/volteer/variants/voxel/memory/Makefile.inc rename to src/mainboard/google/volteer/variants/voxel/memory/Makefile.mk diff --git a/src/mainboard/google/zork/Makefile.inc b/src/mainboard/google/zork/Makefile.mk similarity index 100% rename from src/mainboard/google/zork/Makefile.inc rename to src/mainboard/google/zork/Makefile.mk diff --git a/src/mainboard/google/zork/spd/Makefile.inc b/src/mainboard/google/zork/spd/Makefile.mk similarity index 100% rename from src/mainboard/google/zork/spd/Makefile.inc rename to src/mainboard/google/zork/spd/Makefile.mk diff --git a/src/mainboard/google/zork/variants/baseboard/Makefile.inc b/src/mainboard/google/zork/variants/baseboard/Makefile.mk similarity index 100% rename from src/mainboard/google/zork/variants/baseboard/Makefile.inc rename to src/mainboard/google/zork/variants/baseboard/Makefile.mk diff --git a/src/mainboard/google/zork/variants/baseboard/dalboz/Makefile.inc b/src/mainboard/google/zork/variants/baseboard/dalboz/Makefile.mk similarity index 100% rename from src/mainboard/google/zork/variants/baseboard/dalboz/Makefile.inc rename to src/mainboard/google/zork/variants/baseboard/dalboz/Makefile.mk diff --git a/src/mainboard/google/zork/variants/baseboard/trembyle/Makefile.inc b/src/mainboard/google/zork/variants/baseboard/trembyle/Makefile.mk similarity index 100% rename from src/mainboard/google/zork/variants/baseboard/trembyle/Makefile.inc rename to src/mainboard/google/zork/variants/baseboard/trembyle/Makefile.mk diff --git a/src/mainboard/google/zork/variants/berknip/Makefile.inc b/src/mainboard/google/zork/variants/berknip/Makefile.mk similarity index 100% rename from src/mainboard/google/zork/variants/berknip/Makefile.inc rename to src/mainboard/google/zork/variants/berknip/Makefile.mk diff --git a/src/mainboard/google/zork/variants/berknip/spd/Makefile.inc b/src/mainboard/google/zork/variants/berknip/spd/Makefile.mk similarity index 100% rename from src/mainboard/google/zork/variants/berknip/spd/Makefile.inc rename to src/mainboard/google/zork/variants/berknip/spd/Makefile.mk diff --git a/src/mainboard/google/zork/variants/dalboz/Makefile.inc b/src/mainboard/google/zork/variants/dalboz/Makefile.mk similarity index 100% rename from src/mainboard/google/zork/variants/dalboz/Makefile.inc rename to src/mainboard/google/zork/variants/dalboz/Makefile.mk diff --git a/src/mainboard/google/zork/variants/dalboz/spd/Makefile.inc b/src/mainboard/google/zork/variants/dalboz/spd/Makefile.mk similarity index 100% rename from src/mainboard/google/zork/variants/dalboz/spd/Makefile.inc rename to src/mainboard/google/zork/variants/dalboz/spd/Makefile.mk diff --git a/src/mainboard/google/zork/variants/dirinboz/Makefile.inc b/src/mainboard/google/zork/variants/dirinboz/Makefile.mk similarity index 100% rename from src/mainboard/google/zork/variants/dirinboz/Makefile.inc rename to src/mainboard/google/zork/variants/dirinboz/Makefile.mk diff --git a/src/mainboard/google/zork/variants/dirinboz/spd/Makefile.inc b/src/mainboard/google/zork/variants/dirinboz/spd/Makefile.mk similarity index 100% rename from src/mainboard/google/zork/variants/dirinboz/spd/Makefile.inc rename to src/mainboard/google/zork/variants/dirinboz/spd/Makefile.mk diff --git a/src/mainboard/google/zork/variants/ezkinil/Makefile.inc b/src/mainboard/google/zork/variants/ezkinil/Makefile.mk similarity index 100% rename from src/mainboard/google/zork/variants/ezkinil/Makefile.inc rename to src/mainboard/google/zork/variants/ezkinil/Makefile.mk diff --git a/src/mainboard/google/zork/variants/ezkinil/spd/Makefile.inc b/src/mainboard/google/zork/variants/ezkinil/spd/Makefile.mk similarity index 100% rename from src/mainboard/google/zork/variants/ezkinil/spd/Makefile.inc rename to src/mainboard/google/zork/variants/ezkinil/spd/Makefile.mk diff --git a/src/mainboard/google/zork/variants/gumboz/Makefile.inc b/src/mainboard/google/zork/variants/gumboz/Makefile.mk similarity index 100% rename from src/mainboard/google/zork/variants/gumboz/Makefile.inc rename to src/mainboard/google/zork/variants/gumboz/Makefile.mk diff --git a/src/mainboard/google/zork/variants/gumboz/spd/Makefile.inc b/src/mainboard/google/zork/variants/gumboz/spd/Makefile.mk similarity index 100% rename from src/mainboard/google/zork/variants/gumboz/spd/Makefile.inc rename to src/mainboard/google/zork/variants/gumboz/spd/Makefile.mk diff --git a/src/mainboard/google/zork/variants/morphius/Makefile.inc b/src/mainboard/google/zork/variants/morphius/Makefile.mk similarity index 100% rename from src/mainboard/google/zork/variants/morphius/Makefile.inc rename to src/mainboard/google/zork/variants/morphius/Makefile.mk diff --git a/src/mainboard/google/zork/variants/morphius/spd/Makefile.inc b/src/mainboard/google/zork/variants/morphius/spd/Makefile.mk similarity index 100% rename from src/mainboard/google/zork/variants/morphius/spd/Makefile.inc rename to src/mainboard/google/zork/variants/morphius/spd/Makefile.mk diff --git a/src/mainboard/google/zork/variants/shuboz/Makefile.inc b/src/mainboard/google/zork/variants/shuboz/Makefile.mk similarity index 100% rename from src/mainboard/google/zork/variants/shuboz/Makefile.inc rename to src/mainboard/google/zork/variants/shuboz/Makefile.mk diff --git a/src/mainboard/google/zork/variants/shuboz/spd/Makefile.inc b/src/mainboard/google/zork/variants/shuboz/spd/Makefile.mk similarity index 100% rename from src/mainboard/google/zork/variants/shuboz/spd/Makefile.inc rename to src/mainboard/google/zork/variants/shuboz/spd/Makefile.mk diff --git a/src/mainboard/google/zork/variants/trembyle/Makefile.inc b/src/mainboard/google/zork/variants/trembyle/Makefile.mk similarity index 100% rename from src/mainboard/google/zork/variants/trembyle/Makefile.inc rename to src/mainboard/google/zork/variants/trembyle/Makefile.mk diff --git a/src/mainboard/google/zork/variants/trembyle/spd/Makefile.inc b/src/mainboard/google/zork/variants/trembyle/spd/Makefile.mk similarity index 100% rename from src/mainboard/google/zork/variants/trembyle/spd/Makefile.inc rename to src/mainboard/google/zork/variants/trembyle/spd/Makefile.mk diff --git a/src/mainboard/google/zork/variants/vilboz/Makefile.inc b/src/mainboard/google/zork/variants/vilboz/Makefile.mk similarity index 100% rename from src/mainboard/google/zork/variants/vilboz/Makefile.inc rename to src/mainboard/google/zork/variants/vilboz/Makefile.mk diff --git a/src/mainboard/google/zork/variants/vilboz/spd/Makefile.inc b/src/mainboard/google/zork/variants/vilboz/spd/Makefile.mk similarity index 100% rename from src/mainboard/google/zork/variants/vilboz/spd/Makefile.inc rename to src/mainboard/google/zork/variants/vilboz/spd/Makefile.mk diff --git a/src/mainboard/google/zork/variants/woomax/Makefile.inc b/src/mainboard/google/zork/variants/woomax/Makefile.mk similarity index 100% rename from src/mainboard/google/zork/variants/woomax/Makefile.inc rename to src/mainboard/google/zork/variants/woomax/Makefile.mk diff --git a/src/mainboard/google/zork/variants/woomax/spd/Makefile.inc b/src/mainboard/google/zork/variants/woomax/spd/Makefile.mk similarity index 100% rename from src/mainboard/google/zork/variants/woomax/spd/Makefile.inc rename to src/mainboard/google/zork/variants/woomax/spd/Makefile.mk