From bf415a8d693699ba3048c78b65455634ff8b7c9b Mon Sep 17 00:00:00 2001
From: Thierry Laurion <insurgo@riseup.net>
Date: Thu, 23 Jun 2022 10:51:13 -0400
Subject: [PATCH 1/2] Remove local build of gawk make

-Makefile: remove local gawk and make version compare and local build
-modules: remove gawk and make
-patches: remove make

local make was added to build 4.2.1 on OSes that were having older version. It was then patched to be built on OSes having newer buildstack.
local gawk was added when GPG toolstack was older then libgpg-error 1.37. GPG toolstack was then upgraded, but local gawk stayed.

Removing those permits better parallelization and of builds and reduces CircleCI (and higher cores systems) to have race conditions and stalled builds
---
 Makefile                 | 115 ---------------------------------------
 modules/gawk             |  14 -----
 modules/make             |  14 -----
 patches/make-4.2.1.patch |  20 -------
 4 files changed, 163 deletions(-)
 delete mode 100644 modules/gawk
 delete mode 100644 modules/make
 delete mode 100644 patches/make-4.2.1.patch

diff --git a/Makefile b/Makefile
index 6ac87a37e..f4265b92c 100644
--- a/Makefile
+++ b/Makefile
@@ -42,107 +42,6 @@ WGET ?= wget
 # Timestamps should be in ISO format
 DATE=`date --rfc-3339=seconds`
 
-# Check that we have a correct version of make
-# that matches at least the major version
-LOCAL_MAKE_VERSION := $(shell $(MAKE) --version | head -1 | cut -d' ' -f3)
-include modules/make
-
-# Check we have a suitable version of gawk
-# that's at least the same major version
-LOCAL_GAWK_VERSION := $(shell gawk --version 2>/dev/null | head -1 | cut -d' ' -f3 | cut -d, -f1)
-LOCAL_GAWK_MAJOR_VERSION := $(patsubst .%,.,$(LOCAL_GAWK_VERSION))
-include modules/gawk
-
-ifeq "" "$(filter $(make_version)%,$(LOCAL_MAKE_VERSION))"
-# This is incorrect local version of make
-# Wrong make version detected -- build our local version
-# and re-invoke the Makefile with it instead.
-$(eval $(shell echo >&2 "$(DATE) Wrong OS deployed make detected: $(LOCAL_MAKE_VERSION). Building and using $(make_version)..." ))
-HEADS_MAKE := $(build)/$(make_dir)/make
-
-# How to download and build the correct version of make
-$(packages)/$(make_tar):
-	$(WGET) -O "$@.tmp" "$(make_url)"
-	if ! echo "$(make_hash)  $@.tmp" | sha256sum --check -; then \
-		exit 1 ; \
-	fi
-	mv "$@.tmp" "$@"
-
-$(build)/$(make_dir)/.extract: $(packages)/$(make_tar)
-	tar xf "$<" -C "$(build)"
-	touch "$@"
-
-$(build)/$(make_dir)/.patch: $(build)/$(make_dir)/.extract
-	( cd "$(dir $@)" ; patch -p1 ) < "patches/make-$(make_version).patch"
-	touch "$@"
-
-$(build)/$(make_dir)/.configured: $(build)/$(make_dir)/.patch
-	cd "$(dir $@)" ; \
-	./configure 2>&1 \
-	| tee "$(log_dir)/make.configure.log" \
-	$(VERBOSE_REDIRECT)
-	touch "$@"
-
-$(HEADS_MAKE): $(build)/$(make_dir)/.configured
-	make -C "$(dir $@)" $(MAKE_JOBS) \
-		2>&1 \
-		| tee "$(log_dir)/make.log" \
-		$(VERBOSE_REDIRECT)
-
-# Once we have a proper Make, we can just pass arguments into it
-all linux cpio run: $(HEADS_MAKE)
-        LANG=C MAKE=$(HEADS_MAKE) $(HEADS_MAKE) $(MAKE_JOBS) $@
-%.clean %.vol %.menuconfig: $(HEADS_MAKE)
-        LANG=C MAKE=$(HEADS_MAKE) $(HEADS_MAKE) $@
-
-bootstrap: $(HEADS_MAKE)
-endif
-
-# Wrong gawk version
-ifeq "" "$(filter $(LOCAL_GAWK_MAJOR_VERSION)%,$(gawk_version))"
-# Wrong gawk version detected -- build our local version
-# and re-invoke the Makefile with it instead.
-$(eval $(shell echo >&2 "$(DATE) Wrong OS deployed gawk detected: $(LOCAL_GAWK_VERSION). Building and using $(gawk_version)..."))
-HEADS_GAWK := $(build)/$(gawk_dir)/gawk
-
-# How to download and build the correct version of gawk
-$(packages)/$(gawk_tar):
-	$(WGET) -O "$@.tmp" "$(gawk_url)"
-	if ! echo "$(gawk_hash)  $@.tmp" | sha256sum --check -; then \
-		exit 1 ; \
-	fi
-	mv "$@.tmp" "$@"
-
-$(build)/$(gawk_dir)/.extract: $(packages)/$(gawk_tar)
-	tar xf "$<" -C "$(build)"
-	touch "$@"
-
-$(build)/$(gawk_dir)/.patch: $(build)/$(gawk_dir)/.extract
-#	( cd "$(dir $@)" ; patch -p1 ) < "patches/gawk-$(gawk_version).patch"
-	touch "$@"
-
-$(build)/$(gawk_dir)/.configured: $(build)/$(gawk_dir)/.patch
-	cd "$(dir $@)" ; \
-	./configure 2>&1 \
-	| tee "$(log_dir)/gawk.configure.log" \
-	$(VERBOSE_REDIRECT)
-	touch "$@"
-
-$(HEADS_GAWK): $(build)/$(gawk_dir)/.configured
-	$(MAKE) -C "$(dir $@)" $(MAKE_JOBS) \
-		2>&1 \
-		| tee "$(log_dir)/gawk.log" \
-		$(VERBOSE_REDIRECT)
-
-# Once we have a suitable version of gawk, we can rerun make
-all linux cpio run: $(HEADS_GAWK)
-	LANG=C HEADS_GAWK=$(HEADS_GAWK) $(MAKE) $(MAKE_JOBS) $@
-%.clean %.vol %.menuconfig: $(HEADS_GAWK)
-	LANG=C HEADS_GAWK=$(HEADS_GAWK) $(MAKE) $@
-
-bootstrap: $(HEADS_GAWK)
-endif
-
 BOARD		?= qemu-coreboot
 CONFIG		:= $(pwd)/boards/$(BOARD)/$(BOARD).config
 
