diff --git a/.circleci/config.yml b/.circleci/config.yml
index 05d9633fc..02095919d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -310,27 +310,6 @@ workflows:
           requires:
             - x230-hotp-maximized
 
-      - build:
-          name: x230-legacy-flash
-          target: x230-legacy-flash
-          subcommand: ""
-          requires:
-            - x230-hotp-maximized
-
-      - build:
-          name: x230-legacy
-          target: x230-legacy
-          subcommand: ""
-          requires:
-            - x230-hotp-maximized
-
-      - build:
-          name: x230-hotp-legacy
-          target: x230-hotp-legacy
-          subcommand: ""
-          requires:
-            - x230-hotp-maximized
-
       - build:
           name: x230-hotp-maximized_usb-kb
           target: x230-hotp-maximized_usb-kb
diff --git a/BOARD_TESTERS.md b/BOARD_TESTERS.md
index d93375907..4e79f8a26 100644
--- a/BOARD_TESTERS.md
+++ b/BOARD_TESTERS.md
@@ -15,21 +15,22 @@ Laptops
 
 xx20 (Sandy):
 ===
-- [ ] t420 (xx20): @alexmaloteaux @natterangell (iGPU) @akfhasodh @doob85
-- [ ] x220 (xx20): @Thrilleratplay @BlackMaria @srgrint
+- [ ] t420 (xx20): @natterangell(iGPU) @alexmaloteaux @akfhasodh @doob85
+- [ ] x220 (xx20): @srgrint @Thrilleratplay
 
 xx30 (Ivy):
 ===
 - [ ] t430 (xx30): @nestire(t430-legacy, t430-maximized) @Thrilleratplay @alexmaloteaux @lsafd @bwachter(iGPU maximized) @shamen123 @eganonoa(iGPU) @nitrosimon @jans23 @icequbes1 (iGPU) @weyounsix (t430-dgpu)
-- [ ] w530 (xx30): @eganonoa @zifxify @weyounsix (dGPU: w530-k2000m) @jnscmns (dGPU K1000M) @computer-user123 (w530 / & w530 k2000 : prefers iGPU)
+- [ ] w530 (xx30): @eganonoa @zifxify @weyounsix (dGPU: w530-k2000m) @jnscmns (dGPU K1000M) @computer-user123 (w530 / & w530 k2000 : prefers iGPU) @tlaurion
 - [ ] x230 (xx30): @nestire(x230-legacy, x230-maximized) @tlaurion(maximized) @osresearch @merge @jan23 @MrChromebox @shamen123 @eganonoa @bwachter @Thrilleratplay @jnscmns @doob85 @natterangell (x230i variant: irrelevant individual board)
 - [ ] x230-fhd/edp variant: @n4ru @computer-user123 (nitro caster board) @Tonux599 @househead @pcm720 (eDP 4.0 board and 1440p display)
