diff --git a/Makefile b/Makefile
index eb89c4c6..e4425a88 100644
--- a/Makefile
+++ b/Makefile
@@ -31,6 +31,8 @@ build		:= $(pwd)/build
 config		:= $(pwd)/config
 INSTALL		:= $(pwd)/install
 log_dir		:= $(build)/log
+# This is dynamic, must not expand right here
+board_build	= $(build)/$(BOARD)
 
 # Controls how many parallel jobs are invoked in subshells
 CPUS		?= $(shell nproc)
@@ -57,17 +59,17 @@ include $(CONFIG)
 CONFIG_HEADS	?= y
 
 # record the build date / git hashes and other files here
-HASHES		:= $(build)/$(BOARD)/hashes.txt
+HASHES		:= $(board_build)/hashes.txt
 
 # Create the board output directory if it doesn't already exist
 BOARD_LOG	:= $(shell \
-	mkdir -p "$(build)/$(BOARD)" ; \
+	mkdir -p "$(board_build)" ; \
 	echo "$(DATE) $(GIT_HASH) $(GIT_STATUS)" > "$(HASHES)" ; \
 )
 
 ifeq "y" "$(CONFIG_LINUX_BUNDLED)"
 # Create empty initrd for initial kernel "without" initrd.
-$(shell cpio -o < /dev/null > $(build)/$(BOARD)/initrd.cpio)
+$(shell cpio -o < /dev/null > $(board_build)/initrd.cpio)
 endif
 
 # If V is set in the environment, do not redirect the tee
@@ -134,13 +136,13 @@ CROSS_TOOLS := \
 
 ifeq ($(CONFIG_COREBOOT), y)
 
-all: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
+all: $(board_build)/$(CB_OUTPUT_FILE)
 ifneq ($(CONFIG_COREBOOT_BOOTBLOCK),)
-all: $(build)/$(BOARD)/$(CB_BOOTBLOCK_FILE)
+all: $(board_build)/$(CB_BOOTBLOCK_FILE)
 endif
 
 else ifeq ($(CONFIG_LINUXBOOT), y)
-all: $(build)/$(BOARD)/$(LB_OUTPUT_FILE)
+all: $(board_build)/$(LB_OUTPUT_FILE)
 else
 $(error "$(BOARD): neither CONFIG_COREBOOT nor CONFIG_LINUXBOOT is set?")
 endif
@@ -155,7 +157,7 @@ FORCE:
 
 # Copies config while replacing predefined placeholders with actual values
 define install_config =
-	sed -e 's!@BOARD_BUILD_DIR@!$(build)/$(BOARD)!g' \
+	sed -e 's!@BOARD_BUILD_DIR@!$(board_build)!g' \
 	    -e 's!@BLOB_DIR@!$(pwd)/blobs!g' \
 	    "$1" > "$2"
 endef
@@ -529,7 +531,7 @@ $(build)/$(initrd_dir)/initrd.cpio.xz: $(initrd-y)
 #
 # At the moment PowerPC can only load initrd bundled with the kernel.
 #
-bundle-$(CONFIG_LINUX_BUNDLED)	+= $(build)/$(BOARD)/$(LINUX_IMAGE_FILE).bundled
+bundle-$(CONFIG_LINUX_BUNDLED)	+= $(board_build)/$(LINUX_IMAGE_FILE).bundled
 all: $(bundle-y)
 
 #
@@ -593,13 +595,13 @@ modules.clean:
 # since we can't reflash the firmware in qemu to update the keychain.  Instead,
 # inject the public key ahead of time.  Specify the location of the key with
 # PUBKEY_ASC.
-inject_gpg: $(build)/$(BOARD)/$(CB_OUTPUT_FILE_GPG_INJ)
+inject_gpg: $(board_build)/$(CB_OUTPUT_FILE_GPG_INJ)
 
-$(build)/$(BOARD)/$(CB_OUTPUT_BASENAME)-gpg-injected.rom: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
-	cp "$(build)/$(BOARD)/$(CB_OUTPUT_FILE)" \
-		"$(build)/$(BOARD)/$(CB_OUTPUT_FILE_GPG_INJ)"
+$(board_build)/$(CB_OUTPUT_BASENAME)-gpg-injected.rom: $(board_build)/$(CB_OUTPUT_FILE)
+	cp "$(board_build)/$(CB_OUTPUT_FILE)" \
+		"$(board_build)/$(CB_OUTPUT_FILE_GPG_INJ)"
 	./bin/inject_gpg_key.sh --cbfstool "$(build)/$(coreboot_dir)/cbfstool" \