@@ -225,20 +124,6 @@ CROSS_TOOLS_NOCC := \
 	PKG_CONFIG_PATH="$(INSTALL)/lib/pkgconfig" \
 	PKG_CONFIG_SYSROOT_DIR="$(INSTALL)" \
 
-ifneq "$(HEADS_GAWK)" ""
-CROSS_TOOLS_NOCC += AWK=$(HEADS_GAWK)
-endif
-
-ifneq "$(HEADS_MAKE)" ""
-MAKE=$(HEADS_MAKE)
-endif
-
-#Some debugging info in link with locally built versions and usage for the rest Heads build:
-$(eval $(shell echo >&2 "$(DATE) Local built HEADS_GAWK only if different then provided by OS: $(HEADS_GAWK)")) 
-$(eval $(shell echo >&2 "$(DATE) Local built HEADS_MAKE only if different then provided by OS: $(HEADS_MAKE)")) 
-$(eval $(shell echo >&2 "$(DATE) Heads build system will call make from now on as: MAKE: $(MAKE)." ))
-
-
 CROSS_TOOLS := \
 	CC="$(heads_cc)" \
 	$(CROSS_TOOLS_NOCC) \
diff --git a/modules/gawk b/modules/gawk
deleted file mode 100644
index e51b8ab51..000000000
--- a/modules/gawk
+++ /dev/null
@@ -1,14 +0,0 @@
-# This is not added to the module list since it is a special case
-# of things that need to be built for the host system, instead of the
-# target platform.
-#modules += gawk
-
-gawk_version := 4.2.1
-gawk_dir := gawk-$(gawk_version)
-gawk_tar := gawk-$(gawk_version).tar.xz
-
-gawk_url := http://gnu.mirror.constant.com/gawk/$(gawk_tar)
-gawk_hash := d1119785e746d46a8209d28b2de404a57f983aa48670f4e225531d3bdc175551
-
-# This is built for the local machine, not the target, so it doesn't have any
-# of the build instructions.
diff --git a/modules/make b/modules/make
deleted file mode 100644
index 437ce051b..000000000
--- a/modules/make
+++ /dev/null
@@ -1,14 +0,0 @@
-# This is not added to the module list since it is a special case
-# of things that need to be built for the host system, instead of the
-# target platform.
-#modules += make
-
-make_version := 4.2.1
-make_dir := make-$(make_version)
-make_tar := make-$(make_version).tar.bz2
-
-make_url := http://gnu.mirror.constant.com/make/$(make_tar)
-make_hash := d6e262bf3601b42d2b1e4ef8310029e1dcf20083c5446b4b7aa67081fdffc589
-
-# This is built for the local machine, not the target, so it doesn't have any
-# of the build instructions.
diff --git a/patches/make-4.2.1.patch b/patches/make-4.2.1.patch
deleted file mode 100644
index 8bd64ce98..000000000
--- a/patches/make-4.2.1.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- clean/make-4.2.1/glob/glob.c   2013-10-20 19:14:38.000000000 +0200
-+++ make-4.2.1/glob/glob.c      2021-09-18 17:51:09.814552369 +0200
-@@ -208,7 +208,7 @@
- #endif /* __GNU_LIBRARY__ || __DJGPP__ */
- 
- 
--#if !defined __alloca && !defined __GNU_LIBRARY__
-+#if !defined __alloca && defined __GNU_LIBRARY__
- 
- # ifdef        __GNUC__
- #  undef alloca
-@@ -231,7 +231,7 @@
- 
- #endif
- 
--#ifndef __GNU_LIBRARY__
-+#ifdef __GNU_LIBRARY__
- # define __stat stat
- # ifdef STAT_MACROS_BROKEN
- #  undef S_ISDIR

