From 376357c1078ca53573cfb338877d37398ce76978 Mon Sep 17 00:00:00 2001 From: Marshall Dawson Date: Tue, 29 Oct 2019 11:44:16 -0600 Subject: Makefile.inc: Consolidate submodule comments Reduce duplicated comments explaining that submodules' settings in .gitmodules are update=none, and that --checkout is required. This prepares for another submodule, and makes adding a third set of comments unnecessary. Change-Id: I7721333a61122284ed9975ecd2adc3271a879728 Signed-off-by: Marshall Dawson Reviewed-on: https://review.coreboot.org/c/coreboot/+/36440 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- Makefile.inc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'Makefile.inc') diff --git a/Makefile.inc b/Makefile.inc index 04c83d84d5..3ca113be4d 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -197,13 +197,11 @@ ifneq ($(UPDATED_SUBMODULES),1) # try to fetch non-optional submodules if the source is under git forgetthis:=$(if $(GIT),$(shell git submodule update --init)) ifeq ($(CONFIG_USE_BLOBS),y) -# this is necessary because 3rdparty/{blobs,intel-microcode} is update=none, and so is ignored -# unless explicitly requested and enabled through --checkout +# These items are necessary because each has update=none in .gitmodules. They are ignored +# until expressly requested and enabled with --checkout forgetthis:=$(if $(GIT),$(shell git submodule update --init --checkout 3rdparty/blobs)) forgetthis:=$(if $(GIT),$(shell git submodule update --init --checkout 3rdparty/intel-microcode)) ifeq ($(CONFIG_PLATFORM_USES_FSP1_0)$(CONFIG_PLATFORM_USES_FSP1_1)$(CONFIG_PLATFORM_USES_FSP2_0),y) -# this is necessary because 3rdparty/fsp is update=none, and so is ignored -# unless explicitly requested and enabled through --checkout forgetthis:=$(if $(GIT),$(shell git submodule update --init --checkout 3rdparty/fsp)) endif endif -- cgit v1.2.3