-		"$(build)/$(BOARD)/$(CB_OUTPUT_FILE_GPG_INJ)" "$(PUBKEY_ASC)"
+		"$(board_build)/$(CB_OUTPUT_FILE_GPG_INJ)" "$(PUBKEY_ASC)"
 
 real.clean:
 	for dir in \
diff --git a/boards/leopard/leopard.config b/boards/leopard/leopard.config
index 672ed47f..fe9866ab 100644
--- a/boards/leopard/leopard.config
+++ b/boards/leopard/leopard.config
@@ -43,5 +43,5 @@ export CONFIG_BOOT_REQ_HASH=n
 export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOOT_DEV="/dev/sda1"
 
-$(build)/$(BOARD)/linuxboot.rom: linuxboot.intermediate
+$(board_build)/linuxboot.rom: linuxboot.intermediate
 
diff --git a/boards/qemu-coreboot-fbwhiptail/qemu-coreboot-fbwhiptail.config b/boards/qemu-coreboot-fbwhiptail/qemu-coreboot-fbwhiptail.config
index 4d111655..b065b2e2 100644
--- a/boards/qemu-coreboot-fbwhiptail/qemu-coreboot-fbwhiptail.config
+++ b/boards/qemu-coreboot-fbwhiptail/qemu-coreboot-fbwhiptail.config
@@ -58,7 +58,7 @@ export CONFIG_BOARD_NAME="qemu-coreboot-fbwhiptail"
 run:
 	qemu-system-x86_64 \
 		--machine q35 \
-		--bios $(build)/$(BOARD)/$(CB_OUTPUT_FILE) \
+		--bios $(board_build)/$(CB_OUTPUT_FILE) \
 		-object rng-random,filename=/dev/urandom,id=rng0 \
 		-device virtio-rng-pci,rng=rng0 \
 		-netdev user,id=u1 -device e1000,netdev=u1 \
diff --git a/boards/qemu-coreboot/qemu-coreboot.config b/boards/qemu-coreboot/qemu-coreboot.config
index d05b5c9e..d6e2341f 100644
--- a/boards/qemu-coreboot/qemu-coreboot.config
+++ b/boards/qemu-coreboot/qemu-coreboot.config
@@ -60,7 +60,7 @@ run:
 	qemu-system-x86_64 \
 		--machine q35 \
 		--serial /dev/tty \
-		--bios $(build)/$(BOARD)/$(CB_OUTPUT_FILE) \
+		--bios $(board_build)/$(CB_OUTPUT_FILE) \
 		-object rng-random,filename=/dev/urandom,id=rng0 \
 		-device virtio-rng-pci,rng=rng0 \
 		-netdev user,id=u1 -device e1000,netdev=u1 \
diff --git a/boards/qemu-linuxboot/qemu-linuxboot.config b/boards/qemu-linuxboot/qemu-linuxboot.config
index 64545789..c47edd57 100644
--- a/boards/qemu-linuxboot/qemu-linuxboot.config
+++ b/boards/qemu-linuxboot/qemu-linuxboot.config
@@ -52,6 +52,6 @@ run:
 		-global driver=cfi.pflash01,property=secure,value=on \
 		-redir tcp:5555::22 \
 		--serial $(or $(SERIAL),/dev/tty) \
-		-drive if=pflash,format=raw,unit=0,file=$(build)/$(BOARD)/linuxboot.rom
+		-drive if=pflash,format=raw,unit=0,file=$(board_build)/linuxboot.rom
 	stty sane
 
diff --git a/boards/t430-flash/t430-flash.config b/boards/t430-flash/t430-flash.config
index d1b7f316..bfe51333 100644
--- a/boards/t430-flash/t430-flash.config
+++ b/boards/t430-flash/t430-flash.config
@@ -33,7 +33,7 @@ export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal --ifd --image
 # per CONFIG_BOOTSCRIPT script above.
 #
 # Below, we just move produced ROM with a name appended with -top.rom for clarity.
