summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNico Huber <nico.huber@secunet.com>2020-03-24 13:51:26 +0100
committerPatrick Georgi <pgeorgi@google.com>2020-03-25 10:51:50 +0000
commite680caa2988ee1c6b08e1ba3ed85574ca4c4da43 (patch)
treea3dfc2cb3f0f64271d6f2b6796b9bb67bd081104
parent34d8036333ed1d16d1ef48d3a7c98cc7c7592599 (diff)
downloadcoreboot-e680caa2988ee1c6b08e1ba3ed85574ca4c4da43.tar.xz
Makefile.inc: Don't run `ifittool` with CONFIG_UPDATE_IMAGE
The dependency for `ifittool` was missing in the CONFIG_UPDATE_IMAGE case. Which led us to the question: Why run `ifittool` in this case? The idea of CONFIG_UPDATE_IMAGE is to update everything _but_ the bootblock. Change-Id: I7fd3bd1b56f495b16beb1e1f4b35b8cfcf25b2ba Signed-off-by: Nico Huber <nico.huber@secunet.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/39803 Reviewed-by: Patrick Georgi <pgeorgi@google.com> Reviewed-by: Angel Pons <th3fanbus@gmail.com> Reviewed-by: Felix Singer <felixsinger@posteo.net> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--Makefile.inc4
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile.inc b/Makefile.inc
index 43b29c73cc..dbf95d4fb3 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -1112,6 +1112,7 @@ ifeq ($(CONFIG_SEABIOS_ADD_SERCON_PORT_FILE),y)
$(CBFSTOOL) $@.tmp add-int -i $(CONFIG_SEABIOS_SERCON_PORT_ADDR) -n etc/sercon-port
endif
ifeq ($(CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE),y)
+ifneq ($(CONFIG_UPDATE_IMAGE),y) # never update the bootblock
ifeq ($(CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_HEADER),y)
@printf " UPDATE-FIT\n"
$(IFITTOOL) -f $@.tmp -a -n cpu_microcode_blob.bin -t 1 -s $(CONFIG_CPU_INTEL_NUM_FIT_ENTRIES) \
@@ -1146,7 +1147,8 @@ endif
endif
-endif
+endif # !CONFIG_UPDATE_IMAGE
+endif # CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE
mv $@.tmp $@
@printf " CBFSLAYOUT $(subst $(obj)/,,$(@))\n\n"
$(CBFSTOOL) $@ layout