From 6d4de7eef9d22017bd592a0a35c30a9756393aa3 Mon Sep 17 00:00:00 2001 From: Angel Pons Date: Fri, 20 Nov 2020 18:28:38 +0100 Subject: [PATCH] payloads/external/Makefile.inc: Fix SeaBIOS option regressions Commit 14ca7407196 (Makefile.inc: Move adding SeaBIOS cbfs config files) introduced various regressions that were not spotted during review. TEST=Building with SEABIOS_THREAD_OPTIONROMS is working properly again. Change-Id: I4de0b11747e3df8dd31a85160add129d8cc6bd8a Signed-off-by: Angel Pons Reviewed-on: https://review.coreboot.org/c/coreboot/+/47814 Reviewed-by: Arthur Heymans Reviewed-by: Nico Huber Tested-by: build bot (Jenkins) --- payloads/external/Makefile.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc index 6208578b74..0300581ea4 100644 --- a/payloads/external/Makefile.inc +++ b/payloads/external/Makefile.inc @@ -121,14 +121,14 @@ ifeq ($(CONFIG_SEABIOS_ADD_SERCON_PORT_FILE),y) INTERMEDIATE+=seabios_sercon seabios_sercon: $(obj)/coreboot.pre $(CBFSTOOL) @printf " SeaBIOS Add sercon-port file\n" -# $(CBFSTOOL) $@.tmp add-int -i $(CONFIG_SEABIOS_SERCON_PORT_ADDR) -n etc/sercon-port + $(CBFSTOOL) $< add-int -i $(CONFIG_SEABIOS_SERCON_PORT_ADDR) -n etc/sercon-port endif ifeq ($(CONFIG_SEABIOS_THREAD_OPTIONROMS),y) INTERMEDIATE+=seabios_thread_optionroms seabios_thread_optionroms: $(obj)/coreboot.pre $(CBFSTOOL) @printf " SeaBIOS Thread optionroms\n" - $(CBFSTOOL) $@.tmp add-int -i 2 -n etc/threads + $(CBFSTOOL) $< add-int -i 2 -n etc/threads endif # Depthcharge