5 files changed, 7 insertions, 28 deletions
diff --git a/src/vendorcode/amd/agesa/Makefile.inc b/src/vendorcode/amd/agesa/Makefile.inc
index 24110a7909..df34330da8 100644
--- a/src/vendorcode/amd/agesa/Makefile.inc
+++ b/src/vendorcode/amd/agesa/Makefile.inc
@@ -18,6 +18,13 @@ else
 $(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 8cc73a8797..f925ccb5f0 100644
--- a/src/vendorcode/amd/agesa/f12/Makefile.inc
+++ b/src/vendorcode/amd/agesa/f12/Makefile.inc
@@ -55,10 +55,3 @@ CPPFLAGS_x86_64 += $(AGESA_INC) $(CPPFLAGS_x86_ANY)
 
 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 bfe5d74347..ad2d2dc63d 100644
--- a/src/vendorcode/amd/agesa/f14/Makefile.inc
+++ b/src/vendorcode/amd/agesa/f14/Makefile.inc
@@ -56,10 +56,3 @@ CPPFLAGS_x86_64 += $(AGESA_INC) $(CPPFLAGS_x86_ANY)
 
 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 f33c7b8e88..57350d9571 100644
--- a/src/vendorcode/amd/agesa/f15tn/Makefile.inc
+++ b/src/vendorcode/amd/agesa/f15tn/Makefile.inc
@@ -60,10 +60,3 @@ CPPFLAGS_x86_64 += $(AGESA_INC) $(CPPFLAGS_x86_ANY)
 
 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 11b67edb0e..3115c4d996 100644
--- a/src/vendorcode/amd/agesa/f16kb/Makefile.inc
+++ b/src/vendorcode/amd/agesa/f16kb/Makefile.inc
@@ -60,10 +60,3 @@ CPPFLAGS_x86_64 += $(AGESA_INC) $(CPPFLAGS_x86_ANY)
 
 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