From ba9235abcbc441e9367803ba674fb7a280c48218 Mon Sep 17 00:00:00 2001
From: Thierry Laurion <insurgo@riseup.net>
Date: Thu, 23 Jun 2022 11:05:53 -0400
Subject: [PATCH 2/2] xx30 boards: add top bottom roms statements to get hashes
 under hashes.txt

---
 boards/t430-hotp-maximized/t430-hotp-maximized.config      | 7 +++++--
 boards/t430-maximized/t430-maximized.config                | 7 +++++--
 .../t530-dgpu-hotp-maximized.config                        | 7 +++++--
 boards/t530-dgpu-maximized/t530-dgpu-maximized.config      | 7 +++++--
 boards/t530-hotp-maximized/t530-hotp-maximized.config      | 7 +++++--
 boards/t530-maximized/t530-maximized.config                | 7 +++++--
 .../w530-dgpu-K1000m-hotp-maximized.config                 | 7 +++++--
 .../w530-dgpu-K1000m-maximized.config                      | 7 +++++--
 .../w530-dgpu-K2000m-hotp-maximized.config                 | 7 +++++--
 .../w530-dgpu-K2000m-maximized.config                      | 7 +++++--
 boards/w530-hotp-maximized/w530-hotp-maximized.config      | 7 +++++--
 boards/w530-maximized/w530-maximized.config                | 7 +++++--
 boards/x230-hotp-maximized/x230-hotp-maximized.config      | 7 +++++--
 .../x230-hotp-maximized_usb-kb.config                      | 7 +++++--
 boards/x230-maximized/x230-maximized.config                | 7 +++++--
 15 files changed, 75 insertions(+), 30 deletions(-)