+- [ ] x230t : @fhvyhjriur
 - [ ] t530 (xx30): @fhvyhjriur @3hhh (Opportunity to mainstream and close https://github.com/linuxboot/heads/issues/1682)
 
 xx4x(Haswell):
 ===
-- [ ] t440p: @ThePlexus @srgrint @akunterkontrolle @rbreslow
-- [ ] w541 (similar to t440p): @resende-gustavo @gaspar-ilom
+- [ ] t440p: @fhvyhjriur @ThePlexus @srgrint @akunterkontrolle @rbreslow
+- [ ] w541 (similar to t440p): @ResendeGHF @gaspar-ilom (Always tested late: Needs more responsive board testers or risk to become unmaintained.)
 
 Librems:
 ===
@@ -43,13 +44,13 @@ Librems:
 Clevo:
 ===
 - [ ] Nitropad NS50 (AlderLake) : @daringer
-- [ ] Nitropad NV41 (AlderLake) : @daringer, @tlaurion
+- [ ] Nitropad NV41 (AlderLake) : @tlaurion @daringer
 
 
 Desktops/Servers
 ==
-- [ ] kgpe-d16 (AMD fam15h) (dropped in coreboot 4.12): @tlaurion @Tonux599 @zifxify @arhabd
+- [ ] kgpe-d16 (AMD fam15h) (dropped in coreboot 4.12): @arhabd @Tonux599 @zifxify @tlaurion
 - [ ] Librem L1UM v1 (Broadwell): @JonathonHall-Purism
 - [ ] Librem L1Um v2 (CoffeeLake): @JonathonHall-Purism
-- [ ] Talos II (PPC64LE, Power9) : @tlaurion
+- [ ] Talos II (PPC64LE, Power9) : @tlaurion (Will become untested, no other known users, not worth my time nor effort even though massive investment of all forms)
 - [ ] z220-cmt (HP Z220 CMT): @d-wid
diff --git a/Makefile b/Makefile
index c952ab001..1026785ac 100644
--- a/Makefile
+++ b/Makefile
@@ -604,6 +604,7 @@ bin_modules-$(CONFIG_KEXEC) += kexec
 bin_modules-$(CONFIG_TPMTOTP) += tpmtotp
 bin_modules-$(CONFIG_PCIUTILS) += pciutils
 bin_modules-$(CONFIG_FLASHROM) += flashrom
+bin_modules-$(CONFIG_FLASHPROG) += flashprog
 bin_modules-$(CONFIG_CRYPTSETUP) += cryptsetup
 bin_modules-$(CONFIG_CRYPTSETUP2) += cryptsetup2
 bin_modules-$(CONFIG_GPG) += gpg
@@ -791,15 +792,20 @@ modules.clean:
 	done
 
 board.move_untested_to_tested:
-	@echo "NEW_BOARD variable will remove UNTESTED_ prefix from $(BOARD)"
+	@echo "Moving $(BOARD) from UNTESTED to tested status"
 	@NEW_BOARD=$$(echo $(BOARD) | sed 's/^UNTESTED_//'); \
-	echo "Renaming boards/$$BOARD/$$BOARD.config to boards/$$BOARD/$$NEW_BOARD.config"; \
-	mv boards/$$BOARD/$$BOARD.config boards/$$BOARD/$$NEW_BOARD.config; \
-	echo "Renaming boards/$$BOARD to boards/$$NEW_BOARD"; \
-	rm -rf boards/$$NEW_BOARD; \
-	mv boards/$$BOARD boards/$$NEW_BOARD; \
-	echo "Replacing $$BOARD with $$NEW_BOARD in .circleci/config.yml"; \
-	sed -i "s/$$BOARD/$$NEW_BOARD/g" .circleci/config.yml
+	INCLUDE_BOARD=$$(grep "include \$$(pwd)/boards/" boards/$(BOARD)/$(BOARD).config | sed 's/.*boards\/\(.*\)\/.*/\1/'); \
+	NEW_INCLUDE_BOARD=$$(echo $$INCLUDE_BOARD | sed 's/^UNTESTED_//'); \
+	echo "Updating config file: boards/$(BOARD)/$(BOARD).config"; \
+	sed -i 's/$(BOARD)/'$${NEW_BOARD}'/g' boards/$(BOARD)/$(BOARD).config; \
+	sed -i 's/'$$INCLUDE_BOARD'/'$$NEW_INCLUDE_BOARD'/g' boards/$(BOARD)/$(BOARD).config; \
+	echo "Renaming config file to $${NEW_BOARD}.config"; \
+	mv boards/$(BOARD)/$(BOARD).config boards/$(BOARD)/$${NEW_BOARD}.config; \
+	echo "Renaming board directory to $${NEW_BOARD}"; \
+	mv boards/$(BOARD) boards/$${NEW_BOARD}; \
+	echo "Updating .circleci/config.yml"; \
+	sed -i "s/$(BOARD)/$${NEW_BOARD}/g" .circleci/config.yml; \
+	echo "Operation completed for $(BOARD) -> $${NEW_BOARD}"
 
 board.move_unmaintained_to_tested:
 	@echo "NEW_BOARD variable will remove UNMAINTAINED_ prefix from $(BOARD)"
@@ -830,13 +836,37 @@ board.move_tested_to_untested:
 	@echo "NEW_BOARD variable will add UNTESTED_ prefix to $(BOARD)"
 	@NEW_BOARD=UNTESTED_$(BOARD); \
 	rm -rf boards/$${NEW_BOARD}; \
+	echo "changing $(BOARD) name under boards/$(BOARD)/$(BOARD).config to $${NEW_BOARD}"; \
+	sed boards/$(BOARD)/$(BOARD).config 's/$(BOARD)/$${NEW_BOARD}/g'; \
 	echo "Renaming boards/$(BOARD)/$(BOARD).config to boards/$(BOARD)/$${NEW_BOARD}.config"; \
 	mv boards/$(BOARD)/$(BOARD).config boards/$(BOARD)/$${NEW_BOARD}.config; \
 	echo "Renaming boards/$(BOARD) to boards/$${NEW_BOARD}"; \
 	mv boards/$(BOARD) boards/$${NEW_BOARD}; \
-	echo "Replacing $(BOARD) with $${NEW_BOARD} in .circleci/config.yml"; \
+	echo "Replacing $(BOARD) with $${NEW_BOARD} in .circleci/config.yml"; \
 	sed -i "s/$(BOARD)/$${NEW_BOARD}/g" .circleci/config.yml
 
+board.move_tested_to_unmaintained:
+	@echo "Moving $(BOARD) from tested to unmaintained status"
+	@NEW_BOARD=UNMAINTAINED_$(BOARD); \
+	INCLUDE_BOARD=$$(grep "include \$$(pwd)/boards/" boards/$(BOARD)/$(BOARD).config | sed 's/.*boards\/\(.*\)\/.*/\1/'); \
+	NEW_INCLUDE_BOARD=UNMAINTAINED_$${INCLUDE_BOARD}; \
+	echo "Updating config file: boards/$(BOARD)/$(BOARD).config"; \
+	sed -i 's/$(BOARD)/'$${NEW_BOARD}'/g' boards/$(BOARD)/$(BOARD).config; \
+	if [ -n "$$INCLUDE_BOARD" ]; then \
+		sed -i 's/'$$INCLUDE_BOARD'/'$$NEW_INCLUDE_BOARD'/g' boards/$(BOARD)/$(BOARD).config; \
+	fi; \
+	echo "Creating unmaintained_boards directory if it doesn't exist"; \
+	mkdir -p unmaintained_boards/$${NEW_BOARD}; \
+	echo "Moving and renaming config file to unmaintained_boards/$${NEW_BOARD}/$${NEW_BOARD}.config"; \
+	mv boards/$(BOARD)/$(BOARD).config unmaintained_boards/$${NEW_BOARD}/$${NEW_BOARD}.config; \
+	echo "Moving board directory contents to unmaintained_boards/$${NEW_BOARD}"; \
+	mv boards/$(BOARD)/* unmaintained_boards/$${NEW_BOARD}/; \
+	rmdir boards/$(BOARD); \
+	echo "Updating .circleci/config.yml"; \
+	sed -i "s/$(BOARD)/$${NEW_BOARD}/g" .circleci/config.yml; \
+	echo "Operation completed for $(BOARD) -> $${NEW_BOARD}"; \
+	echo "Please manually review and remove any unnecessary entries in .circleci/config.yml"
+
 # Inject a GPG key into the image - this is most useful when testing in qemu,
 # 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
diff --git a/WP_NOTES.md b/WP_NOTES.md
new file mode 100644
index 000000000..5ff46a785
--- /dev/null
+++ b/WP_NOTES.md
@@ -0,0 +1,22 @@
+Flashrom was passed to flashprog under https://github.com/linuxboot/heads/pull/1769
+
+Those are notes for @i-c-o-n and others wanting to move WP forward but track issues and users
+
+The problem with WP is that it is desired but even if partial write protection regions is present, WP is widely unused.
+
+Some random notes since support is incomplete (depends on chips, really)
+-QDPI is problematic for WP (same IO2 PIN)
+  - Might be turned on by chipset for ME read https://matrix.to/#/!pAlHOfxQNPXOgFGTmo:matrix.org/$NCNidoPsw1ze6zv3m2jlPuGuNrdlDQmDcU81If-q55A?via=matrix.org&via=nitro.chat&via=tchncs.de
+- WP wanted, WP done, WP unused
+  - WP wanted https://github.com/flashrom/flashrom/issues/185 https://github.com/linuxboot/heads/issues/985
+  - WP done: https://github.com/linuxboot/heads/issues/1741 https://github.com/linuxboot/heads/issues/1546
+   - Documented https://docs.dasharo.com/variants/asus_kgpe_d16/spi-wp/
+  - WP still unused
+
+Alternative, as suggested by @i-c-o-n is Chipset Platform Locking (PR0) which is enforced at platform's chipset level for a boot
+- This is implemented and enforced on <= Haswell from this PR merged : https://github.com/linuxboot/heads/pull/1373
+- Non-upstreamed work has been made from @root-hardenedvault work in vaultboot downstream fork of Heads at https://github.com/hardenedvault/vaultboot/blob/master/patches/coreboot/0001-x11.patch
+- Discussion point under flashrom-> flashprog PR under https://github.com/linuxboot/heads/pull/1769/files/f8eb0a27c3dcb17a8c6fcb85dd7f03e8513798ae#r1752395865 tagging @i-c-o-n
+
+
+Not sure what is the way forward here, but lets keep this file in tree to track improvements over time.
diff --git a/boards/UNMAINTAINED_kgpe-d16_server-whiptail/UNMAINTAINED_kgpe-d16_server-whiptail.config b/boards/UNMAINTAINED_kgpe-d16_server-whiptail/UNMAINTAINED_kgpe-d16_server-whiptail.config
index bad8c12c4..3a847c260 100644
--- a/boards/UNMAINTAINED_kgpe-d16_server-whiptail/UNMAINTAINED_kgpe-d16_server-whiptail.config
+++ b/boards/UNMAINTAINED_kgpe-d16_server-whiptail/UNMAINTAINED_kgpe-d16_server-whiptail.config
@@ -25,7 +25,7 @@ CONFIG_COREBOOT_CONFIG=config/coreboot-kgpe-d16_server-whiptail.config
 CONFIG_LINUX_CONFIG=config/linux-kgpe-d16_server-whiptail.config
 
 CONFIG_CRYPTSETUP=y
-CONFIG_FLASHROM=y
+CONFIG_FLASHPROG=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y
 CONFIG_KEXEC=y
@@ -72,5 +72,5 @@ export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOOT_KERNEL_REMOVE="plymouth.ignore-serial-consoles"
 export CONFIG_BOARD_NAME="KGPE-D16 Server-whiptail"
 export CONFIG_USB_BOOT_DEV="/dev/sdb1"
-export CONFIG_FLASHROM_OPTIONS="--force --noverify -p internal"
+export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
 #export CONFIG_BOOT_STATIC_IP=192.168.1.2
diff --git a/boards/UNMAINTAINED_kgpe-d16_server/UNMAINTAINED_kgpe-d16_server.config b/boards/UNMAINTAINED_kgpe-d16_server/UNMAINTAINED_kgpe-d16_server.config
index 995ee637a..5f363add8 100644
--- a/boards/UNMAINTAINED_kgpe-d16_server/UNMAINTAINED_kgpe-d16_server.config
+++ b/boards/UNMAINTAINED_kgpe-d16_server/UNMAINTAINED_kgpe-d16_server.config
@@ -23,7 +23,9 @@ CONFIG_COREBOOT_CONFIG=config/coreboot-kgpe-d16_server.config
 CONFIG_LINUX_CONFIG=config/linux-kgpe-d16_server.config
 
 CONFIG_CRYPTSETUP=y
-CONFIG_FLASHROM=y
+CONFIG_FLASHPROG=y
+#flashprog to support internal flashing of BMC
+CONFIG_FLASHPROG_AST1100=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y
 CONFIG_KEXEC=y
@@ -59,5 +61,5 @@ export CONFIG_BOOT_KERNEL_REMOVE="plymouth.ignore-serial-consoles"
 export CONFIG_BOARD_NAME="KGPE-D16 Server"
 export CONFIG_USB_BOOT_DEV="/dev/sdb1"
 
-export CONFIG_FLASHROM_OPTIONS="--force --noverify -p internal"
+export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
 #export CONFIG_BOOT_STATIC_IP=192.168.1.2
diff --git a/boards/UNMAINTAINED_kgpe-d16_workstation-usb_keyboard/UNMAINTAINED_kgpe-d16_workstation-usb_keyboard.config b/boards/UNMAINTAINED_kgpe-d16_workstation-usb_keyboard/UNMAINTAINED_kgpe-d16_workstation-usb_keyboard.config
index 59ecbfd09..235d579ab 100644
--- a/boards/UNMAINTAINED_kgpe-d16_workstation-usb_keyboard/UNMAINTAINED_kgpe-d16_workstation-usb_keyboard.config
+++ b/boards/UNMAINTAINED_kgpe-d16_workstation-usb_keyboard/UNMAINTAINED_kgpe-d16_workstation-usb_keyboard.config
@@ -19,7 +19,7 @@ CONFIG_COREBOOT_CONFIG=config/coreboot-kgpe-d16_workstation-usb_keyboard.config
 CONFIG_LINUX_CONFIG=config/linux-kgpe-d16_workstation.config
 
 CONFIG_CRYPTSETUP=y
-CONFIG_FLASHROM=y
+CONFIG_FLASHPROG=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y
 CONFIG_KEXEC=y
@@ -67,4 +67,4 @@ export CONFIG_BOOT_REQ_ROLLBACK=n
 #export CONFIG_BOOT_KERNEL_REMOVE="plymouth.ignore-serial-consoles"
 export CONFIG_BOARD_NAME="KGPE-D16 Workstation-USB-Keyboard"
 export CONFIG_USB_BOOT_DEV="/dev/sdb1"
-export CONFIG_FLASHROM_OPTIONS="--force --noverify -p internal"
+export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
diff --git a/boards/UNMAINTAINED_kgpe-d16_workstation/UNMAINTAINED_kgpe-d16_workstation.config b/boards/UNMAINTAINED_kgpe-d16_workstation/UNMAINTAINED_kgpe-d16_workstation.config
index d88ad6ce3..e927edabc 100644
--- a/boards/UNMAINTAINED_kgpe-d16_workstation/UNMAINTAINED_kgpe-d16_workstation.config
+++ b/boards/UNMAINTAINED_kgpe-d16_workstation/UNMAINTAINED_kgpe-d16_workstation.config
@@ -23,7 +23,7 @@ CONFIG_COREBOOT_CONFIG=config/coreboot-kgpe-d16_workstation.config
 CONFIG_LINUX_CONFIG=config/linux-kgpe-d16_workstation.config
 
 CONFIG_CRYPTSETUP=y
-CONFIG_FLASHROM=y
+CONFIG_FLASHPROG=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y
 CONFIG_KEXEC=y
@@ -68,4 +68,4 @@ export CONFIG_BOOT_REQ_ROLLBACK=n
 #export CONFIG_BOOT_KERNEL_REMOVE="plymouth.ignore-serial-consoles"
 export CONFIG_BOARD_NAME="KGPE-D16 Workstation"
 export CONFIG_USB_BOOT_DEV="/dev/sdb1"
-export CONFIG_FLASHROM_OPTIONS="--force --noverify -p internal"
+export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
diff --git a/boards/librem_11/librem_11.config b/boards/librem_11/librem_11.config
index 2610fb7a0..1c50b4ef6 100644
--- a/boards/librem_11/librem_11.config
+++ b/boards/librem_11/librem_11.config
@@ -7,7 +7,7 @@ export CONFIG_COREBOOT_VERSION=purism
 export CONFIG_LINUX_VERSION=6.1.8
 
 CONFIG_CRYPTSETUP2=y
-CONFIG_FLASHROM=y
+CONFIG_FLASHPROG=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y
 CONFIG_KEXEC=y
@@ -36,7 +36,7 @@ export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOOT_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE=""
 export CONFIG_BOARD_NAME="Librem 11"
-export CONFIG_FLASHROM_OPTIONS="-p internal"
+export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
 export CONFIG_USB_KEYBOARD_REQUIRED=y
 export CONFIG_AUTO_BOOT_TIMEOUT=5
 export CONFIG_ROOT_DEV="/dev/nvme0n1p2"
diff --git a/boards/librem_13v2/librem_13v2.config b/boards/librem_13v2/librem_13v2.config
index 49c5dde11..5accb0bcf 100644
--- a/boards/librem_13v2/librem_13v2.config
+++ b/boards/librem_13v2/librem_13v2.config
@@ -7,7 +7,7 @@ export CONFIG_COREBOOT_VERSION=purism
 export CONFIG_LINUX_VERSION=6.1.8
 
 CONFIG_CRYPTSETUP2=y
-CONFIG_FLASHROM=y
+CONFIG_FLASHPROG=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y
 CONFIG_KEXEC=y
@@ -36,7 +36,7 @@ export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOOT_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE=""
 export CONFIG_BOARD_NAME="Librem 13 v2/v3"
-export CONFIG_FLASHROM_OPTIONS="-p internal"
+export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
 export CONFIG_AUTO_BOOT_TIMEOUT=5
 export CONFIG_ROOT_DEV="/dev/nvme0n1p2"
 export CONFIG_ROOT_DIRLIST="bin boot lib sbin usr"
diff --git a/boards/librem_13v4/librem_13v4.config b/boards/librem_13v4/librem_13v4.config
index d3ed7b020..0abeb61d6 100644
--- a/boards/librem_13v4/librem_13v4.config
+++ b/boards/librem_13v4/librem_13v4.config
@@ -7,7 +7,7 @@ export CONFIG_COREBOOT_VERSION=purism
 export CONFIG_LINUX_VERSION=6.1.8
 
 CONFIG_CRYPTSETUP2=y
-CONFIG_FLASHROM=y
+CONFIG_FLASHPROG=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y
 CONFIG_KEXEC=y
@@ -36,7 +36,7 @@ export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOOT_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE=""
 export CONFIG_BOARD_NAME="Librem 13 v4"
-export CONFIG_FLASHROM_OPTIONS="-p internal"
+export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
 export CONFIG_AUTO_BOOT_TIMEOUT=5
 export CONFIG_ROOT_DEV="/dev/nvme0n1p2"
 export CONFIG_ROOT_DIRLIST="bin boot lib sbin usr"
diff --git a/boards/librem_14/librem_14.config b/boards/librem_14/librem_14.config
index 47ca137f5..5c8b3d8e9 100644
--- a/boards/librem_14/librem_14.config
+++ b/boards/librem_14/librem_14.config
@@ -7,7 +7,7 @@ export CONFIG_COREBOOT_VERSION=purism
 export CONFIG_LINUX_VERSION=6.1.8
 
 CONFIG_CRYPTSETUP2=y
-CONFIG_FLASHROM=y
+CONFIG_FLASHPROG=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y
 CONFIG_KEXEC=y
@@ -35,7 +35,7 @@ export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOOT_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE=""
 export CONFIG_BOARD_NAME="Librem 14"
-export CONFIG_FLASHROM_OPTIONS="-p internal"
+export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
 
 export CONFIG_AUTO_BOOT_TIMEOUT=5
 export CONFIG_ROOT_DEV="/dev/nvme0n1p2"
diff --git a/boards/librem_15v3/librem_15v3.config b/boards/librem_15v3/librem_15v3.config
index ec5620b31..cf541ef07 100644
--- a/boards/librem_15v3/librem_15v3.config
+++ b/boards/librem_15v3/librem_15v3.config
@@ -7,7 +7,7 @@ export CONFIG_COREBOOT_VERSION=purism
 export CONFIG_LINUX_VERSION=6.1.8
 
 CONFIG_CRYPTSETUP2=y
-CONFIG_FLASHROM=y
+CONFIG_FLASHPROG=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y
 CONFIG_KEXEC=y
@@ -36,7 +36,7 @@ export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOOT_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE=""
 export CONFIG_BOARD_NAME="Librem 15 v3"
-export CONFIG_FLASHROM_OPTIONS="-p internal"
+export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
 export CONFIG_AUTO_BOOT_TIMEOUT=5
 export CONFIG_ROOT_DEV="/dev/nvme0n1p2"
 export CONFIG_ROOT_DIRLIST="bin boot lib sbin usr"
diff --git a/boards/librem_15v4/librem_15v4.config b/boards/librem_15v4/librem_15v4.config
index 6f9b3cef7..9deaea273 100644
--- a/boards/librem_15v4/librem_15v4.config
+++ b/boards/librem_15v4/librem_15v4.config
@@ -7,7 +7,7 @@ export CONFIG_COREBOOT_VERSION=purism
 export CONFIG_LINUX_VERSION=6.1.8
 
 CONFIG_CRYPTSETUP2=y
-CONFIG_FLASHROM=y
+CONFIG_FLASHPROG=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y
 CONFIG_KBD=y
@@ -37,7 +37,7 @@ export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOOT_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE=""
 export CONFIG_BOARD_NAME="Librem 15 v4"
-export CONFIG_FLASHROM_OPTIONS="-p internal"
+export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
 export CONFIG_AUTO_BOOT_TIMEOUT=5
 export CONFIG_ROOT_DEV="/dev/nvme0n1p2"
 export CONFIG_ROOT_DIRLIST="bin boot lib sbin usr"
diff --git a/boards/librem_l1um/librem_l1um.config b/boards/librem_l1um/librem_l1um.config
index 98f76a5c8..ed8dc1765 100644
--- a/boards/librem_l1um/librem_l1um.config
+++ b/boards/librem_l1um/librem_l1um.config
@@ -8,7 +8,7 @@ export CONFIG_LINUX_VERSION=5.10.5
 export CONFIG_PURISM_BLOBS=y
 
 CONFIG_CRYPTSETUP2=y
-CONFIG_FLASHROM=y
+CONFIG_FLASHPROG=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y
 CONFIG_KEXEC=y
@@ -36,7 +36,7 @@ export CONFIG_BOOT_KERNEL_ADD="intel_iommu=on"
 export CONFIG_BOOT_KERNEL_REMOVE="plymouth.ignore-serial-consoles"
 export CONFIG_BOARD_NAME="Librem Server L1UM"
 export CONFIG_AUTO_BOOT_TIMEOUT=5
-export CONFIG_FLASHROM_OPTIONS="-p internal"
+export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
 export CONFIG_USB_KEYBOARD_REQUIRED=y
 export CONFIG_ROOT_DEV="/dev/nvme0n1p2"
 export CONFIG_ROOT_DIRLIST="bin boot lib sbin usr"
diff --git a/boards/librem_l1um_v2/librem_l1um_v2.config b/boards/librem_l1um_v2/librem_l1um_v2.config
index 3981a1a89..6098682b9 100644
--- a/boards/librem_l1um_v2/librem_l1um_v2.config
+++ b/boards/librem_l1um_v2/librem_l1um_v2.config
@@ -7,7 +7,7 @@ export CONFIG_COREBOOT_VERSION=purism
 export CONFIG_LINUX_VERSION=6.1.8
 
 CONFIG_CRYPTSETUP2=y
-CONFIG_FLASHROM=y
+CONFIG_FLASHPROG=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y
 CONFIG_KEXEC=y
@@ -40,7 +40,7 @@ export CONFIG_BOOT_KERNEL_REMOVE="plymouth.ignore-serial-consoles"
 export CONFIG_BOOT_RECOVERY_SERIAL="/dev/ttyS0"
 export CONFIG_BOARD_NAME="Librem Server L1UM v2"
 export CONFIG_AUTO_BOOT_TIMEOUT=5
-export CONFIG_FLASHROM_OPTIONS="-p internal"
+export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
 export CONFIG_USB_KEYBOARD_REQUIRED=y
 export CONFIG_ROOT_DEV="/dev/nvme0n1p2"
 export CONFIG_ROOT_DIRLIST="bin boot lib sbin usr"
diff --git a/boards/librem_mini/librem_mini.config b/boards/librem_mini/librem_mini.config
index 6e3f71767..46d0a7388 100644
--- a/boards/librem_mini/librem_mini.config
+++ b/boards/librem_mini/librem_mini.config
@@ -7,7 +7,7 @@ export CONFIG_COREBOOT_VERSION=purism
 export CONFIG_LINUX_VERSION=6.1.8
 
 CONFIG_CRYPTSETUP2=y
-CONFIG_FLASHROM=y
+CONFIG_FLASHPROG=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y
 CONFIG_IOPORT=y
@@ -36,7 +36,7 @@ export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOOT_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE=""
 export CONFIG_BOARD_NAME="Librem Mini"
-export CONFIG_FLASHROM_OPTIONS="-p internal"
+export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
 export CONFIG_USB_KEYBOARD_REQUIRED=y
 export CONFIG_AUTO_BOOT_TIMEOUT=5
 export CONFIG_ROOT_DEV="/dev/nvme0n1p2"
diff --git a/boards/librem_mini_v2/librem_mini_v2.config b/boards/librem_mini_v2/librem_mini_v2.config
index 0325ecab0..163876e16 100644
--- a/boards/librem_mini_v2/librem_mini_v2.config
+++ b/boards/librem_mini_v2/librem_mini_v2.config
@@ -7,7 +7,7 @@ export CONFIG_COREBOOT_VERSION=purism
 export CONFIG_LINUX_VERSION=6.1.8
 
 CONFIG_CRYPTSETUP2=y
-CONFIG_FLASHROM=y
+CONFIG_FLASHPROG=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y
 CONFIG_IOPORT=y
@@ -36,7 +36,7 @@ export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOOT_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE=""
 export CONFIG_BOARD_NAME="Librem Mini v2"
-export CONFIG_FLASHROM_OPTIONS="-p internal"
+export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
 export CONFIG_USB_KEYBOARD_REQUIRED=y
 export CONFIG_AUTO_BOOT_TIMEOUT=5
 export CONFIG_ROOT_DEV="/dev/nvme0n1p2"
diff --git a/boards/nitropad-ns50/nitropad-ns50.config b/boards/nitropad-ns50/nitropad-ns50.config
index 07117cb82..7721927b4 100644
--- a/boards/nitropad-ns50/nitropad-ns50.config
+++ b/boards/nitropad-ns50/nitropad-ns50.config
@@ -21,7 +21,7 @@ CONFIG_MOBILE_TETHERING=y
 
 #Modules packed into tools.cpio
 CONFIG_CRYPTSETUP2=y
-CONFIG_FLASHROM=y
+CONFIG_FLASHPROG=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y
 CONFIG_KEXEC=y
@@ -68,5 +68,5 @@ export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOOT_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off"
 export CONFIG_BOARD_NAME="Nitropad NS50"
-export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
+export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
 export CONFIG_AUTO_BOOT_TIMEOUT=5
diff --git a/boards/nitropad-nv41/nitropad-nv41.config b/boards/nitropad-nv41/nitropad-nv41.config
index adca07c6a..54bc0d44e 100644
--- a/boards/nitropad-nv41/nitropad-nv41.config
+++ b/boards/nitropad-nv41/nitropad-nv41.config
@@ -21,7 +21,7 @@ CONFIG_MOBILE_TETHERING=y
 
 #Modules packed into tools.cpio
 CONFIG_CRYPTSETUP2=y
-CONFIG_FLASHROM=y
+CONFIG_FLASHPROG=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y
 CONFIG_KEXEC=y
@@ -68,5 +68,5 @@ export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOOT_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off"
 export CONFIG_BOARD_NAME="Nitropad NV41"
-export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
+export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
 export CONFIG_AUTO_BOOT_TIMEOUT=5
diff --git a/boards/optiplex-7010_9010-hotp-maximized/optiplex-7010_9010-hotp-maximized.config b/boards/optiplex-7010_9010-hotp-maximized/optiplex-7010_9010-hotp-maximized.config
index d562e43bf..19f83c076 100644
--- a/boards/optiplex-7010_9010-hotp-maximized/optiplex-7010_9010-hotp-maximized.config
+++ b/boards/optiplex-7010_9010-hotp-maximized/optiplex-7010_9010-hotp-maximized.config
@@ -24,7 +24,7 @@ CONFIG_MOBILE_TETHERING=y
 
 #Modules packed into tools.cpio
 CONFIG_CRYPTSETUP2=y
-CONFIG_FLASHROM=y
+CONFIG_FLASHPROG=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y
 CONFIG_KEXEC=y
@@ -81,7 +81,7 @@ export CONFIG_BOOT_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off"
 export CONFIG_BOOT_DEV="/dev/sda1"
 export CONFIG_BOARD_NAME="Dell Optiplex 7010/9010 HOTP maximized"
-export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
+export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
 
 #Include bits related to ivybridge ME blob download/neutering down to BUP+ROMP
 BOARD_TARGETS := xx30_me_blobs
diff --git a/boards/optiplex-7010_9010-maximized/optiplex-7010_9010-maximized.config b/boards/optiplex-7010_9010-maximized/optiplex-7010_9010-maximized.config
index 704c63eb9..7b5e6e71f 100644
--- a/boards/optiplex-7010_9010-maximized/optiplex-7010_9010-maximized.config
+++ b/boards/optiplex-7010_9010-maximized/optiplex-7010_9010-maximized.config
@@ -24,7 +24,7 @@ CONFIG_MOBILE_TETHERING=y
 
 #Modules packed into tools.cpio
 CONFIG_CRYPTSETUP2=y
-CONFIG_FLASHROM=y
+CONFIG_FLASHPROG=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y
 CONFIG_KEXEC=y
@@ -81,7 +81,7 @@ export CONFIG_BOOT_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off"
 export CONFIG_BOOT_DEV="/dev/sda1"
 export CONFIG_BOARD_NAME="Dell Optiplex 7010/9010 maximized"
-export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
+export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
 
 #Include bits related to ivybridge ME blob download/neutering down to BUP+ROMP
 BOARD_TARGETS := xx30_me_blobs
diff --git a/boards/optiplex-7010_9010_TXT-hotp-maximized/optiplex-7010_9010_TXT-hotp-maximized.config b/boards/optiplex-7010_9010_TXT-hotp-maximized/optiplex-7010_9010_TXT-hotp-maximized.config
index e93b9b5d1..194475e04 100644
--- a/boards/optiplex-7010_9010_TXT-hotp-maximized/optiplex-7010_9010_TXT-hotp-maximized.config
+++ b/boards/optiplex-7010_9010_TXT-hotp-maximized/optiplex-7010_9010_TXT-hotp-maximized.config
@@ -24,7 +24,7 @@ CONFIG_MOBILE_TETHERING=y
 
 #Modules packed into tools.cpio
 CONFIG_CRYPTSETUP2=y
-CONFIG_FLASHROM=y
+CONFIG_FLASHPROG=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y
 CONFIG_KEXEC=y
@@ -81,7 +81,7 @@ export CONFIG_BOOT_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off"
 export CONFIG_BOOT_DEV="/dev/sda1"
 export CONFIG_BOARD_NAME="Dell Optiplex 7010/9010 HOTP maximized (TXT enabled)"
-export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
+export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
 
 #Include bits related to ivybridge ME blob download/neutering down to BUP+ROMP
 BOARD_TARGETS := xx30_me_blobs
diff --git a/boards/optiplex-7010_9010_TXT-maximized/optiplex-7010_9010_TXT-maximized.config b/boards/optiplex-7010_9010_TXT-maximized/optiplex-7010_9010_TXT-maximized.config
index 3729eeadf..2e62094e2 100644
--- a/boards/optiplex-7010_9010_TXT-maximized/optiplex-7010_9010_TXT-maximized.config
+++ b/boards/optiplex-7010_9010_TXT-maximized/optiplex-7010_9010_TXT-maximized.config
@@ -24,7 +24,7 @@ CONFIG_MOBILE_TETHERING=y
 
 #Modules packed into tools.cpio
 CONFIG_CRYPTSETUP2=y
-CONFIG_FLASHROM=y
+CONFIG_FLASHPROG=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y
 CONFIG_KEXEC=y
@@ -81,7 +81,7 @@ export CONFIG_BOOT_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off"
 export CONFIG_BOOT_DEV="/dev/sda1"
 export CONFIG_BOARD_NAME="Dell Optiplex 7010/9010 maximized (TXT enabled)"
-export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
+export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
 
 #Include bits related to ivybridge ME blob download/neutering down to BUP+ROMP
 BOARD_TARGETS := xx30_me_blobs
diff --git a/boards/qemu-coreboot-fbwhiptail-tpm1-hotp/qemu-coreboot-fbwhiptail-tpm1-hotp.config b/boards/qemu-coreboot-fbwhiptail-tpm1-hotp/qemu-coreboot-fbwhiptail-tpm1-hotp.config
index b4c6b3a1f..665cb0e45 100644
--- a/boards/qemu-coreboot-fbwhiptail-tpm1-hotp/qemu-coreboot-fbwhiptail-tpm1-hotp.config
+++ b/boards/qemu-coreboot-fbwhiptail-tpm1-hotp/qemu-coreboot-fbwhiptail-tpm1-hotp.config
@@ -39,7 +39,7 @@ CONFIG_BUSYBOX=n
 else
 #Modules packed into tools.cpio
 CONFIG_CRYPTSETUP2=y
-CONFIG_FLASHROM=y
+CONFIG_FLASHPROG=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y
 CONFIG_KEXEC=y
@@ -91,7 +91,7 @@ export CONFIG_BOOT_RECOVERY_SERIAL="/dev/ttyS0"
 export CONFIG_BOOT_KERNEL_ADD="console=ttyS0 console=tty systemd.zram=0"
 export CONFIG_BOOT_KERNEL_REMOVE="quiet rhgb splash"
 export CONFIG_BOARD_NAME="qemu-coreboot-fbwhiptail-tpm1-hotp"
-#export CONFIG_FLASHROM_OPTIONS="-p internal"
+#export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
 export CONFIG_AUTO_BOOT_TIMEOUT=5
 
 BOARD_TARGETS := qemu
diff --git a/boards/qemu-coreboot-fbwhiptail-tpm1/qemu-coreboot-fbwhiptail-tpm1.config b/boards/qemu-coreboot-fbwhiptail-tpm1/qemu-coreboot-fbwhiptail-tpm1.config
index be28d0bc6..81558e823 100644
--- a/boards/qemu-coreboot-fbwhiptail-tpm1/qemu-coreboot-fbwhiptail-tpm1.config
+++ b/boards/qemu-coreboot-fbwhiptail-tpm1/qemu-coreboot-fbwhiptail-tpm1.config
@@ -37,7 +37,7 @@ CONFIG_BUSYBOX=n
 else
 #Modules packed into tools.cpio
 CONFIG_CRYPTSETUP2=y
-CONFIG_FLASHROM=y
+CONFIG_FLASHPROG=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y
 CONFIG_KEXEC=y
@@ -89,7 +89,7 @@ export CONFIG_BOOT_RECOVERY_SERIAL="/dev/ttyS0"
 export CONFIG_BOOT_KERNEL_ADD="console=ttyS0 console=tty systemd.zram=0"
 export CONFIG_BOOT_KERNEL_REMOVE="quiet rhgb splash"
 export CONFIG_BOARD_NAME="qemu-coreboot-fbwhiptail-tpm1"
-#export CONFIG_FLASHROM_OPTIONS="-p internal"
+#export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
 #export CONFIG_AUTO_BOOT_TIMEOUT=5
 
 BOARD_TARGETS := qemu
diff --git a/boards/qemu-coreboot-fbwhiptail-tpm2-hotp/qemu-coreboot-fbwhiptail-tpm2-hotp.config b/boards/qemu-coreboot-fbwhiptail-tpm2-hotp/qemu-coreboot-fbwhiptail-tpm2-hotp.config
index 3c589c8fb..21750ddcf 100644
--- a/boards/qemu-coreboot-fbwhiptail-tpm2-hotp/qemu-coreboot-fbwhiptail-tpm2-hotp.config
+++ b/boards/qemu-coreboot-fbwhiptail-tpm2-hotp/qemu-coreboot-fbwhiptail-tpm2-hotp.config
@@ -38,7 +38,7 @@ CONFIG_BUSYBOX=n
 else
 #Modules packed into tools.cpio
 CONFIG_CRYPTSETUP2=y
-CONFIG_FLASHROM=y
+CONFIG_FLASHPROG=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y
 CONFIG_KEXEC=y
@@ -90,7 +90,7 @@ export CONFIG_BOOT_RECOVERY_SERIAL="/dev/ttyS0"
 export CONFIG_BOOT_KERNEL_ADD="console=ttyS0 console=tty systemd.zram=0"
 export CONFIG_BOOT_KERNEL_REMOVE="quiet rhgb splash"
 export CONFIG_BOARD_NAME="qemu-coreboot-fbwhiptail-tpm2-hotp"
-#export CONFIG_FLASHROM_OPTIONS="-p internal"
+#export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
 export CONFIG_AUTO_BOOT_TIMEOUT=5
 
 BOARD_TARGETS := qemu
diff --git a/boards/qemu-coreboot-fbwhiptail-tpm2/qemu-coreboot-fbwhiptail-tpm2.config b/boards/qemu-coreboot-fbwhiptail-tpm2/qemu-coreboot-fbwhiptail-tpm2.config
index cca9f0df3..94881db3b 100644
--- a/boards/qemu-coreboot-fbwhiptail-tpm2/qemu-coreboot-fbwhiptail-tpm2.config
+++ b/boards/qemu-coreboot-fbwhiptail-tpm2/qemu-coreboot-fbwhiptail-tpm2.config
@@ -37,7 +37,7 @@ CONFIG_BUSYBOX=n
 else
 #Modules packed into tools.cpio
 CONFIG_CRYPTSETUP2=y
-CONFIG_FLASHROM=y
+CONFIG_FLASHPROG=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y
 CONFIG_KEXEC=y
@@ -89,7 +89,7 @@ export CONFIG_BOOT_RECOVERY_SERIAL="/dev/ttyS0"
 export CONFIG_BOOT_KERNEL_ADD="console=ttyS0 console=tty systemd.zram=0"
 export CONFIG_BOOT_KERNEL_REMOVE="quiet rhgb splash"
 export CONFIG_BOARD_NAME="qemu-coreboot-fbwhiptail-tpm2"
-#export CONFIG_FLASHROM_OPTIONS="-p internal"
+#export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
 #export CONFIG_AUTO_BOOT_TIMEOUT=5
 
 BOARD_TARGETS := qemu
diff --git a/boards/qemu-coreboot-whiptail-tpm1-hotp/qemu-coreboot-whiptail-tpm1-hotp.config b/boards/qemu-coreboot-whiptail-tpm1-hotp/qemu-coreboot-whiptail-tpm1-hotp.config
index fafdcaf88..68f0acf09 100644
--- a/boards/qemu-coreboot-whiptail-tpm1-hotp/qemu-coreboot-whiptail-tpm1-hotp.config
+++ b/boards/qemu-coreboot-whiptail-tpm1-hotp/qemu-coreboot-whiptail-tpm1-hotp.config
@@ -39,7 +39,7 @@ CONFIG_BUSYBOX=n
 else
 #Modules packed into tools.cpio
 CONFIG_CRYPTSETUP2=y
-CONFIG_FLASHROM=y
+CONFIG_FLASHPROG=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y
 CONFIG_KEXEC=y
@@ -91,7 +91,7 @@ export CONFIG_BOOT_RECOVERY_SERIAL="/dev/ttyS0"
 export CONFIG_BOOT_KERNEL_ADD="console=ttyS0 console=tty systemd.zram=0"
 export CONFIG_BOOT_KERNEL_REMOVE="quiet rhgb splash"
 export CONFIG_BOARD_NAME="qemu-coreboot-whiptail-tpm1-hotp"
-#export CONFIG_FLASHROM_OPTIONS="-p internal"
+#export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
 export CONFIG_AUTO_BOOT_TIMEOUT=5
 
 BOARD_TARGETS := qemu
diff --git a/boards/qemu-coreboot-whiptail-tpm1/qemu-coreboot-whiptail-tpm1.config b/boards/qemu-coreboot-whiptail-tpm1/qemu-coreboot-whiptail-tpm1.config
index a0981ed4e..c700478cb 100644
--- a/boards/qemu-coreboot-whiptail-tpm1/qemu-coreboot-whiptail-tpm1.config
+++ b/boards/qemu-coreboot-whiptail-tpm1/qemu-coreboot-whiptail-tpm1.config
@@ -37,7 +37,7 @@ CONFIG_BUSYBOX=n
 else
 #Modules packed into tools.cpio
 CONFIG_CRYPTSETUP2=y
-CONFIG_FLASHROM=y
+CONFIG_FLASHPROG=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y
 CONFIG_KEXEC=y
@@ -89,7 +89,7 @@ export CONFIG_BOOT_RECOVERY_SERIAL="/dev/ttyS0"
 export CONFIG_BOOT_KERNEL_ADD="console=ttyS0 console=tty systemd.zram=0"
 export CONFIG_BOOT_KERNEL_REMOVE="quiet rhgb splash"
 export CONFIG_BOARD_NAME="qemu-coreboot-whiptail-tpm1"
-#export CONFIG_FLASHROM_OPTIONS="-p internal"
+#export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
 #export CONFIG_AUTO_BOOT_TIMEOUT=5
 
 BOARD_TARGETS := qemu
diff --git a/boards/qemu-coreboot-whiptail-tpm2-hotp/qemu-coreboot-whiptail-tpm2-hotp.config b/boards/qemu-coreboot-whiptail-tpm2-hotp/qemu-coreboot-whiptail-tpm2-hotp.config
index e880fbe34..6574dc3ec 100644
--- a/boards/qemu-coreboot-whiptail-tpm2-hotp/qemu-coreboot-whiptail-tpm2-hotp.config
+++ b/boards/qemu-coreboot-whiptail-tpm2-hotp/qemu-coreboot-whiptail-tpm2-hotp.config
@@ -38,7 +38,7 @@ CONFIG_BUSYBOX=n
 else
 #Modules packed into tools.cpio
 CONFIG_CRYPTSETUP2=y
-CONFIG_FLASHROM=y
+CONFIG_FLASHPROG=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y
 CONFIG_KEXEC=y
@@ -90,7 +90,7 @@ export CONFIG_BOOT_RECOVERY_SERIAL="/dev/ttyS0"
 export CONFIG_BOOT_KERNEL_ADD="console=ttyS0 console=tty systemd.zram=0"
 export CONFIG_BOOT_KERNEL_REMOVE="quiet rhgb splash"
 export CONFIG_BOARD_NAME="qemu-coreboot-whiptail-tpm2-hotp"
-#export CONFIG_FLASHROM_OPTIONS="-p internal"
+#export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
 export CONFIG_AUTO_BOOT_TIMEOUT=5
 
 BOARD_TARGETS := qemu
diff --git a/boards/qemu-coreboot-whiptail-tpm2/qemu-coreboot-whiptail-tpm2.config b/boards/qemu-coreboot-whiptail-tpm2/qemu-coreboot-whiptail-tpm2.config
index 43dbe09cb..019521225 100644
--- a/boards/qemu-coreboot-whiptail-tpm2/qemu-coreboot-whiptail-tpm2.config
+++ b/boards/qemu-coreboot-whiptail-tpm2/qemu-coreboot-whiptail-tpm2.config
@@ -37,7 +37,7 @@ CONFIG_BUSYBOX=n
 else
 #Modules packed into tools.cpio
 CONFIG_CRYPTSETUP2=y
-CONFIG_FLASHROM=y
+CONFIG_FLASHPROG=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y
 CONFIG_KEXEC=y
@@ -89,7 +89,7 @@ export CONFIG_BOOT_RECOVERY_SERIAL="/dev/ttyS0"
 export CONFIG_BOOT_KERNEL_ADD="console=ttyS0 console=tty systemd.zram=0"
 export CONFIG_BOOT_KERNEL_REMOVE="quiet rhgb splash"
 export CONFIG_BOARD_NAME="qemu-coreboot-whiptail-tpm2"
-#export CONFIG_FLASHROM_OPTIONS="-p internal"
+#export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
 #export CONFIG_AUTO_BOOT_TIMEOUT=5
 
 BOARD_TARGETS := qemu
diff --git a/boards/t420-hotp-maximized/t420-hotp-maximized.config b/boards/t420-hotp-maximized/t420-hotp-maximized.config
index 3494f6f8d..dbdeda6a0 100644
--- a/boards/t420-hotp-maximized/t420-hotp-maximized.config
+++ b/boards/t420-hotp-maximized/t420-hotp-maximized.config
@@ -21,7 +21,7 @@ CONFIG_LINUX_E1000E=y
 CONFIG_MOBILE_TETHERING=y
 
 CONFIG_CRYPTSETUP2=y
-CONFIG_FLASHROM=y
+CONFIG_FLASHPROG=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y
 CONFIG_KEXEC=y
@@ -66,7 +66,7 @@ export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOOT_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off"
 export CONFIG_BOARD_NAME="ThinkPad T420-hotp-maximized"
-export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal:ich_spi_mode=hwseq"
+export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal:ich_spi_mode=hwseq"
 
 #Include bits related to sandybridge ME blob download/neutering down to BUP
 BOARD_TARGETS := xx20_me_blobs
diff --git a/boards/t420-maximized/t420-maximized.config b/boards/t420-maximized/t420-maximized.config
index 60ee80bda..2bd5aaaa6 100644
--- a/boards/t420-maximized/t420-maximized.config
+++ b/boards/t420-maximized/t420-maximized.config
@@ -20,7 +20,7 @@ CONFIG_LINUX_E1000E=y
 CONFIG_MOBILE_TETHERING=y
 
 CONFIG_CRYPTSETUP2=y
-CONFIG_FLASHROM=y
+CONFIG_FLASHPROG=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y
 CONFIG_KEXEC=y
@@ -64,7 +64,7 @@ export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOOT_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off"
 export CONFIG_BOARD_NAME="ThinkPad T420-maximized"
-export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal:ich_spi_mode=hwseq"
+export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal:ich_spi_mode=hwseq"
 
 #Include bits related to sandybridge ME blob download/neutering down to BUP
 BOARD_TARGETS := xx20_me_blobs
diff --git a/boards/t430-hotp-maximized/t430-hotp-maximized.config b/boards/t430-hotp-maximized/t430-hotp-maximized.config
index fd549a08d..1861c64cb 100644
--- a/boards/t430-hotp-maximized/t430-hotp-maximized.config
+++ b/boards/t430-hotp-maximized/t430-hotp-maximized.config
@@ -19,7 +19,7 @@ CONFIG_LINUX_E1000E=y
 CONFIG_MOBILE_TETHERING=y
 
 CONFIG_CRYPTSETUP2=y
-CONFIG_FLASHROM=y
+CONFIG_FLASHPROG=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y
 CONFIG_KEXEC=y
@@ -64,7 +64,7 @@ export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOOT_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off"
 export CONFIG_BOARD_NAME="Thinkpad T430-hotp-maximized"
-export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
+export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
 
 #Include bits related to ivybridge ME blob download/neutering down to BUP+ROMP
 BOARD_TARGETS := xx30_me_blobs
diff --git a/boards/t430-maximized/t430-maximized.config b/boards/t430-maximized/t430-maximized.config
index 4e3addec9..0a804940a 100644
--- a/boards/t430-maximized/t430-maximized.config
+++ b/boards/t430-maximized/t430-maximized.config
@@ -19,7 +19,7 @@ CONFIG_LINUX_E1000E=y
 CONFIG_MOBILE_TETHERING=y
 
 CONFIG_CRYPTSETUP2=y
-CONFIG_FLASHROM=y
+CONFIG_FLASHPROG=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y
 CONFIG_KEXEC=y
@@ -64,7 +64,7 @@ export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOOT_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off"
 export CONFIG_BOARD_NAME="Thinkpad T430-maximized"
-export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
+export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
 
 #Include bits related to ivybridge ME blob download/neutering down to BUP+ROMP
 BOARD_TARGETS := xx30_me_blobs
diff --git a/boards/t440p-maximized/t440p-maximized.config b/boards/t440p-maximized/t440p-maximized.config
index aaf34a8c6..22aeb9c6a 100644
--- a/boards/t440p-maximized/t440p-maximized.config
+++ b/boards/t440p-maximized/t440p-maximized.config
@@ -8,7 +8,7 @@ export CONFIG_COREBOOT_VERSION=24.02.01
 export CONFIG_LINUX_VERSION=5.10.5
 
 CONFIG_CRYPTSETUP2=y
-CONFIG_FLASHROM=y
+CONFIG_FLASHPROG=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y
 CONFIG_KEXEC=y
@@ -38,7 +38,7 @@ export CONFIG_BOOTSCRIPT=/bin/gui-init
 export CONFIG_BOOT_REQ_HASH=n
 export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOARD_NAME="ThinkPad T440p-maximized"
-export CONFIG_FLASHROM_OPTIONS="-p internal"
+export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
 
 # Make the Coreboot build depend on the following 3rd party blobs:
 $(build)/coreboot-$(CONFIG_COREBOOT_VERSION)/$(BOARD)/.build: \
diff --git a/boards/t530-hotp-maximized/t530-hotp-maximized.config b/boards/t530-hotp-maximized/t530-hotp-maximized.config
index 7bcb5c101..f237b3dbd 100644
--- a/boards/t530-hotp-maximized/t530-hotp-maximized.config
+++ b/boards/t530-hotp-maximized/t530-hotp-maximized.config
@@ -20,7 +20,7 @@ CONFIG_LINUX_E1000E=y
 CONFIG_MOBILE_TETHERING=y
 
 CONFIG_CRYPTSETUP2=y
-CONFIG_FLASHROM=y
+CONFIG_FLASHPROG=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y
 CONFIG_KEXEC=y
@@ -66,7 +66,7 @@ export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOOT_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off"
 export CONFIG_BOARD_NAME="Thinkpad T530-hotp-maximized"
-export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
+export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
 
 #Include bits related to ivybridge ME blob download/neutering down to BUP+ROMP
 BOARD_TARGETS := xx30_me_blobs
diff --git a/boards/t530-maximized/t530-maximized.config b/boards/t530-maximized/t530-maximized.config
index 6d8c8e719..84acd68ca 100644
--- a/boards/t530-maximized/t530-maximized.config
+++ b/boards/t530-maximized/t530-maximized.config
@@ -20,7 +20,7 @@ CONFIG_LINUX_E1000E=y
 CONFIG_MOBILE_TETHERING=y
 
 CONFIG_CRYPTSETUP2=y
-CONFIG_FLASHROM=y
+CONFIG_FLASHPROG=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y
 CONFIG_KEXEC=y
@@ -65,7 +65,7 @@ export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOOT_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off"
 export CONFIG_BOARD_NAME="Thinkpad T530-maximized"
-export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
+export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
 
 #Include bits related to ivybridge ME blob download/neutering down to BUP+ROMP
 BOARD_TARGETS := xx30_me_blobs
diff --git a/boards/talos-2/talos-2.config b/boards/talos-2/talos-2.config
index b7f0923d5..fc6cd0e35 100644
--- a/boards/talos-2/talos-2.config
+++ b/boards/talos-2/talos-2.config
@@ -21,7 +21,7 @@ CONFIG_QRENCODE=y
 CONFIG_TPMTOTP=y
 CONFIG_GPG2=y
 CONFIG_PCIUTILS=y
-CONFIG_FLASHROM=y
+CONFIG_FLASHPROG=y
 CONFIG_FLASHTOOLS=y
 CONFIG_POWERPC_UTILS=y
 
@@ -47,6 +47,6 @@ export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOOT_KERNEL_REMOVE="quiet"
 export CONFIG_BOOT_KERNEL_ADD="console=tty0 console=hvc0 rootdelay=3 rootwait panic=10"
 export CONFIG_BOARD_NAME="Talos 2"
-export CONFIG_FLASHROM_OPTIONS="--noverify-all -p linux_mtd"
+export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer linux_mtd"
 
 BOARD_TARGETS := ppc_tgz
diff --git a/boards/w530-hotp-maximized/w530-hotp-maximized.config b/boards/w530-hotp-maximized/w530-hotp-maximized.config
index 670d07909..425989a95 100644
--- a/boards/w530-hotp-maximized/w530-hotp-maximized.config
+++ b/boards/w530-hotp-maximized/w530-hotp-maximized.config
@@ -20,7 +20,7 @@ CONFIG_LINUX_E1000E=y
 CONFIG_MOBILE_TETHERING=y
 
 CONFIG_CRYPTSETUP2=y
-CONFIG_FLASHROM=y
+CONFIG_FLASHPROG=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y
 CONFIG_KEXEC=y
@@ -66,7 +66,7 @@ export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOOT_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off"
 export CONFIG_BOARD_NAME="Thinkpad W530-hotp-maximized"
-export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
+export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
 
 #Include bits related to ivybridge ME blob download/neutering down to BUP+ROMP
 BOARD_TARGETS := xx30_me_blobs
diff --git a/boards/w530-maximized/w530-maximized.config b/boards/w530-maximized/w530-maximized.config
index a318e37aa..26c88bb63 100644
--- a/boards/w530-maximized/w530-maximized.config
+++ b/boards/w530-maximized/w530-maximized.config
@@ -20,7 +20,7 @@ CONFIG_LINUX_E1000E=y
 CONFIG_MOBILE_TETHERING=y
 
 CONFIG_CRYPTSETUP2=y
-CONFIG_FLASHROM=y
+CONFIG_FLASHPROG=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y
 CONFIG_KEXEC=y
@@ -65,7 +65,7 @@ export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOOT_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off"
 export CONFIG_BOARD_NAME="Thinkpad W530-maximized"
-export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
+export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
 
 #Include bits related to ivybridge ME blob download/neutering down to BUP+ROMP
 BOARD_TARGETS := xx30_me_blobs
diff --git a/boards/w541-maximized/w541-maximized.config b/boards/w541-maximized/w541-maximized.config
index 3bd82de15..881beae0f 100644
--- a/boards/w541-maximized/w541-maximized.config
+++ b/boards/w541-maximized/w541-maximized.config
@@ -8,7 +8,7 @@ export CONFIG_COREBOOT_VERSION=24.02.01
 export CONFIG_LINUX_VERSION=5.10.5
 
 CONFIG_CRYPTSETUP2=y
-CONFIG_FLASHROM=y
+CONFIG_FLASHPROG=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y
 CONFIG_KEXEC=y
@@ -38,7 +38,7 @@ export CONFIG_BOOTSCRIPT=/bin/gui-init
 export CONFIG_BOOT_REQ_HASH=n
 export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOARD_NAME="ThinkPad W541-maximized"
-export CONFIG_FLASHROM_OPTIONS="-p internal"
+export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
 
 # Make the Coreboot build depend on the following 3rd party blobs:
 $(build)/coreboot-$(CONFIG_COREBOOT_VERSION)/$(BOARD)/.build: \
diff --git a/boards/x220-hotp-maximized/x220-hotp-maximized.config b/boards/x220-hotp-maximized/x220-hotp-maximized.config
index 4ebbd7da6..33637c7d5 100644
--- a/boards/x220-hotp-maximized/x220-hotp-maximized.config
+++ b/boards/x220-hotp-maximized/x220-hotp-maximized.config
@@ -21,7 +21,7 @@ CONFIG_LINUX_E1000E=y
 CONFIG_MOBILE_TETHERING=y
 
 CONFIG_CRYPTSETUP2=y
-CONFIG_FLASHROM=y
+CONFIG_FLASHPROG=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y
 CONFIG_KEXEC=y
@@ -66,7 +66,7 @@ export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOOT_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off"
 export CONFIG_BOARD_NAME="ThinkPad X220-hotp-maximized"
-export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal:ich_spi_mode=hwseq"
+export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal:ich_spi_mode=hwseq"
 
 #Include bits related to sandybridge ME blob download/neutering down to BUP
 BOARD_TARGETS := xx20_me_blobs
diff --git a/boards/x220-maximized/x220-maximized.config b/boards/x220-maximized/x220-maximized.config
index 41d1abd58..c752635c7 100644
--- a/boards/x220-maximized/x220-maximized.config
+++ b/boards/x220-maximized/x220-maximized.config
@@ -21,7 +21,7 @@ CONFIG_LINUX_E1000E=y
 CONFIG_MOBILE_TETHERING=y
 
 CONFIG_CRYPTSETUP2=y
-CONFIG_FLASHROM=y
+CONFIG_FLASHPROG=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y
 CONFIG_KEXEC=y
@@ -65,7 +65,7 @@ export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOOT_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off"
 export CONFIG_BOARD_NAME="ThinkPad X220-maximized"
-export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal:ich_spi_mode=hwseq"
+export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal:ich_spi_mode=hwseq"
 
 #Include bits related to sandybridge ME blob download/neutering down to BUP
 BOARD_TARGETS += xx20_me_blobs
diff --git a/boards/x230-hotp-maximized-fhd_edp/x230-hotp-maximized-fhd_edp.config b/boards/x230-hotp-maximized-fhd_edp/x230-hotp-maximized-fhd_edp.config
index a5550d4dc..853118fbd 100644
--- a/boards/x230-hotp-maximized-fhd_edp/x230-hotp-maximized-fhd_edp.config
+++ b/boards/x230-hotp-maximized-fhd_edp/x230-hotp-maximized-fhd_edp.config
@@ -31,7 +31,7 @@ CONFIG_LINUX_E1000E=y
 CONFIG_MOBILE_TETHERING=y
 
 CONFIG_CRYPTSETUP2=y
-CONFIG_FLASHROM=y
+CONFIG_FLASHPROG=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y
 CONFIG_KBD=y
@@ -78,7 +78,7 @@ export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOOT_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off"
 export CONFIG_BOARD_NAME="Thinkpad X230-hotp-maximized-eDP"
-export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
+export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
 
 #Include bits related to ivybridge ME blob download/neutering down to BUP+ROMP
 BOARD_TARGETS := xx30_me_blobs
diff --git a/boards/x230-hotp-maximized/x230-hotp-maximized.config b/boards/x230-hotp-maximized/x230-hotp-maximized.config
index d40116507..50042591c 100644
--- a/boards/x230-hotp-maximized/x230-hotp-maximized.config
+++ b/boards/x230-hotp-maximized/x230-hotp-maximized.config
@@ -24,7 +24,7 @@ CONFIG_MOBILE_TETHERING=y
 
 #Modules packed into tools.cpio
 CONFIG_CRYPTSETUP2=y
-CONFIG_FLASHROM=y
+CONFIG_FLASHPROG=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y
 CONFIG_KEXEC=y
@@ -80,7 +80,7 @@ export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOOT_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off"
 export CONFIG_BOARD_NAME="Thinkpad X230-hotp-maximized"
-export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
+export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
 
 #Include bits related to ivybridge ME blob download/neutering down to BUP+ROMP
 BOARD_TARGETS := xx30_me_blobs
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 7e82616b2..74171f221 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
@@ -28,7 +28,7 @@ CONFIG_MOBILE_TETHERING=y
 export CONFIG_USB_KEYBOARD_REQUIRED=y
 
 CONFIG_CRYPTSETUP2=y
-CONFIG_FLASHROM=y
+CONFIG_FLASHPROG=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y
 CONFIG_KEXEC=y
@@ -74,7 +74,7 @@ export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOOT_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off"
 export CONFIG_BOARD_NAME="Thinkpad X230-hotp-maximized_usb-kb"
-export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
+export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
 
 #Include bits related to ivybridge ME blob download/neutering down to BUP+ROMP
 BOARD_TARGETS := xx30_me_blobs
diff --git a/boards/x230-maximized-fhd_edp/x230-maximized-fhd_edp.config b/boards/x230-maximized-fhd_edp/x230-maximized-fhd_edp.config
index 5a6bf840d..ce7a66e1b 100644
--- a/boards/x230-maximized-fhd_edp/x230-maximized-fhd_edp.config
+++ b/boards/x230-maximized-fhd_edp/x230-maximized-fhd_edp.config
@@ -31,7 +31,7 @@ CONFIG_LINUX_E1000E=y
 CONFIG_MOBILE_TETHERING=y
 
 CONFIG_CRYPTSETUP2=y
-CONFIG_FLASHROM=y
+CONFIG_FLASHPROG=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y
 CONFIG_KBD=y
@@ -77,7 +77,7 @@ export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOOT_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off"
 export CONFIG_BOARD_NAME="Thinkpad X230-maximized-eDP"
-export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
+export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
 
 #Include bits related to ivybridge ME blob download/neutering down to BUP+ROMP
 BOARD_TARGETS := xx30_me_blobs
diff --git a/boards/x230-maximized/x230-maximized.config b/boards/x230-maximized/x230-maximized.config
index 99b15b477..6c2706898 100644
--- a/boards/x230-maximized/x230-maximized.config
+++ b/boards/x230-maximized/x230-maximized.config
@@ -23,7 +23,7 @@ CONFIG_LINUX_E1000E=y
 CONFIG_MOBILE_TETHERING=y
 
 CONFIG_CRYPTSETUP2=y
-CONFIG_FLASHROM=y
+CONFIG_FLASHPROG=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y
 CONFIG_KEXEC=y
@@ -68,7 +68,7 @@ export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOOT_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off"
 export CONFIG_BOARD_NAME="Thinkpad X230-maximized"
-export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
+export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
 
 #Include bits related to ivybridge ME blob download/neutering down to BUP+ROMP
 BOARD_TARGETS := xx30_me_blobs
diff --git a/boards/z220-cmt-maximized/z220-cmt-maximized.config b/boards/z220-cmt-maximized/z220-cmt-maximized.config
index a0e679cdf..35f389015 100644
--- a/boards/z220-cmt-maximized/z220-cmt-maximized.config
+++ b/boards/z220-cmt-maximized/z220-cmt-maximized.config
@@ -29,7 +29,7 @@ export CONFIG_COREBOOT_VERSION=24.02.01
 export CONFIG_LINUX_VERSION=5.10.5
 
 CONFIG_CRYPTSETUP2=y
-CONFIG_FLASHROM=y
+CONFIG_FLASHPROG=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y
 CONFIG_KEXEC=y
@@ -60,7 +60,7 @@ export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOOT_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off"
 export CONFIG_BOARD_NAME="Hewlett-Packard Z220 Convertible Minitower"
-export CONFIG_FLASHROM_OPTIONS="-p internal"
+export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
 
 # Make the Coreboot build depend on the following 3rd party blobs:
 $(build)/coreboot-$(CONFIG_COREBOOT_VERSION)/$(BOARD)/.build: \
@@ -72,4 +72,4 @@ $(pwd)/blobs/z220/me.bin:
         
 $(pwd)/blobs/z220/ifd.bin:
 	COREBOOT_DIR="$(build)/$(coreboot_base_dir)" \
-		$(pwd)/blobs/z220/download_BIOS_clean.sh
\ No newline at end of file
+		$(pwd)/blobs/z220/download_BIOS_clean.sh
diff --git a/initrd/bin/flash.sh b/initrd/bin/flash.sh
index 845d46617..cd5b9a6e1 100755
--- a/initrd/bin/flash.sh
+++ b/initrd/bin/flash.sh
@@ -1,7 +1,5 @@
 #!/bin/ash
 #
-# based off of flashrom-x230
-#
 # NOTE: This script is used on legacy-flash boards and runs with busybox ash,
 # not bash
 set -e -o pipefail
@@ -12,26 +10,27 @@ echo
 
 TRACE "Under /bin/flash.sh"
 
-case "$CONFIG_FLASHROM_OPTIONS" in
-  -* )
-    echo "Board $CONFIG_BOARD detected, continuing..."
+case "$CONFIG_FLASH_OPTIONS" in
+  "" )
+    die "ERROR: No flash options have been configured!\n\nEach board requires specific CONFIG_FLASH_OPTIONS options configured. It's unsafe to flash without them.\n\nAborting."
   ;;
   * )
-    die "ERROR: No board has been configured!\n\nEach board requires specific flashrom options and it's unsafe to flash without them.\n\nAborting."
+    DEBUG "Flash options detected: $CONFIG_FLASH_OPTIONS"
+    echo "Board $CONFIG_BOARD detected with flash options configured. Continuing..."
   ;;
 esac
 
 flash_rom() {
   ROM=$1
   if [ "$READ" -eq 1 ]; then
-    flashrom $CONFIG_FLASHROM_OPTIONS -r "${ROM}" \
-    || die "Backup to $ROM failed"
+    $CONFIG_FLASH_OPTIONS -r "${ROM}" \
+    || recovery "Backup to $ROM failed"
   else
     cp "$ROM" /tmp/${CONFIG_BOARD}.rom
     sha256sum /tmp/${CONFIG_BOARD}.rom
     if [ "$CLEAN" -eq 0 ]; then
       preserve_rom /tmp/${CONFIG_BOARD}.rom \
-      || die "$ROM: Config preservation failed"
+      || recovery "$ROM: Config preservation failed"
     fi
     # persist serial number from CBFS
     if cbfs.sh -r serial_number > /tmp/serial 2>/dev/null; then
@@ -42,14 +41,14 @@ flash_rom() {
     # persist PCHSTRP9 from flash descriptor
     if [ "$CONFIG_BOARD" = "librem_l1um" ]; then
       echo "Persisting PCHSTRP9"
-      flashrom $CONFIG_FLASHROM_OPTIONS -r /tmp/ifd.bin --ifd -i fd >/dev/null 2>&1 \
+      $CONFIG_FLASH_OPTIONS -r /tmp/ifd.bin --ifd -i fd >/dev/null 2>&1 \
       || die "Failed to read flash descriptor"
       dd if=/tmp/ifd.bin bs=1 count=4 skip=292 of=/tmp/pchstrp9.bin >/dev/null 2>&1
       dd if=/tmp/pchstrp9.bin bs=1 count=4 seek=292 of=/tmp/${CONFIG_BOARD}.rom conv=notrunc >/dev/null 2>&1
     fi
 
     warn "Do not power off computer.  Updating firmware, this will take a few minutes"
-    flashrom $CONFIG_FLASHROM_OPTIONS -w /tmp/${CONFIG_BOARD}.rom 2>&1 \
+    $CONFIG_FLASH_OPTIONS -w /tmp/${CONFIG_BOARD}.rom 2>&1 \
       || recovery "$ROM: Flash failed"
   fi
 }
@@ -84,8 +83,8 @@ if [ "$READ" -eq 0 ] && [ "${ROM##*.}" = tgz ]; then
         fi
 
         echo "Reading current flash and building an update image"
-        flashrom $CONFIG_FLASHROM_OPTIONS -r /tmp/flash.sh.bak \
-            || die "Read of flash has failed"
+        $CONFIG_FLASH_OPTIONS -r /tmp/flash.sh.bak \
+            || recovery "Read of flash has failed"
 
         # ROM and bootblock already have ECC
         bootblock=$(echo /tmp/verified_rom/*.bootblock)
diff --git a/initrd/bin/flashrom-kgpe-d16-openbmc.sh b/initrd/bin/flashprog-kgpe-d16-openbmc.sh
similarity index 71%
rename from initrd/bin/flashrom-kgpe-d16-openbmc.sh
rename to initrd/bin/flashprog-kgpe-d16-openbmc.sh
index 63e83d468..adf356d86 100755
--- a/initrd/bin/flashrom-kgpe-d16-openbmc.sh
+++ b/initrd/bin/flashprog-kgpe-d16-openbmc.sh
@@ -11,7 +11,7 @@ fi
 cp "$ROM" /tmp/kgpe-d16-openbmc.rom
 sha256sum /tmp/kgpe-d16-openbmc.rom
 
-flashrom --programmer="ast1100:spibus=2,cpu=reset" -c "S25FL128P......0" -w /tmp/kgpe-d16-openbmc.rom \
+flashprog --programmer="ast1100:spibus=2,cpu=reset" -c "S25FL128P......0" -w /tmp/kgpe-d16-openbmc.rom \
 || die "$ROM: Flash failed"
 
 warn "Reboot and hopefully it works"
diff --git a/initrd/etc/ash_functions b/initrd/etc/ash_functions
index bf6c6307a..bf2e32896 100644
--- a/initrd/etc/ash_functions
+++ b/initrd/etc/ash_functions
@@ -5,9 +5,9 @@
 
 die() {
 	if [ "$CONFIG_DEBUG_OUTPUT" = "y" ];then
-		echo " !!! ERROR: $* !!!" | tee -a /tmp/debug.log /dev/kmsg > /dev/null;
+		echo -e " !!! ERROR: $* !!!" | tee -a /tmp/debug.log /dev/kmsg > /dev/null;
 	else
-		echo >&2 "!!! ERROR: $* !!!";
+		echo -e >&2 "!!! ERROR: $* !!!";
 	fi
 	sleep 2;
 	exit 1;
@@ -15,9 +15,9 @@ die() {
 
 warn() {
 	if [ "$CONFIG_DEBUG_OUTPUT" = "y" ];then
-		echo " *** WARNING: $* ***" | tee -a /tmp/debug.log /dev/kmsg > /dev/null;
+		echo -e " *** WARNING: $* ***" | tee -a /tmp/debug.log /dev/kmsg > /dev/null;
 	else
-		echo >&2 " *** WARNING: $* ***";
+		echo -e >&2 " *** WARNING: $* ***";
 	fi
 	sleep 1;
 }
diff --git a/modules/flashprog b/modules/flashprog
new file mode 100644
index 000000000..1e257b04f
--- /dev/null
+++ b/modules/flashprog
@@ -0,0 +1,46 @@
+modules-$(CONFIG_FLASHPROG) += flashprog
+
+flashprog_depends := pciutils $(musl_dep)
+
+flashprog_version := 9dc6d843b0678001c9baf0e8602ecb25b16329d2
+flashprog_dir := flashprog-$(flashprog_version)
+flashprog_tar := $(flashprog_dir).tar.gz
+flashprog_url := https://github.com/SourceArcade/flashprog/archive/$(flashprog_version).tar.gz
+flashprog_hash := fa4ddf3b60314994a37e4599122ae4c7f42135c13c782e580bc580d715cfa2fc
+
+# Default options for flashprog
+flashprog_cfg := \
+	WARNERROR=no \
+	CONFIG_NOTHING=yes \
+	CONFIG_INTERNAL=yes \
+	CONFIG_INTERNAL_X86=yes \
+
+ifeq "$(CONFIG_TARGET_ARCH)" "ppc64"
+flashprog_cfg := \
+	WARNERROR=no \
+	CONFIG_NOTHING=yes \
+	CONFIG_LINUX_MTD=yes
+endif
+
+#Only enable AST1100 if requested per board configs
+ifeq "$(CONFIG_FLASHPROG_AST1100)" "y"
+flashprog_cfg += CONFIG_AST1100=yes
+endif
+
+flashprog_target := \
+	$(MAKE_JOBS) \
+	CFLAGS="-Os -I$(INSTALL)/include/pci" \
+	DESTDIR="$(INSTALL)" \
+	INSTALL="$(INSTALL)" \
+	LDFLAGS="-L$(INSTALL)/lib" \
+	PREFIX="$(INSTALL)" \
+	$(CROSS_TOOLS) \
+	$(flashprog_cfg) \
+	flashprog
+
+flashprog_output := \
+	flashprog
+
+flashprog_libraries := \
+
+flashprog_configure := 
diff --git a/unmaintained_boards/UNMAINTAINED_p8z77-m_pro-tpm1-maximized/UNMAINTAINED_p8z77-m_pro-tpm1-maximized.config b/unmaintained_boards/UNMAINTAINED_p8z77-m_pro-tpm1-maximized/UNMAINTAINED_p8z77-m_pro-tpm1-maximized.config
index c4a0487ff..6a671c7db 100644
--- a/unmaintained_boards/UNMAINTAINED_p8z77-m_pro-tpm1-maximized/UNMAINTAINED_p8z77-m_pro-tpm1-maximized.config
+++ b/unmaintained_boards/UNMAINTAINED_p8z77-m_pro-tpm1-maximized/UNMAINTAINED_p8z77-m_pro-tpm1-maximized.config
@@ -43,7 +43,7 @@ export CONFIG_COREBOOT_VERSION=4.22.01
 export CONFIG_LINUX_VERSION=5.10.5
 
 CONFIG_CRYPTSETUP2=y
-CONFIG_FLASHROM=y
+CONFIG_FLASHPROG=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y
 CONFIG_KEXEC=y
@@ -74,7 +74,7 @@ export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOOT_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off"
 export CONFIG_BOARD_NAME="P8Z77-M PRO"
-export CONFIG_FLASHROM_OPTIONS="-p internal"
+export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
 #Set this option to zero out the VSCC table https://github.com/osresearch/heads/pull/1358#discussion_r1153251399 
 export CONFIG_ZERO_IFD_VSCC=y
 
diff --git a/unmaintained_boards/UNMAINTAINED_qemu-linuxboot/UNMAINTAINED_qemu-linuxboot.config b/unmaintained_boards/UNMAINTAINED_qemu-linuxboot/UNMAINTAINED_qemu-linuxboot.config
index ae7b034af..32beb6741 100644
--- a/unmaintained_boards/UNMAINTAINED_qemu-linuxboot/UNMAINTAINED_qemu-linuxboot.config
+++ b/unmaintained_boards/UNMAINTAINED_qemu-linuxboot/UNMAINTAINED_qemu-linuxboot.config
@@ -18,7 +18,7 @@ CONFIG_QRENCODE=y
 CONFIG_TPMTOTP=y
 endif
 
-CONFIG_FLASHROM=y
+CONFIG_FLASHPROG=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y
 CONFIG_KEXEC=y
diff --git a/unmaintained_boards/UNMAINTAINED_t420/UNMAINTAINED_t420.config b/unmaintained_boards/UNMAINTAINED_t420/UNMAINTAINED_t420.config
index 3aab4db9a..4b15eb2de 100644
--- a/unmaintained_boards/UNMAINTAINED_t420/UNMAINTAINED_t420.config
+++ b/unmaintained_boards/UNMAINTAINED_t420/UNMAINTAINED_t420.config
@@ -7,7 +7,7 @@ CONFIG_COREBOOT_CONFIG=config/coreboot-t420.config
 CONFIG_LINUX_CONFIG=config/linux-x230-legacy.config
 
 CONFIG_CRYPTSETUP2=y
-CONFIG_FLASHROM=y
+CONFIG_FLASHPROG=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y
 CONFIG_KEXEC=y
@@ -33,4 +33,4 @@ export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOOT_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off"
 export CONFIG_BOARD_NAME="ThinkPad T420"
-export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal:ich_spi_mode=hwseq --ifd --image bios"
+export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal:ich_spi_mode=hwseq --ifd --image bios"
diff --git a/unmaintained_boards/UNMAINTAINED_t430-hotp-legacy/UNMAINTAINED_t430-hotp-legacy.config b/unmaintained_boards/UNMAINTAINED_t430-hotp-legacy/UNMAINTAINED_t430-hotp-legacy.config
index 6abe0e8a4..36d3511d9 100644
--- a/unmaintained_boards/UNMAINTAINED_t430-hotp-legacy/UNMAINTAINED_t430-hotp-legacy.config
+++ b/unmaintained_boards/UNMAINTAINED_t430-hotp-legacy/UNMAINTAINED_t430-hotp-legacy.config
@@ -19,7 +19,7 @@ CONFIG_LINUX_USB=y
 CONFIG_LINUX_E1000E=n
 
 CONFIG_CRYPTSETUP2=y
-CONFIG_FLASHROM=y
+CONFIG_FLASHPROG=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y
 CONFIG_KEXEC=y
@@ -62,7 +62,7 @@ export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOOT_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off"
 export CONFIG_BOARD_NAME="Thinkpad T430-hotp-legacy"
-export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal --ifd --image bios"
+export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal --ifd --image bios"
 
 # This board has two SPI flash chips, an 8 MB that holds the IFD,
 # the ME image and part of the coreboot image, and a 4 MB one that
diff --git a/unmaintained_boards/UNMAINTAINED_t430-legacy-flash/UNMAINTAINED_t430-legacy-flash.config b/unmaintained_boards/UNMAINTAINED_t430-legacy-flash/UNMAINTAINED_t430-legacy-flash.config
index d99b7ef17..0f531aee0 100644
--- a/unmaintained_boards/UNMAINTAINED_t430-legacy-flash/UNMAINTAINED_t430-legacy-flash.config
+++ b/unmaintained_boards/UNMAINTAINED_t430-legacy-flash/UNMAINTAINED_t430-legacy-flash.config
@@ -12,7 +12,7 @@ CONFIG_LINUX_CONFIG=config/linux-x230-flash.config
 
 #Add bare minimal tools for flashing boards
 CONFIG_BASH=n
-CONFIG_FLASHROM=y
+CONFIG_FLASHPROG=y
 CONFIG_ZSTD=n
 #CONFIG_GPG=y
 #CONFIG_FLASHTOOLS=y
@@ -28,7 +28,7 @@ CONFIG_LINUX_USB=y
 
 export CONFIG_BOOTSCRIPT=/bin/xx30-flash.init
 export CONFIG_BOARD_NAME="ThinkPad T430-legacy-flash"
-export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal --ifd --image bios"
+export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal --ifd --image bios"
 
 CONFIG_LEGACY_FLASH=y
 
diff --git a/unmaintained_boards/UNMAINTAINED_t430-legacy/UNMAINTAINED_t430-legacy.config b/unmaintained_boards/UNMAINTAINED_t430-legacy/UNMAINTAINED_t430-legacy.config
index 28d5c9dda..50c0816e7 100644
--- a/unmaintained_boards/UNMAINTAINED_t430-legacy/UNMAINTAINED_t430-legacy.config
+++ b/unmaintained_boards/UNMAINTAINED_t430-legacy/UNMAINTAINED_t430-legacy.config
@@ -16,7 +16,7 @@ CONFIG_LINUX_USB=y
 CONFIG_LINUX_E1000E=n
 
 CONFIG_CRYPTSETUP2=y
-CONFIG_FLASHROM=y
+CONFIG_FLASHPROG=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y
 CONFIG_KEXEC=y
@@ -56,7 +56,7 @@ export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOOT_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off"
 export CONFIG_BOARD_NAME="Thinkpad T430-legacy"
-export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal --ifd --image bios"
+export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal --ifd --image bios"
 
 # This board has two SPI flash chips, an 8 MB that holds the IFD,
 # the ME image and part of the coreboot image, and a 4 MB one that
diff --git a/unmaintained_boards/UNMAINTAINED_t520-hotp-maximized/UNMAINTAINED_t520-hotp-maximized.config b/unmaintained_boards/UNMAINTAINED_t520-hotp-maximized/UNMAINTAINED_t520-hotp-maximized.config
index 72898cad4..9159ef20b 100644
--- a/unmaintained_boards/UNMAINTAINED_t520-hotp-maximized/UNMAINTAINED_t520-hotp-maximized.config
+++ b/unmaintained_boards/UNMAINTAINED_t520-hotp-maximized/UNMAINTAINED_t520-hotp-maximized.config
@@ -17,7 +17,7 @@ CONFIG_LINUX_E1000E=y
 CONFIG_MOBILE_TETHERING=y
 
 CONFIG_CRYPTSETUP=y
-CONFIG_FLASHROM=y
+CONFIG_FLASHPROG=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y
 CONFIG_KEXEC=y
@@ -62,7 +62,7 @@ export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOOT_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off"
 export CONFIG_BOARD_NAME="ThinkPad T520-hotp-maximized"
-export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal:ich_spi_mode=hwseq"
+export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal:ich_spi_mode=hwseq"
 
 #Include bits related to sandybridge ME blob download/neutering down to BUP
 BOARD_TARGETS := xx20_me_blobs
diff --git a/unmaintained_boards/UNMAINTAINED_t520-maximized/UNMAINTAINED_t520-maximized.config b/unmaintained_boards/UNMAINTAINED_t520-maximized/UNMAINTAINED_t520-maximized.config
index 96dd85d76..bbd69a933 100644
--- a/unmaintained_boards/UNMAINTAINED_t520-maximized/UNMAINTAINED_t520-maximized.config
+++ b/unmaintained_boards/UNMAINTAINED_t520-maximized/UNMAINTAINED_t520-maximized.config
@@ -17,7 +17,7 @@ CONFIG_LINUX_E1000E=y
 CONFIG_MOBILE_TETHERING=y
 
 CONFIG_CRYPTSETUP=y
-CONFIG_FLASHROM=y
+CONFIG_FLASHPROG=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y
 CONFIG_KEXEC=y
@@ -61,7 +61,7 @@ export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOOT_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off"
 export CONFIG_BOARD_NAME="ThinkPad T520-maximized"
-export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal:ich_spi_mode=hwseq"
+export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal:ich_spi_mode=hwseq"
 
 #Include bits related to sandybridge ME blob download/neutering down to BUP
 BOARD_TARGETS := xx20_me_blobs
diff --git a/unmaintained_boards/UNMAINTAINED_t530-dgpu-hotp-maximized/UNMAINTAINED_t530-dgpu-hotp-maximized.config b/unmaintained_boards/UNMAINTAINED_t530-dgpu-hotp-maximized/UNMAINTAINED_t530-dgpu-hotp-maximized.config
index 43bb07e5a..248f97b41 100644
--- a/unmaintained_boards/UNMAINTAINED_t530-dgpu-hotp-maximized/UNMAINTAINED_t530-dgpu-hotp-maximized.config
+++ b/unmaintained_boards/UNMAINTAINED_t530-dgpu-hotp-maximized/UNMAINTAINED_t530-dgpu-hotp-maximized.config
@@ -20,7 +20,7 @@ CONFIG_LINUX_E1000E=y
 CONFIG_MOBILE_TETHERING=y
 
 CONFIG_CRYPTSETUP2=y
-CONFIG_FLASHROM=y
+CONFIG_FLASHPROG=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y
 CONFIG_KEXEC=y
@@ -66,7 +66,7 @@ export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOOT_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off"
 export CONFIG_BOARD_NAME="Thinkpad T530-dgpu-hotp-maximized"
-export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
+export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
 
 # Make the Coreboot build depend on the following 3rd party blobs:
 $(build)/coreboot-$(CONFIG_COREBOOT_VERSION)/$(BOARD)/.build: \
diff --git a/unmaintained_boards/UNMAINTAINED_t530-dgpu-maximized/UNMAINTAINED_t530-dgpu-maximized.config b/unmaintained_boards/UNMAINTAINED_t530-dgpu-maximized/UNMAINTAINED_t530-dgpu-maximized.config
index 020431681..8c4b796af 100644
--- a/unmaintained_boards/UNMAINTAINED_t530-dgpu-maximized/UNMAINTAINED_t530-dgpu-maximized.config
+++ b/unmaintained_boards/UNMAINTAINED_t530-dgpu-maximized/UNMAINTAINED_t530-dgpu-maximized.config
@@ -20,7 +20,7 @@ CONFIG_LINUX_E1000E=y
 CONFIG_MOBILE_TETHERING=y
 
 CONFIG_CRYPTSETUP2=y
-CONFIG_FLASHROM=y
+CONFIG_FLASHPROG=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y
 CONFIG_KEXEC=y
@@ -65,7 +65,7 @@ export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOOT_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off"
 export CONFIG_BOARD_NAME="Thinkpad T530-dgpu-maximized"
-export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
+export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
 
 # Make the Coreboot build depend on the following 3rd party blobs:
 $(build)/coreboot-$(CONFIG_COREBOOT_VERSION)/$(BOARD)/.build: \
diff --git a/unmaintained_boards/UNMAINTAINED_w530-dgpu-K1000m-hotp-maximized/UNMAINTAINED_w530-dgpu-K1000m-hotp-maximized.config b/unmaintained_boards/UNMAINTAINED_w530-dgpu-K1000m-hotp-maximized/UNMAINTAINED_w530-dgpu-K1000m-hotp-maximized.config
index 15cb36a7e..45076c763 100644
--- a/unmaintained_boards/UNMAINTAINED_w530-dgpu-K1000m-hotp-maximized/UNMAINTAINED_w530-dgpu-K1000m-hotp-maximized.config
+++ b/unmaintained_boards/UNMAINTAINED_w530-dgpu-K1000m-hotp-maximized/UNMAINTAINED_w530-dgpu-K1000m-hotp-maximized.config
@@ -20,7 +20,7 @@ CONFIG_LINUX_E1000E=y
 CONFIG_MOBILE_TETHERING=y
 
 CONFIG_CRYPTSETUP2=y
-CONFIG_FLASHROM=y
+CONFIG_FLASHPROG=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y
 CONFIG_KEXEC=y
@@ -66,7 +66,7 @@ export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOOT_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off"
 export CONFIG_BOARD_NAME="Thinkpad W530-dgpu-K1000m-hotp-maximized"
-export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
+export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
 
 # xx30-*-maximized boards require of you initially call one of the
 #  following to have gbe.bin ifd.bin and me.bin
diff --git a/unmaintained_boards/UNMAINTAINED_w530-dgpu-K1000m-maximized/UNMAINTAINED_w530-dgpu-K1000m-maximized.config b/unmaintained_boards/UNMAINTAINED_w530-dgpu-K1000m-maximized/UNMAINTAINED_w530-dgpu-K1000m-maximized.config
index 7a1107914..ed4fa8b50 100644
--- a/unmaintained_boards/UNMAINTAINED_w530-dgpu-K1000m-maximized/UNMAINTAINED_w530-dgpu-K1000m-maximized.config
+++ b/unmaintained_boards/UNMAINTAINED_w530-dgpu-K1000m-maximized/UNMAINTAINED_w530-dgpu-K1000m-maximized.config
@@ -20,7 +20,7 @@ CONFIG_LINUX_E1000E=y
 CONFIG_MOBILE_TETHERING=y
 
 CONFIG_CRYPTSETUP2=y
-CONFIG_FLASHROM=y
+CONFIG_FLASHPROG=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y
 CONFIG_KEXEC=y
@@ -65,7 +65,7 @@ export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOOT_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off"
 export CONFIG_BOARD_NAME="Thinkpad W530-dgpu-K1000m-maximized"
-export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
+export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
 
 # xx30-*-maximized boards require of you initially call one of the
 #  following to have gbe.bin ifd.bin and me.bin
diff --git a/unmaintained_boards/UNMAINTAINED_w530-dgpu-K2000m-hotp-maximized/UNMAINTAINED_w530-dgpu-K2000m-hotp-maximized.config b/unmaintained_boards/UNMAINTAINED_w530-dgpu-K2000m-hotp-maximized/UNMAINTAINED_w530-dgpu-K2000m-hotp-maximized.config
index 15794695e..7192d2853 100644
--- a/unmaintained_boards/UNMAINTAINED_w530-dgpu-K2000m-hotp-maximized/UNMAINTAINED_w530-dgpu-K2000m-hotp-maximized.config
+++ b/unmaintained_boards/UNMAINTAINED_w530-dgpu-K2000m-hotp-maximized/UNMAINTAINED_w530-dgpu-K2000m-hotp-maximized.config
@@ -20,7 +20,7 @@ CONFIG_LINUX_E1000E=y
 CONFIG_MOBILE_TETHERING=y
 
 CONFIG_CRYPTSETUP2=y
-CONFIG_FLASHROM=y
+CONFIG_FLASHPROG=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y
 CONFIG_KEXEC=y
@@ -66,7 +66,7 @@ export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOOT_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off"
 export CONFIG_BOARD_NAME="Thinkpad W530-dgpu-K2000m-hotp-maximized"
-export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
+export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
 
 # xx30-*-maximized boards require of you initially call one of the
 #  following to have gbe.bin ifd.bin and me.bin
diff --git a/unmaintained_boards/UNMAINTAINED_w530-dgpu-K2000m-maximized/UNMAINTAINED_w530-dgpu-K2000m-maximized.config b/unmaintained_boards/UNMAINTAINED_w530-dgpu-K2000m-maximized/UNMAINTAINED_w530-dgpu-K2000m-maximized.config
index 9ad244a3f..71c0a212d 100644
--- a/unmaintained_boards/UNMAINTAINED_w530-dgpu-K2000m-maximized/UNMAINTAINED_w530-dgpu-K2000m-maximized.config
+++ b/unmaintained_boards/UNMAINTAINED_w530-dgpu-K2000m-maximized/UNMAINTAINED_w530-dgpu-K2000m-maximized.config
@@ -20,7 +20,7 @@ CONFIG_LINUX_E1000E=y
 CONFIG_MOBILE_TETHERING=y
 
 CONFIG_CRYPTSETUP2=y
-CONFIG_FLASHROM=y
+CONFIG_FLASHPROG=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y
 CONFIG_KEXEC=y
@@ -65,7 +65,7 @@ export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOOT_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off"
 export CONFIG_BOARD_NAME="Thinkpad W530-dgpu-K2000m-maximized"
-export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
+export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
 
 # xx30-*-maximized boards require of you initially call one of the
 #  following to have gbe.bin ifd.bin and me.bin
diff --git a/unmaintained_boards/UNMAINTAINED_x220/UNMAINTAINED_x220.config b/unmaintained_boards/UNMAINTAINED_x220/UNMAINTAINED_x220.config
index bed15b495..75b1369dc 100644
--- a/unmaintained_boards/UNMAINTAINED_x220/UNMAINTAINED_x220.config
+++ b/unmaintained_boards/UNMAINTAINED_x220/UNMAINTAINED_x220.config
@@ -11,7 +11,7 @@ CONFIG_LINUX_USB=y
 CONFIG_LINUX_E1000E=y
 
 CONFIG_CRYPTSETUP2=y
-CONFIG_FLASHROM=y
+CONFIG_FLASHPROG=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y
 CONFIG_KEXEC=y
@@ -56,4 +56,4 @@ export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOOT_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off"
 export CONFIG_BOARD_NAME="ThinkPad X220"
-export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal:ich_spi_mode=hwseq --ifd --image bios"
+export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal:ich_spi_mode=hwseq --ifd --image bios"
diff --git a/boards/x230-hotp-legacy/x230-hotp-legacy.config b/unmaintained_boards/UNMAINTAINED_x230-hotp-legacy/UNMAINTAINED_x230-hotp-legacy.config
similarity index 94%
rename from boards/x230-hotp-legacy/x230-hotp-legacy.config
rename to unmaintained_boards/UNMAINTAINED_x230-hotp-legacy/UNMAINTAINED_x230-hotp-legacy.config
index 73e9ef076..1d6233d72 100644
--- a/boards/x230-hotp-legacy/x230-hotp-legacy.config
+++ b/unmaintained_boards/UNMAINTAINED_x230-hotp-legacy/UNMAINTAINED_x230-hotp-legacy.config
@@ -19,7 +19,7 @@ CONFIG_LINUX_USB=y
 CONFIG_LINUX_E1000E=n
 
 CONFIG_CRYPTSETUP2=y
-CONFIG_FLASHROM=y
+CONFIG_FLASHPROG=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y
 CONFIG_KEXEC=y
@@ -62,7 +62,7 @@ export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOOT_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off"
 export CONFIG_BOARD_NAME="Thinkpad X230-hotp-legacy"
-export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal --ifd --image bios"
+export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal --ifd --image bios"
 
 # This board has two SPI flash chips, an 8 MB that holds the IFD,
 # the ME image and part of the coreboot image, and a 4 MB one that
diff --git a/boards/x230-legacy-flash/x230-legacy-flash.config b/unmaintained_boards/UNMAINTAINED_x230-legacy-flash/UNMAINTAINED_x230-legacy-flash.config
similarity index 82%
rename from boards/x230-legacy-flash/x230-legacy-flash.config
rename to unmaintained_boards/UNMAINTAINED_x230-legacy-flash/UNMAINTAINED_x230-legacy-flash.config
index 5122468c4..ed0e79908 100644
--- a/boards/x230-legacy-flash/x230-legacy-flash.config
+++ b/unmaintained_boards/UNMAINTAINED_x230-legacy-flash/UNMAINTAINED_x230-legacy-flash.config
@@ -7,12 +7,12 @@ export CONFIG_COREBOOT=y
 export CONFIG_COREBOOT_VERSION=24.02.01
 export CONFIG_LINUX_VERSION=5.10.5
 
-CONFIG_COREBOOT_CONFIG=config/coreboot-x230-legacy-flash.config
+CONFIG_COREBOOT_CONFIG=config/coreboot-UNMAINTAINED_x230-legacy-flash.config
 CONFIG_LINUX_CONFIG=config/linux-x230-flash.config
 
 #Add bare minimal tools for flashing boards
 CONFIG_BASH=n
-CONFIG_FLASHROM=y
+CONFIG_FLASHPROG=y
 CONFIG_ZSTD=n
 #CONFIG_GPG=y
 #CONFIG_FLASHTOOLS=y
@@ -29,7 +29,7 @@ CONFIG_LINUX_USB=y
 
 export CONFIG_BOOTSCRIPT=/bin/xx30-flash.init
 export CONFIG_BOARD_NAME="ThinkPad X230-legacy-flash"
-export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal --ifd --image bios"
+export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal --ifd --image bios"
 
 CONFIG_LEGACY_FLASH=y
 
diff --git a/boards/x230-legacy/x230-legacy.config b/unmaintained_boards/UNMAINTAINED_x230-legacy/UNMAINTAINED_x230-legacy.config
similarity index 87%
rename from boards/x230-legacy/x230-legacy.config
rename to unmaintained_boards/UNMAINTAINED_x230-legacy/UNMAINTAINED_x230-legacy.config
index bda3f498c..bdd821218 100644
--- a/boards/x230-legacy/x230-legacy.config
+++ b/unmaintained_boards/UNMAINTAINED_x230-legacy/UNMAINTAINED_x230-legacy.config
@@ -7,15 +7,15 @@ export CONFIG_COREBOOT=y
 export CONFIG_COREBOOT_VERSION=24.02.01
 export CONFIG_LINUX_VERSION=5.10.5
 
-CONFIG_COREBOOT_CONFIG=config/coreboot-x230-legacy.config
-CONFIG_LINUX_CONFIG=config/linux-x230-legacy.config
+CONFIG_COREBOOT_CONFIG=config/coreboot-UNMAINTAINED_x230-legacy.config
+CONFIG_LINUX_CONFIG=config/linux-UNMAINTAINED_x230-legacy.config
 
 #Additional hardware support
 CONFIG_LINUX_USB=y
 CONFIG_LINUX_E1000E=n
 
 CONFIG_CRYPTSETUP2=y
-CONFIG_FLASHROM=y
+CONFIG_FLASHPROG=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y
 CONFIG_KEXEC=y
@@ -55,7 +55,7 @@ export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOOT_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off"
 export CONFIG_BOARD_NAME="Thinkpad X230-legacy"
-export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal --ifd --image bios"
+export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal --ifd --image bios"
 
 # This board has two SPI flash chips, an 8 MB that holds the IFD,
 # the ME image and part of the coreboot image, and a 4 MB one that
diff --git a/unmaintained_boards/UNTESTED_leopard/UNTESTED_leopard.config b/unmaintained_boards/UNTESTED_leopard/UNTESTED_leopard.config
index d121609d8..8d874d736 100644
--- a/unmaintained_boards/UNTESTED_leopard/UNTESTED_leopard.config
+++ b/unmaintained_boards/UNTESTED_leopard/UNTESTED_leopard.config
@@ -15,7 +15,7 @@ CONFIG_MUSL=n
 else
 # These don't fit if u-root is turned on
 #CONFIG_CRYPTSETUP=y
-#CONFIG_FLASHROM=y
+#CONFIG_FLASHPROG=y
 CONFIG_FLASHTOOLS=y
 #CONFIG_GPG=y
 CONFIG_KEXEC=y
diff --git a/unmaintained_boards/UNTESTED_r630/UNTESTED_r630.config b/unmaintained_boards/UNTESTED_r630/UNTESTED_r630.config
index bd98df5ee..14d6abb67 100644
--- a/unmaintained_boards/UNTESTED_r630/UNTESTED_r630.config
+++ b/unmaintained_boards/UNTESTED_r630/UNTESTED_r630.config
@@ -8,7 +8,7 @@ CONFIG_LINUX_CONFIG=config/linux-linuxboot.config
 export CONFIG_LINUX_VERSION=4.14.62
 
 #CONFIG_CRYPTSETUP=y
-CONFIG_FLASHROM=y
+CONFIG_FLASHPROG=y
 #CONFIG_GPG=y
 CONFIG_KEXEC=y
 CONFIG_UTIL_LINUX=y
diff --git a/unmaintained_boards/UNTESTED_s2600wf/UNTESTED_s2600wf.config b/unmaintained_boards/UNTESTED_s2600wf/UNTESTED_s2600wf.config
index e5af0f07f..2a0148d73 100644
--- a/unmaintained_boards/UNTESTED_s2600wf/UNTESTED_s2600wf.config
+++ b/unmaintained_boards/UNTESTED_s2600wf/UNTESTED_s2600wf.config
@@ -16,7 +16,7 @@ CONFIG_LINUX_CONFIG=config/linux-linuxboot.config
 export CONFIG_LINUX_VERSION=4.14.62
 
 #CONFIG_CRYPTSETUP=y
-#CONFIG_FLASHROM=y
+#CONFIG_FLASHPROG=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG=y
 CONFIG_KEXEC=y
diff --git a/unmaintained_boards/UNTESTED_tioga/UNTESTED_tioga.config b/unmaintained_boards/UNTESTED_tioga/UNTESTED_tioga.config
index 73d475832..109c02fc5 100644
--- a/unmaintained_boards/UNTESTED_tioga/UNTESTED_tioga.config
+++ b/unmaintained_boards/UNTESTED_tioga/UNTESTED_tioga.config
@@ -17,7 +17,7 @@ CONFIG_MUSL=n
 else
 # These don't fit if u-root is turned on
 #CONFIG_CRYPTSETUP=y
-#CONFIG_FLASHROM=y
+#CONFIG_FLASHPROG=y
 CONFIG_FLASHTOOLS=y
 #CONFIG_GPG=y
 CONFIG_KEXEC=y
diff --git a/unmaintained_boards/UNTESTED_winterfell/UNTESTED_winterfell.config b/unmaintained_boards/UNTESTED_winterfell/UNTESTED_winterfell.config
index 27db8c52b..d9cae6534 100644
--- a/unmaintained_boards/UNTESTED_winterfell/UNTESTED_winterfell.config
+++ b/unmaintained_boards/UNTESTED_winterfell/UNTESTED_winterfell.config
@@ -17,7 +17,7 @@ CONFIG_MUSL=n
 else
 # These don't fit if u-root is turned on
 #CONFIG_CRYPTSETUP=y
-#CONFIG_FLASHROM=y
+#CONFIG_FLASHPROG=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG=y
 CONFIG_KEXEC=y