Nico Huber has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/39803 )
Change subject: Makefile.inc: Don't run `ifittool` with CONFIG_UPDATE_IMAGE ......................................................................
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 --- M Makefile.inc 1 file changed, 3 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/03/39803/1
diff --git a/Makefile.inc b/Makefile.inc index f172005..cd76188 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -1111,6 +1111,7 @@ $(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) \ @@ -1145,7 +1146,8 @@
endif
-endif +endif # !CONFIG_UPDATE_IMAGE +endif # CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE mv $@.tmp $@ @printf " CBFSLAYOUT $(subst $(obj)/,,$(@))\n\n" $(CBFSTOOL) $@ layout
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/39803 )
Change subject: Makefile.inc: Don't run `ifittool` with CONFIG_UPDATE_IMAGE ......................................................................
Patch Set 2: Code-Review+1
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/39803 )
Change subject: Makefile.inc: Don't run `ifittool` with CONFIG_UPDATE_IMAGE ......................................................................
Patch Set 2: Code-Review+2
Felix Singer has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/39803 )
Change subject: Makefile.inc: Don't run `ifittool` with CONFIG_UPDATE_IMAGE ......................................................................
Patch Set 2: Code-Review+2
Patrick Georgi has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/39803 )
Change subject: Makefile.inc: Don't run `ifittool` with CONFIG_UPDATE_IMAGE ......................................................................
Patch Set 3: Code-Review+2
Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/39803 )
Change subject: Makefile.inc: Don't run `ifittool` with CONFIG_UPDATE_IMAGE ......................................................................
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 --- M Makefile.inc 1 file changed, 3 insertions(+), 1 deletion(-)
Approvals: build bot (Jenkins): Verified Patrick Georgi: Looks good to me, approved Felix Singer: Looks good to me, approved Angel Pons: Looks good to me, approved
diff --git a/Makefile.inc b/Makefile.inc index 43b29c7..dbf95d4 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -1112,6 +1112,7 @@ $(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 # !CONFIG_UPDATE_IMAGE +endif # CONFIG_CPU_INTEL_FIRMWARE_INTERFACE_TABLE mv $@.tmp $@ @printf " CBFSLAYOUT $(subst $(obj)/,,$(@))\n\n" $(CBFSTOOL) $@ layout
-
Angel Pons (Code Review) -
Felix Singer (Code Review)
-
Nico Huber (Code Review)
-
Patrick Georgi (Code Review)