diff --git a/boards/t430-hotp-maximized/t430-hotp-maximized.config b/boards/t430-hotp-maximized/t430-hotp-maximized.config
index 37ec6f5c1..8753dc25e 100644
--- a/boards/t430-hotp-maximized/t430-hotp-maximized.config
+++ b/boards/t430-hotp-maximized/t430-hotp-maximized.config
@@ -78,12 +78,15 @@ export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
 #
 # When flashing via an external programmer it is easiest to have
 # two separate files for these pieces.
+all: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
+	@sha256sum $@ | tee -a "$(HASHES)"
+
 all: $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom
 $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
 	$(call do,DD 8MB,$@,dd of=$@ if=$< bs=65536 count=128 skip=0 status=none)
-	@sha256sum $@
+	@sha256sum $@ | tee -a "$(HASHES)"
 
 all: $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom
 $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
 	$(call do,DD 4MB,$@,dd of=$@ if=$< bs=65536 count=64 skip=128 status=none)
-	@sha256sum $@
+	@sha256sum $@ | tee -a "$(HASHES)"
diff --git a/boards/t430-maximized/t430-maximized.config b/boards/t430-maximized/t430-maximized.config
index c7ea9cf62..15e872497 100644
--- a/boards/t430-maximized/t430-maximized.config
+++ b/boards/t430-maximized/t430-maximized.config
@@ -78,12 +78,15 @@ export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
 #
 # When flashing via an external programmer it is easiest to have
 # two separate files for these pieces.
+all: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
+	@sha256sum $@ | tee -a "$(HASHES)"
+
 all: $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom
 $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
 	$(call do,DD 8MB,$@,dd of=$@ if=$< bs=65536 count=128 skip=0 status=none)
-	@sha256sum $@
+	@sha256sum $@ | tee -a "$(HASHES)"
 
 all: $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom
 $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
 	$(call do,DD 4MB,$@,dd of=$@ if=$< bs=65536 count=64 skip=128 status=none)
-	@sha256sum $@
+	@sha256sum $@ | tee -a "$(HASHES)"
diff --git a/boards/t530-dgpu-hotp-maximized/t530-dgpu-hotp-maximized.config b/boards/t530-dgpu-hotp-maximized/t530-dgpu-hotp-maximized.config
index cb525b631..8e7f43c0a 100644
--- a/boards/t530-dgpu-hotp-maximized/t530-dgpu-hotp-maximized.config
+++ b/boards/t530-dgpu-hotp-maximized/t530-dgpu-hotp-maximized.config
@@ -79,12 +79,15 @@ export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
 #
 # When flashing via an external programmer it is easiest to have
 # two separate files for these pieces.
+all: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
+	@sha256sum $@ | tee -a "$(HASHES)"
+
 all: $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom
 $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
 	$(call do,DD 8MB,$@,dd of=$@ if=$< bs=65536 count=128 skip=0 status=none)
-	@sha256sum $@
+	@sha256sum $@ | tee -a "$(HASHES)"
 
 all: $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom
 $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
 	$(call do,DD 4MB,$@,dd of=$@ if=$< bs=65536 count=64 skip=128 status=none)
-	@sha256sum $@
+	@sha256sum $@ | tee -a "$(HASHES)"
diff --git a/boards/t530-dgpu-maximized/t530-dgpu-maximized.config b/boards/t530-dgpu-maximized/t530-dgpu-maximized.config
index 0ec9599f9..813924ba6 100644
--- a/boards/t530-dgpu-maximized/t530-dgpu-maximized.config
+++ b/boards/t530-dgpu-maximized/t530-dgpu-maximized.config
@@ -79,12 +79,15 @@ export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
 #
 # When flashing via an external programmer it is easiest to have
 # two separate files for these pieces.
+all: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
+	@sha256sum $@ | tee -a "$(HASHES)"
+
 all: $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom
 $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
 	$(call do,DD 8MB,$@,dd of=$@ if=$< bs=65536 count=128 skip=0 status=none)
-	@sha256sum $@
+	@sha256sum $@ | tee -a "$(HASHES)"
 
 all: $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom
 $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
 	$(call do,DD 4MB,$@,dd of=$@ if=$< bs=65536 count=64 skip=128 status=none)
