From d3d62d4af90562056d8d1aa61ccc6640613b95f6 Mon Sep 17 00:00:00 2001 From: Arthur Heymans Date: Fri, 15 Dec 2023 14:31:49 +0100 Subject: [PATCH] Makefile.mk: Also add -libs to bootblock when !SEPARATE_ROMSTAGE Signed-off-by: Arthur Heymans Change-Id: I18bf67cae7af90a92a030e552af6dc6b134a8357 Reviewed-on: https://review.coreboot.org/c/coreboot/+/79575 Tested-by: build bot (Jenkins) Reviewed-by: Martin L Roth --- Makefile.mk | 1 + src/vendorcode/amd/pi/Makefile.mk | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.mk b/Makefile.mk index 3f39a6edee..d7110a9caa 100644 --- a/Makefile.mk +++ b/Makefile.mk @@ -1307,6 +1307,7 @@ $(CONFIG_CBFS_PREFIX)/romstage-options += $(TXTIBB) endif else # CONFIG_SEPARATE_ROMSTAGE postinclude-hooks += $$(eval bootblock-srcs += $$(romstage-srcs)) +postinclude-hooks += $$(eval bootblock-libs += $$(romstage-libs)) endif cbfs-files-$(CONFIG_HAVE_RAMSTAGE) += $(CONFIG_CBFS_PREFIX)/ramstage diff --git a/src/vendorcode/amd/pi/Makefile.mk b/src/vendorcode/amd/pi/Makefile.mk index 5cd12545ae..446e9d4779 100644 --- a/src/vendorcode/amd/pi/Makefile.mk +++ b/src/vendorcode/amd/pi/Makefile.mk @@ -160,7 +160,6 @@ $(agesa_output_path)/libagesa.a: $(call src-to-obj,libagesa,$(agesa_src_files)) @printf " AGESA $(subst $(obj)/,,$(@))\n" $(AR_libagesa) rcsDT $@ $+ -bootblock-libs += $(agesa_output_path)/libagesa.a romstage-libs += $(agesa_output_path)/libagesa.a ramstage-libs += $(agesa_output_path)/libagesa.a