From 4460e8fc56ce95dd65dc1ceb6c362aa132f227b9 Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Tue, 26 Sep 2017 10:07:35 -0600 Subject: [PATCH] vendorcode/amd/pi: Put libagesa build all in libagesa directory MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Half the files were being placed in build/agesa and half in build/libagesa. Change-Id: Ied69dafffe2eb3354bd430789e098a1cb1d40551 Signed-off-by: Martin Roth Reviewed-on: https://review.coreboot.org/21699 Tested-by: build bot (Jenkins) Reviewed-by: Jonathan Neuschäfer Reviewed-by: Paul Menzel --- src/vendorcode/amd/pi/Makefile.inc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/vendorcode/amd/pi/Makefile.inc b/src/vendorcode/amd/pi/Makefile.inc index 0192faad4a..c4ab1318e7 100644 --- a/src/vendorcode/amd/pi/Makefile.inc +++ b/src/vendorcode/amd/pi/Makefile.inc @@ -141,20 +141,21 @@ $(eval $(call create_class_compiler,libagesa,x86_64)) endif agesa_src_files := $(strip $(sort $(foreach file,$(strip $(agesa_raw_files)),$(call strip_quotes,$(file))))) -agesa_src_path := $(strip $(obj)/agesa) +agesa_output_path := $(obj)/libagesa +agesa_src_path := $(agesa_output_path) agesa_dirs := $(sort $(abspath $(dir $(call src-to-obj,libagesa,$(agesa_src_files))))) additional-dirs += $(agesa_src_path) $(agesa_dirs) $(foreach file,$(strip $(agesa_src_files)),$(eval $(call create_agesa_cp_template,$(file)))) -$(obj)/agesa/libagesa.a: $(call src-to-obj,libagesa,$(agesa_src_files)) +$(agesa_output_path)/libagesa.a: $(call src-to-obj,libagesa,$(agesa_src_files)) @printf " AGESA $(subst $(obj)/,,$(@))\n" ar rcs $@ $+ -bootblock-libs += $(obj)/agesa/libagesa.a -romstage-libs += $(obj)/agesa/libagesa.a -ramstage-libs += $(obj)/agesa/libagesa.a +bootblock-libs += $(agesa_output_path)/libagesa.a +romstage-libs += $(agesa_output_path)/libagesa.a +ramstage-libs += $(agesa_output_path)/libagesa.a #######################################################################