-	@sha256sum $@
+	@sha256sum $@ | tee -a "$(HASHES)"
diff --git a/boards/t530-hotp-maximized/t530-hotp-maximized.config b/boards/t530-hotp-maximized/t530-hotp-maximized.config
index b5649bb48..cbd36b55a 100644
--- a/boards/t530-hotp-maximized/t530-hotp-maximized.config
+++ b/boards/t530-hotp-maximized/t530-hotp-maximized.config
@@ -79,12 +79,15 @@ export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
 #
 # When flashing via an external programmer it is easiest to have
 # two separate files for these pieces.
+all: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
+	@sha256sum $@ | tee -a "$(HASHES)"
+
 all: $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom
 $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
 	$(call do,DD 8MB,$@,dd of=$@ if=$< bs=65536 count=128 skip=0 status=none)
-	@sha256sum $@
+	@sha256sum $@ | tee -a "$(HASHES)"
 
 all: $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom
 $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
 	$(call do,DD 4MB,$@,dd of=$@ if=$< bs=65536 count=64 skip=128 status=none)
-	@sha256sum $@
+	@sha256sum $@ | tee -a "$(HASHES)"
diff --git a/boards/t530-maximized/t530-maximized.config b/boards/t530-maximized/t530-maximized.config
index 631b1a0f6..26d93c450 100644
--- a/boards/t530-maximized/t530-maximized.config
+++ b/boards/t530-maximized/t530-maximized.config
@@ -79,12 +79,15 @@ export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
 #
 # When flashing via an external programmer it is easiest to have
 # two separate files for these pieces.
+all: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
+	@sha256sum $@ | tee -a "$(HASHES)"
+
 all: $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom
 $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
 	$(call do,DD 8MB,$@,dd of=$@ if=$< bs=65536 count=128 skip=0 status=none)
-	@sha256sum $@
+	@sha256sum $@ | tee -a "$(HASHES)"
 
 all: $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom
 $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
 	$(call do,DD 4MB,$@,dd of=$@ if=$< bs=65536 count=64 skip=128 status=none)
-	@sha256sum $@
+	@sha256sum $@ | tee -a "$(HASHES)"
diff --git a/boards/w530-dgpu-K1000m-hotp-maximized/w530-dgpu-K1000m-hotp-maximized.config b/boards/w530-dgpu-K1000m-hotp-maximized/w530-dgpu-K1000m-hotp-maximized.config
index f7eaa0af8..e9daa3a9c 100644
--- a/boards/w530-dgpu-K1000m-hotp-maximized/w530-dgpu-K1000m-hotp-maximized.config
+++ b/boards/w530-dgpu-K1000m-hotp-maximized/w530-dgpu-K1000m-hotp-maximized.config
@@ -79,12 +79,15 @@ export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
 #
 # When flashing via an external programmer it is easiest to have
 # two separate files for these pieces.
+all: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
+	@sha256sum $@ | tee -a "$(HASHES)"
+
 all: $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom
 $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
 	$(call do,DD 8MB,$@,dd of=$@ if=$< bs=65536 count=128 skip=0 status=none)
-	@sha256sum $@
+	@sha256sum $@ | tee -a "$(HASHES)"
 
 all: $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom
 $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
 	$(call do,DD 4MB,$@,dd of=$@ if=$< bs=65536 count=64 skip=128 status=none)
-	@sha256sum $@
+	@sha256sum $@ | tee -a "$(HASHES)"
diff --git a/boards/w530-dgpu-K1000m-maximized/w530-dgpu-K1000m-maximized.config b/boards/w530-dgpu-K1000m-maximized/w530-dgpu-K1000m-maximized.config
index f915df33d..34ba42a69 100644
--- a/boards/w530-dgpu-K1000m-maximized/w530-dgpu-K1000m-maximized.config
+++ b/boards/w530-dgpu-K1000m-maximized/w530-dgpu-K1000m-maximized.config
@@ -79,12 +79,15 @@ export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
 #
 # When flashing via an external programmer it is easiest to have
 # two separate files for these pieces.
+all: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
+	@sha256sum $@ | tee -a "$(HASHES)"
+
 all: $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom
 $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
 	$(call do,DD 8MB,$@,dd of=$@ if=$< bs=65536 count=128 skip=0 status=none)