-all: $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom
-$(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
+all: $(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom
+$(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom: $(board_build)/$(CB_OUTPUT_FILE)
 	$(call do,MV 4MB top ROM,$@, mv $< $@)
 	@sha256sum $@
diff --git a/boards/t430-hotp-maximized/t430-hotp-maximized.config b/boards/t430-hotp-maximized/t430-hotp-maximized.config
index 8753dc25..6335004a 100644
--- a/boards/t430-hotp-maximized/t430-hotp-maximized.config
+++ b/boards/t430-hotp-maximized/t430-hotp-maximized.config
@@ -78,15 +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)
+all: $(board_build)/$(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)
+all: $(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom
+$(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom: $(board_build)/$(CB_OUTPUT_FILE)
 	$(call do,DD 8MB,$@,dd of=$@ if=$< bs=65536 count=128 skip=0 status=none)
 	@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)
+all: $(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom
+$(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom: $(board_build)/$(CB_OUTPUT_FILE)
 	$(call do,DD 4MB,$@,dd of=$@ if=$< bs=65536 count=64 skip=128 status=none)
 	@sha256sum $@ | tee -a "$(HASHES)"
diff --git a/boards/t430-maximized/t430-maximized.config b/boards/t430-maximized/t430-maximized.config
index 15e87249..bd86b72d 100644
--- a/boards/t430-maximized/t430-maximized.config
+++ b/boards/t430-maximized/t430-maximized.config
@@ -78,15 +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)
+all: $(board_build)/$(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)
+all: $(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom
+$(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom: $(board_build)/$(CB_OUTPUT_FILE)
 	$(call do,DD 8MB,$@,dd of=$@ if=$< bs=65536 count=128 skip=0 status=none)
 	@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)
+all: $(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom
+$(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom: $(board_build)/$(CB_OUTPUT_FILE)
 	$(call do,DD 4MB,$@,dd of=$@ if=$< bs=65536 count=64 skip=128 status=none)
 	@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 8e7f43c0..0dcaa031 100644
--- a/boards/t530-dgpu-hotp-maximized/t530-dgpu-hotp-maximized.config
+++ b/boards/t530-dgpu-hotp-maximized/t530-dgpu-hotp-maximized.config
@@ -79,15 +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)
+all: $(board_build)/$(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)
+all: $(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom
+$(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom: $(board_build)/$(CB_OUTPUT_FILE)
 	$(call do,DD 8MB,$@,dd of=$@ if=$< bs=65536 count=128 skip=0 status=none)
 	@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)
+all: $(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom
+$(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom: $(board_build)/$(CB_OUTPUT_FILE)
 	$(call do,DD 4MB,$@,dd of=$@ if=$< bs=65536 count=64 skip=128 status=none)
 	@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 813924ba..b11e5b00 100644
--- a/boards/t530-dgpu-maximized/t530-dgpu-maximized.config
+++ b/boards/t530-dgpu-maximized/t530-dgpu-maximized.config
@@ -79,15 +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)
+all: $(board_build)/$(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)
+all: $(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom
+$(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom: $(board_build)/$(CB_OUTPUT_FILE)
 	$(call do,DD 8MB,$@,dd of=$@ if=$< bs=65536 count=128 skip=0 status=none)
 	@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)
+all: $(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom
+$(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom: $(board_build)/$(CB_OUTPUT_FILE)
 	$(call do,DD 4MB,$@,dd of=$@ if=$< bs=65536 count=64 skip=128 status=none)
 	@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 cbd36b55..069ab8eb 100644
--- a/boards/t530-hotp-maximized/t530-hotp-maximized.config
+++ b/boards/t530-hotp-maximized/t530-hotp-maximized.config
@@ -79,15 +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)
+all: $(board_build)/$(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)
+all: $(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom
+$(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom: $(board_build)/$(CB_OUTPUT_FILE)
 	$(call do,DD 8MB,$@,dd of=$@ if=$< bs=65536 count=128 skip=0 status=none)
 	@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)
+all: $(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom
+$(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom: $(board_build)/$(CB_OUTPUT_FILE)
 	$(call do,DD 4MB,$@,dd of=$@ if=$< bs=65536 count=64 skip=128 status=none)
 	@sha256sum $@ | tee -a "$(HASHES)"
diff --git a/boards/t530-maximized/t530-maximized.config b/boards/t530-maximized/t530-maximized.config
index 26d93c45..b19cc18d 100644
--- a/boards/t530-maximized/t530-maximized.config
+++ b/boards/t530-maximized/t530-maximized.config
@@ -79,15 +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)
+all: $(board_build)/$(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)
+all: $(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom
+$(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom: $(board_build)/$(CB_OUTPUT_FILE)
 	$(call do,DD 8MB,$@,dd of=$@ if=$< bs=65536 count=128 skip=0 status=none)
 	@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)
+all: $(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom
+$(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom: $(board_build)/$(CB_OUTPUT_FILE)
 	$(call do,DD 4MB,$@,dd of=$@ if=$< bs=65536 count=64 skip=128 status=none)
 	@sha256sum $@ | tee -a "$(HASHES)"
diff --git a/boards/tioga/tioga.config b/boards/tioga/tioga.config
index c0dcb4f9..7d72429b 100644
--- a/boards/tioga/tioga.config
+++ b/boards/tioga/tioga.config
@@ -46,5 +46,5 @@ export CONFIG_BOOT_REQ_HASH=n
 export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOOT_DEV="/dev/sda1"
 
-$(build)/$(BOARD)/linuxboot.rom: linuxboot.intermediate
+$(board_build)/linuxboot.rom: linuxboot.intermediate
 
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 e9daa3a9..9494ec83 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,15 +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)
+all: $(board_build)/$(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)
+all: $(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom
+$(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom: $(board_build)/$(CB_OUTPUT_FILE)
 	$(call do,DD 8MB,$@,dd of=$@ if=$< bs=65536 count=128 skip=0 status=none)
 	@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)
+all: $(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom
+$(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom: $(board_build)/$(CB_OUTPUT_FILE)
 	$(call do,DD 4MB,$@,dd of=$@ if=$< bs=65536 count=64 skip=128 status=none)
 	@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 34ba42a6..d0fec0f2 100644
--- a/boards/w530-dgpu-K1000m-maximized/w530-dgpu-K1000m-maximized.config
+++ b/boards/w530-dgpu-K1000m-maximized/w530-dgpu-K1000m-maximized.config
@@ -79,15 +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)
+all: $(board_build)/$(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)
+all: $(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom
+$(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom: $(board_build)/$(CB_OUTPUT_FILE)
 	$(call do,DD 8MB,$@,dd of=$@ if=$< bs=65536 count=128 skip=0 status=none)
 	@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)
+all: $(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom
+$(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom: $(board_build)/$(CB_OUTPUT_FILE)
 	$(call do,DD 4MB,$@,dd of=$@ if=$< bs=65536 count=64 skip=128 status=none)
 	@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 f88ba4d4..0e8b3634 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,15 +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)
+all: $(board_build)/$(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)
+all: $(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom
+$(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom: $(board_build)/$(CB_OUTPUT_FILE)
 	$(call do,DD 8MB,$@,dd of=$@ if=$< bs=65536 count=128 skip=0 status=none)
 	@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)
+all: $(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom
+$(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom: $(board_build)/$(CB_OUTPUT_FILE)
 	$(call do,DD 4MB,$@,dd of=$@ if=$< bs=65536 count=64 skip=128 status=none)
 	@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 4a4e099d..b62a2801 100644
--- a/boards/w530-dgpu-K2000m-maximized/w530-dgpu-K2000m-maximized.config
+++ b/boards/w530-dgpu-K2000m-maximized/w530-dgpu-K2000m-maximized.config
@@ -79,15 +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)
+all: $(board_build)/$(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)
+all: $(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom
+$(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom: $(board_build)/$(CB_OUTPUT_FILE)
 	$(call do,DD 8MB,$@,dd of=$@ if=$< bs=65536 count=128 skip=0 status=none)
 	@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)
+all: $(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom
+$(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom: $(board_build)/$(CB_OUTPUT_FILE)
 	$(call do,DD 4MB,$@,dd of=$@ if=$< bs=65536 count=64 skip=128 status=none)
 	@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 d4e08bc8..02cb7d63 100644
--- a/boards/w530-hotp-maximized/w530-hotp-maximized.config
+++ b/boards/w530-hotp-maximized/w530-hotp-maximized.config
@@ -79,15 +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)
+all: $(board_build)/$(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)
+all: $(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom
+$(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom: $(board_build)/$(CB_OUTPUT_FILE)
 	$(call do,DD 8MB,$@,dd of=$@ if=$< bs=65536 count=128 skip=0 status=none)
 	@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)
+all: $(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom
+$(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom: $(board_build)/$(CB_OUTPUT_FILE)
 	$(call do,DD 4MB,$@,dd of=$@ if=$< bs=65536 count=64 skip=128 status=none)
 	@sha256sum $@ | tee -a "$(HASHES)"
diff --git a/boards/w530-maximized/w530-maximized.config b/boards/w530-maximized/w530-maximized.config
index 039754e0..96b206fd 100644
--- a/boards/w530-maximized/w530-maximized.config
+++ b/boards/w530-maximized/w530-maximized.config
@@ -79,15 +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)
+all: $(board_build)/$(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)
+all: $(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom
+$(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom: $(board_build)/$(CB_OUTPUT_FILE)
 	$(call do,DD 8MB,$@,dd of=$@ if=$< bs=65536 count=128 skip=0 status=none)
 	@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)
+all: $(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom
+$(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom: $(board_build)/$(CB_OUTPUT_FILE)
 	$(call do,DD 4MB,$@,dd of=$@ if=$< bs=65536 count=64 skip=128 status=none)
 	@sha256sum $@ | tee -a "$(HASHES)"
diff --git a/boards/winterfell/winterfell.config b/boards/winterfell/winterfell.config
index fe1cc3b4..22e87dd5 100644
--- a/boards/winterfell/winterfell.config
+++ b/boards/winterfell/winterfell.config
@@ -45,17 +45,17 @@ export CONFIG_BOOT_REQ_HASH=n
 export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOOT_DEV="/dev/sda1"
 
-#$(build)/$(BOARD)/linuxboot.rom: $(build)/$(linuxboot_dir)/
+#$(board_build)/linuxboot.rom: $(build)/$(linuxboot_dir)/
 
 # No 0x on these since the flasher doesn't handle that
 dxe_offset := 860000
 dxe_size := 6a0000
-flash-dxe: $(build)/$(BOARD)/linuxboot.rom
+flash-dxe: $(board_build)/linuxboot.rom
 	( echo u$(dxe_offset) $(dxe_size) ; \
 	pv $(build)/linuxboot-git/build/$(BOARD)/dxe.vol \
 	) > /dev/ttyACM0
 
-flash: $(build)/$(BOARD)/linuxboot.rom
+flash: $(board_build)/linuxboot.rom
 	( echo u0 1000000 ; \
 	pv $< \
 	) > /dev/ttyACM0
diff --git a/boards/x230-flash/x230-flash.config b/boards/x230-flash/x230-flash.config
index b42eb637..2497a920 100644
--- a/boards/x230-flash/x230-flash.config
+++ b/boards/x230-flash/x230-flash.config
@@ -33,7 +33,7 @@ export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal --ifd --image
 # per CONFIG_BOOTSCRIPT script above.
 #
 # Below, we just move produced ROM with a name appended with -top.rom for clarity.
-all: $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom
-$(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
+all: $(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom
+$(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom: $(board_build)/$(CB_OUTPUT_FILE)
 	$(call do,MV 4MB top ROM,$@, mv $< $@)
 	@sha256sum $@
diff --git a/boards/x230-hotp-maximized/x230-hotp-maximized.config b/boards/x230-hotp-maximized/x230-hotp-maximized.config
index 0a03f4c6..a7226da2 100644
--- a/boards/x230-hotp-maximized/x230-hotp-maximized.config
+++ b/boards/x230-hotp-maximized/x230-hotp-maximized.config
@@ -78,15 +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)
+all: $(board_build)/$(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)
+all: $(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom
+$(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom: $(board_build)/$(CB_OUTPUT_FILE)
 	$(call do,DD 8MB,$@,dd of=$@ if=$< bs=65536 count=128 skip=0 status=none)
 	@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)
+all: $(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom
+$(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom: $(board_build)/$(CB_OUTPUT_FILE)
 	$(call do,DD 4MB,$@,dd of=$@ if=$< bs=65536 count=64 skip=128 status=none)
 	@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 c573191b..feffc9d6 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,15 +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)
+all: $(board_build)/$(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)
+all: $(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom
+$(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom: $(board_build)/$(CB_OUTPUT_FILE)
 	$(call do,DD 8MB,$@,dd of=$@ if=$< bs=65536 count=128 skip=0 status=none)
 	@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)
+all: $(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom
+$(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom: $(board_build)/$(CB_OUTPUT_FILE)
 	$(call do,DD 4MB,$@,dd of=$@ if=$< bs=65536 count=64 skip=128 status=none)
 	@sha256sum $@ | tee -a "$(HASHES)"
diff --git a/boards/x230-maximized/x230-maximized.config b/boards/x230-maximized/x230-maximized.config
index e075e203..c2f4734f 100644
--- a/boards/x230-maximized/x230-maximized.config
+++ b/boards/x230-maximized/x230-maximized.config
@@ -78,15 +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)
+all: $(board_build)/$(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)
+all: $(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom
+$(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom: $(board_build)/$(CB_OUTPUT_FILE)
 	$(call do,DD 8MB,$@,dd of=$@ if=$< bs=65536 count=128 skip=0 status=none)
 	@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)
+all: $(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom
+$(board_build)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom: $(board_build)/$(CB_OUTPUT_FILE)
 	$(call do,DD 4MB,$@,dd of=$@ if=$< bs=65536 count=64 skip=128 status=none)
 	@sha256sum $@ | tee -a "$(HASHES)"