[coreboot-gerrit] Change in coreboot[master]: payloads/external: Update cbfs-ints with CONFIG_UPDATE_IMAGE

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/48898 )

Change subject: payloads/external: Update cbfs-ints with CONFIG_UPDATE_IMAGE
......................................................................

payloads/external: Update cbfs-ints with CONFIG_UPDATE_IMAGE

Change-Id: Icfbfff3ba680a85eb2f683867064b19f40b9d40f
Signed-off-by: Arthur Heymans 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/48898
Reviewed-by: Angel Pons 
Tested-by: build bot (Jenkins) 
---
M payloads/external/Makefile.inc
1 file changed, 3 insertions(+), 2 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Angel Pons: Looks good to me, approved

diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc
index 6fde12f..ec0905e 100644
--- a/payloads/external/Makefile.inc
+++ b/payloads/external/Makefile.inc
@@ -101,21 +101,21 @@

ifneq ($(CONFIG_SEABIOS_PS2_TIMEOUT),)
 ifneq ($(CONFIG_SEABIOS_PS2_TIMEOUT),0)
-ifneq ($(CONFIG_UPDATE_IMAGE),y)
 PHONY+=seabios_ps2_timeout
 INTERMEDIATE+=seabios_ps2_timeout
 seabios_ps2_timeout: $(obj)/coreboot.pre $(CBFSTOOL)
    @printf "    SeaBIOS    Wait up to $(CONFIG_SEABIOS_PS2_TIMEOUT) ms for PS/2 keyboard controller initialization\n"
+	$(if $(CONFIG_UPDATE_IMAGE),-$(CBFSTOOL) $< remove -n etc/ps2-keyboard-spinup 2>/dev/null)
    $(CBFSTOOL) $< add-int -i $(CONFIG_SEABIOS_PS2_TIMEOUT) -n etc/ps2-keyboard-spinup
 endif
 endif
-endif

ifeq ($(CONFIG_SEABIOS_ADD_SERCON_PORT_FILE),y)
 PHONY+=seabios_sercon
 INTERMEDIATE+=seabios_sercon
 seabios_sercon: $(obj)/coreboot.pre $(CBFSTOOL)
    @printf "    SeaBIOS    Add sercon-port file\n"
+	$(if $(CONFIG_UPDATE_IMAGE),-$(CBFSTOOL) $< remove -n etc/sercon-port 2>/dev/null)
    $(CBFSTOOL) $< add-int -i $(CONFIG_SEABIOS_SERCON_PORT_ADDR) -n etc/sercon-port
 endif

@@ -124,6 +124,7 @@
 INTERMEDIATE+=seabios_thread_optionroms
 seabios_thread_optionroms: $(obj)/coreboot.pre $(CBFSTOOL)
    @printf "    SeaBIOS    Thread optionroms\n"
+	$(if $(CONFIG_UPDATE_IMAGE),-$(CBFSTOOL) $< remove -n etc/threads 2>/dev/null)
    $(CBFSTOOL) $< add-int -i 2 -n etc/threads
 endif