-	@sha256sum $@
+	@sha256sum $@ | tee -a "$(HASHES)"
 
 all: $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom
 $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
 	$(call do,DD 4MB,$@,dd of=$@ if=$< bs=65536 count=64 skip=128 status=none)
-	@sha256sum $@
+	@sha256sum $@ | tee -a "$(HASHES)"
diff --git a/boards/w530-dgpu-K2000m-hotp-maximized/w530-dgpu-K2000m-hotp-maximized.config b/boards/w530-dgpu-K2000m-hotp-maximized/w530-dgpu-K2000m-hotp-maximized.config
index dc8f6c1cf..f88ba4d4c 100644
--- a/boards/w530-dgpu-K2000m-hotp-maximized/w530-dgpu-K2000m-hotp-maximized.config
+++ b/boards/w530-dgpu-K2000m-hotp-maximized/w530-dgpu-K2000m-hotp-maximized.config
@@ -79,12 +79,15 @@ export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
 #
 # When flashing via an external programmer it is easiest to have
 # two separate files for these pieces.
+all: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
+	@sha256sum $@ | tee -a "$(HASHES)"
+
 all: $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom
 $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
 	$(call do,DD 8MB,$@,dd of=$@ if=$< bs=65536 count=128 skip=0 status=none)
-	@sha256sum $@
+	@sha256sum $@ | tee -a "$(HASHES)"
 
 all: $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom
 $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
 	$(call do,DD 4MB,$@,dd of=$@ if=$< bs=65536 count=64 skip=128 status=none)
-	@sha256sum $@
+	@sha256sum $@ | tee -a "$(HASHES)"
diff --git a/boards/w530-dgpu-K2000m-maximized/w530-dgpu-K2000m-maximized.config b/boards/w530-dgpu-K2000m-maximized/w530-dgpu-K2000m-maximized.config
index 4f97fc3d2..4a4e099d2 100644
--- a/boards/w530-dgpu-K2000m-maximized/w530-dgpu-K2000m-maximized.config
+++ b/boards/w530-dgpu-K2000m-maximized/w530-dgpu-K2000m-maximized.config
@@ -79,12 +79,15 @@ export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
 #
 # When flashing via an external programmer it is easiest to have
 # two separate files for these pieces.
+all: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
+	@sha256sum $@ | tee -a "$(HASHES)"
+
 all: $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom
 $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
 	$(call do,DD 8MB,$@,dd of=$@ if=$< bs=65536 count=128 skip=0 status=none)
-	@sha256sum $@
+	@sha256sum $@ | tee -a "$(HASHES)"
 
 all: $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom
 $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
 	$(call do,DD 4MB,$@,dd of=$@ if=$< bs=65536 count=64 skip=128 status=none)
-	@sha256sum $@
+	@sha256sum $@ | tee -a "$(HASHES)"
diff --git a/boards/w530-hotp-maximized/w530-hotp-maximized.config b/boards/w530-hotp-maximized/w530-hotp-maximized.config
index 04ed07dcc..d4e08bc82 100644
--- a/boards/w530-hotp-maximized/w530-hotp-maximized.config
+++ b/boards/w530-hotp-maximized/w530-hotp-maximized.config
@@ -79,12 +79,15 @@ export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
 #
 # When flashing via an external programmer it is easiest to have
 # two separate files for these pieces.
+all: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
+	@sha256sum $@ | tee -a "$(HASHES)"
+
 all: $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom
 $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
 	$(call do,DD 8MB,$@,dd of=$@ if=$< bs=65536 count=128 skip=0 status=none)
-	@sha256sum $@
+	@sha256sum $@ | tee -a "$(HASHES)"
 
 all: $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom
 $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
 	$(call do,DD 4MB,$@,dd of=$@ if=$< bs=65536 count=64 skip=128 status=none)
