Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/31509 )
Change subject: AGESA vendorcode: Define libagesa rule just once ......................................................................
AGESA vendorcode: Define libagesa rule just once
No reason to keep this rule in per-family directory.
Change-Id: I6bfc9a277674077774c4cb398f8add5e4fa99c69 Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com Reviewed-on: https://review.coreboot.org/c/31509 Reviewed-by: Marshall Dawson marshalldawson3rd@gmail.com Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/vendorcode/amd/agesa/Makefile.inc M src/vendorcode/amd/agesa/f12/Makefile.inc M src/vendorcode/amd/agesa/f14/Makefile.inc M src/vendorcode/amd/agesa/f15tn/Makefile.inc M src/vendorcode/amd/agesa/f16kb/Makefile.inc 5 files changed, 7 insertions(+), 28 deletions(-)
Approvals: build bot (Jenkins): Verified Marshall Dawson: Looks good to me, approved
diff --git a/src/vendorcode/amd/agesa/Makefile.inc b/src/vendorcode/amd/agesa/Makefile.inc index 24110a7..df34330 100644 --- a/src/vendorcode/amd/agesa/Makefile.inc +++ b/src/vendorcode/amd/agesa/Makefile.inc @@ -18,6 +18,13 @@ $(eval $(call create_class_compiler,libagesa,x86_64)) endif
+$(obj)/libagesa.a: $$(libagesa-objs) + @printf " AGESA $(subst $(obj)/,,$(@))\n" + $(AR_libagesa) rcsDT $@ $+ + +romstage-libs += $(obj)/libagesa.a +ramstage-libs += $(obj)/libagesa.a + # buildOpts should be in libagesa $(obj)/romstage/mainboard/$(MAINBOARDDIR)/buildOpts.o: CPPFLAGS_x86_32 += $(BUILDOPTS_INCLUDES) $(obj)/ramstage/mainboard/$(MAINBOARDDIR)/buildOpts.o: CPPFLAGS_x86_32 += $(BUILDOPTS_INCLUDES) diff --git a/src/vendorcode/amd/agesa/f12/Makefile.inc b/src/vendorcode/amd/agesa/f12/Makefile.inc index 8cc73a8..f925ccb 100644 --- a/src/vendorcode/amd/agesa/f12/Makefile.inc +++ b/src/vendorcode/amd/agesa/f12/Makefile.inc @@ -55,10 +55,3 @@
subdirs-y += Legacy/Proc subdirs-y += $(dir $(shell cd $(dir); find Proc -name Makefile.inc)) - -$(obj)/libagesa.fam12.a: $$(libagesa-objs) - @printf " AGESA $(subst $(obj)/,,$(@))\n" - $(AR_libagesa) rcsDT $@ $+ - -romstage-libs += $(obj)/libagesa.fam12.a -ramstage-libs += $(obj)/libagesa.fam12.a diff --git a/src/vendorcode/amd/agesa/f14/Makefile.inc b/src/vendorcode/amd/agesa/f14/Makefile.inc index bfe5d74..ad2d2dc 100644 --- a/src/vendorcode/amd/agesa/f14/Makefile.inc +++ b/src/vendorcode/amd/agesa/f14/Makefile.inc @@ -56,10 +56,3 @@
subdirs-y += Legacy/Proc subdirs-y += $(dir $(shell cd $(dir); find Proc -name Makefile.inc)) - -$(obj)/libagesa.fam14.a: $$(libagesa-objs) - @printf " AGESA $(subst $(obj)/,,$(@))\n" - $(AR_libagesa) rcsDT $@ $+ - -romstage-libs += $(obj)/libagesa.fam14.a -ramstage-libs += $(obj)/libagesa.fam14.a diff --git a/src/vendorcode/amd/agesa/f15tn/Makefile.inc b/src/vendorcode/amd/agesa/f15tn/Makefile.inc index f33c7b8..57350d9 100644 --- a/src/vendorcode/amd/agesa/f15tn/Makefile.inc +++ b/src/vendorcode/amd/agesa/f15tn/Makefile.inc @@ -60,10 +60,3 @@
subdirs-y += Legacy/Proc subdirs-y += $(dir $(shell cd $(dir); find Proc -name Makefile.inc)) - -$(obj)/libagesa.fam15tn.a: $$(libagesa-objs) - @printf " AGESA $(subst $(obj)/,,$(@))\n" - $(AR_libagesa) rcsDT $@ $+ - -romstage-libs += $(obj)/libagesa.fam15tn.a -ramstage-libs += $(obj)/libagesa.fam15tn.a diff --git a/src/vendorcode/amd/agesa/f16kb/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Makefile.inc index 11b67ed..3115c4d 100644 --- a/src/vendorcode/amd/agesa/f16kb/Makefile.inc +++ b/src/vendorcode/amd/agesa/f16kb/Makefile.inc @@ -60,10 +60,3 @@
subdirs-y += Legacy/Proc subdirs-y += $(dir $(shell cd $(dir); find Proc -name Makefile.inc)) - -$(obj)/libagesa.fam16kb.a: $$(libagesa-objs) - @printf " AGESA $(subst $(obj)/,,$(@))\n" - $(AR_libagesa) rcsDT $@ $+ - -romstage-libs += $(obj)/libagesa.fam16kb.a -ramstage-libs += $(obj)/libagesa.fam16kb.a