From 41757a3b259c8eee53dd263a05d1633dec4a62e3 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Sun, 9 Jul 2023 04:16:11 +0100 Subject: [PATCH] coreboot/fam15h: support distclean on cbfstool lbmk uses distclean on cbfstool, which newer cbfstool supports, but this old version (in coreboot 4.11) does not. fix that. it just runs make-clean Signed-off-by: Leah Rowe --- ...-cbfstool-Makefile-support-distclean.patch | 41 +++++++++++++++++++ ...-cbfstool-Makefile-support-distclean.patch | 41 +++++++++++++++++++ 2 files changed, 82 insertions(+) create mode 100644 resources/coreboot/fam15h_rdimm/patches/0007-util-cbfstool-Makefile-support-distclean.patch create mode 100644 resources/coreboot/fam15h_udimm/patches/0007-util-cbfstool-Makefile-support-distclean.patch diff --git a/resources/coreboot/fam15h_rdimm/patches/0007-util-cbfstool-Makefile-support-distclean.patch b/resources/coreboot/fam15h_rdimm/patches/0007-util-cbfstool-Makefile-support-distclean.patch new file mode 100644 index 00000000..87db312c --- /dev/null +++ b/resources/coreboot/fam15h_rdimm/patches/0007-util-cbfstool-Makefile-support-distclean.patch @@ -0,0 +1,41 @@ +From d5dc3f23eb546cf328fdfe1e918afa028fb9cd8c Mon Sep 17 00:00:00 2001 +From: Leah Rowe +Date: Sun, 9 Jul 2023 04:13:52 +0100 +Subject: [PATCH 1/1] util/cbfstool Makefile: support distclean + +it just does make-clean + +this is so that this super-old coreboot revision +interfaces well with lbmk, which runs distclean +on cbfstool (which is supported, on modern cbfstool) + +Signed-off-by: Leah Rowe +--- + util/cbfstool/Makefile | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/util/cbfstool/Makefile b/util/cbfstool/Makefile +index d5321f6959..b8424d7d87 100644 +--- a/util/cbfstool/Makefile ++++ b/util/cbfstool/Makefile +@@ -26,7 +26,7 @@ ifittool: $(objutil)/cbfstool/ifittool + + cbfs-compression-tool: $(objutil)/cbfstool/cbfs-compression-tool + +-.PHONY: clean cbfstool ifittool fmaptool rmodtool ifwitool cbfs-compression-tool ++.PHONY: distclean clean cbfstool ifittool fmaptool rmodtool ifwitool cbfs-compression-tool + clean: + $(RM) fmd_parser.c fmd_parser.h fmd_scanner.c fmd_scanner.h + $(RM) $(objutil)/cbfstool/cbfstool $(cbfsobj) +@@ -55,6 +55,8 @@ install: all + $(INSTALL) ifittool $(DESTDIR)$(BINDIR) + $(INSTALL) cbfs-compression-tool $(DESTDIR)$(BINDIR) + ++distclean: clean ++ + ifneq ($(V),1) + .SILENT: + endif +-- +2.40.1 + diff --git a/resources/coreboot/fam15h_udimm/patches/0007-util-cbfstool-Makefile-support-distclean.patch b/resources/coreboot/fam15h_udimm/patches/0007-util-cbfstool-Makefile-support-distclean.patch new file mode 100644 index 00000000..87db312c --- /dev/null +++ b/resources/coreboot/fam15h_udimm/patches/0007-util-cbfstool-Makefile-support-distclean.patch @@ -0,0 +1,41 @@ +From d5dc3f23eb546cf328fdfe1e918afa028fb9cd8c Mon Sep 17 00:00:00 2001 +From: Leah Rowe +Date: Sun, 9 Jul 2023 04:13:52 +0100 +Subject: [PATCH 1/1] util/cbfstool Makefile: support distclean + +it just does make-clean + +this is so that this super-old coreboot revision +interfaces well with lbmk, which runs distclean +on cbfstool (which is supported, on modern cbfstool) + +Signed-off-by: Leah Rowe +--- + util/cbfstool/Makefile | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/util/cbfstool/Makefile b/util/cbfstool/Makefile +index d5321f6959..b8424d7d87 100644 +--- a/util/cbfstool/Makefile ++++ b/util/cbfstool/Makefile +@@ -26,7 +26,7 @@ ifittool: $(objutil)/cbfstool/ifittool + + cbfs-compression-tool: $(objutil)/cbfstool/cbfs-compression-tool + +-.PHONY: clean cbfstool ifittool fmaptool rmodtool ifwitool cbfs-compression-tool ++.PHONY: distclean clean cbfstool ifittool fmaptool rmodtool ifwitool cbfs-compression-tool + clean: + $(RM) fmd_parser.c fmd_parser.h fmd_scanner.c fmd_scanner.h + $(RM) $(objutil)/cbfstool/cbfstool $(cbfsobj) +@@ -55,6 +55,8 @@ install: all + $(INSTALL) ifittool $(DESTDIR)$(BINDIR) + $(INSTALL) cbfs-compression-tool $(DESTDIR)$(BINDIR) + ++distclean: clean ++ + ifneq ($(V),1) + .SILENT: + endif +-- +2.40.1 +