-	@sha256sum $@
+	@sha256sum $@ | tee -a "$(HASHES)"
diff --git a/boards/w530-maximized/w530-maximized.config b/boards/w530-maximized/w530-maximized.config
index bdf103d7b..039754e0d 100644
--- a/boards/w530-maximized/w530-maximized.config
+++ b/boards/w530-maximized/w530-maximized.config
@@ -79,12 +79,15 @@ export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
 #
 # When flashing via an external programmer it is easiest to have
 # two separate files for these pieces.
+all: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
+	@sha256sum $@ | tee -a "$(HASHES)"
+
 all: $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom
 $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
 	$(call do,DD 8MB,$@,dd of=$@ if=$< bs=65536 count=128 skip=0 status=none)
-	@sha256sum $@
+	@sha256sum $@ | tee -a "$(HASHES)"
 
 all: $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom
 $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
 	$(call do,DD 4MB,$@,dd of=$@ if=$< bs=65536 count=64 skip=128 status=none)
-	@sha256sum $@
+	@sha256sum $@ | tee -a "$(HASHES)"
diff --git a/boards/x230-hotp-maximized/x230-hotp-maximized.config b/boards/x230-hotp-maximized/x230-hotp-maximized.config
index 8c5754425..0a03f4c67 100644
--- a/boards/x230-hotp-maximized/x230-hotp-maximized.config
+++ b/boards/x230-hotp-maximized/x230-hotp-maximized.config
@@ -78,12 +78,15 @@ export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
 #
 # When flashing via an external programmer it is easiest to have
 # two separate files for these pieces.
+all: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
+	@sha256sum $@ | tee -a "$(HASHES)"
+
 all: $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom
 $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
 	$(call do,DD 8MB,$@,dd of=$@ if=$< bs=65536 count=128 skip=0 status=none)
-	@sha256sum $@
+	@sha256sum $@ | tee -a "$(HASHES)"
 
 all: $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom
 $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
 	$(call do,DD 4MB,$@,dd of=$@ if=$< bs=65536 count=64 skip=128 status=none)
-	@sha256sum $@
+	@sha256sum $@ | tee -a "$(HASHES)"
diff --git a/boards/x230-hotp-maximized_usb-kb/x230-hotp-maximized_usb-kb.config b/boards/x230-hotp-maximized_usb-kb/x230-hotp-maximized_usb-kb.config
index 5d95600ce..c573191b8 100644
--- a/boards/x230-hotp-maximized_usb-kb/x230-hotp-maximized_usb-kb.config
+++ b/boards/x230-hotp-maximized_usb-kb/x230-hotp-maximized_usb-kb.config
@@ -81,12 +81,15 @@ export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
 #
 # When flashing via an external programmer it is easiest to have
 # two separate files for these pieces.
+all: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
+	@sha256sum $@ | tee -a "$(HASHES)"
+
 all: $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom
 $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
 	$(call do,DD 8MB,$@,dd of=$@ if=$< bs=65536 count=128 skip=0 status=none)
-	@sha256sum $@
+	@sha256sum $@ | tee -a "$(HASHES)"
 
 all: $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom
 $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
 	$(call do,DD 4MB,$@,dd of=$@ if=$< bs=65536 count=64 skip=128 status=none)
-	@sha256sum $@
+	@sha256sum $@ | tee -a "$(HASHES)"
diff --git a/boards/x230-maximized/x230-maximized.config b/boards/x230-maximized/x230-maximized.config
index d710edad0..e075e203d 100644
--- a/boards/x230-maximized/x230-maximized.config
+++ b/boards/x230-maximized/x230-maximized.config
@@ -78,12 +78,15 @@ export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
 #
 # When flashing via an external programmer it is easiest to have
 # two separate files for these pieces.
+all: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
+	@sha256sum $@ | tee -a "$(HASHES)"
+
 all: $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom
 $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
 	$(call do,DD 8MB,$@,dd of=$@ if=$< bs=65536 count=128 skip=0 status=none)
-	@sha256sum $@
+	@sha256sum $@ | tee -a "$(HASHES)"
 
 all: $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom
 $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
 	$(call do,DD 4MB,$@,dd of=$@ if=$< bs=65536 count=64 skip=128 status=none)
-	@sha256sum $@
+	@sha256sum $@ | tee -a "$(HASHES)"