summaryrefslogtreecommitdiff
path: root/payloads
diff options
context:
space:
mode:
authorArthur Heymans <arthur@aheymans.xyz>2020-12-24 12:15:38 +0100
committerPatrick Georgi <pgeorgi@google.com>2021-01-08 08:09:08 +0000
commitc6bdabd983b1e4d0fc701247805b9a7734a787b7 (patch)
treea9430bbc7311b5078a40fb1408b65e0e5b0bde5d /payloads
parent17c951b2c42790adf96eb13c112d70de4df7ce40 (diff)
downloadcoreboot-c6bdabd983b1e4d0fc701247805b9a7734a787b7.tar.xz
payloads/external: Update cbfs-ints with CONFIG_UPDATE_IMAGE
Change-Id: Icfbfff3ba680a85eb2f683867064b19f40b9d40f Signed-off-by: Arthur Heymans <arthur@aheymans.xyz> Reviewed-on: https://review.coreboot.org/c/coreboot/+/48898 Reviewed-by: Angel Pons <th3fanbus@gmail.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'payloads')
-rw-r--r--payloads/external/Makefile.inc5
1 files changed, 3 insertions, 2 deletions
diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc
index 6fde12faed..ec0905e9f7 100644
--- a/payloads/external/Makefile.inc
+++ b/payloads/external/Makefile.inc
@@ -101,21 +101,21 @@ endif
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 @@ PHONY+=seabios_thread_optionroms
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