diff --git a/Makefile b/Makefile
index c952ab00..616a2570 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
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 43dbe09c..77ffbbb5 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,8 @@ CONFIG_BUSYBOX=n
 else
 #Modules packed into tools.cpio
 CONFIG_CRYPTSETUP2=y
-CONFIG_FLASHROM=y
+#CONFIG_FLASHROM=y
+CONFIG_FLASHPROG=y
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y
 CONFIG_KEXEC=y
diff --git a/modules/flashprog b/modules/flashprog
new file mode 100644
index 00000000..11ac2271
--- /dev/null
+++ b/modules/flashprog
@@ -0,0 +1,48 @@
+modules-$(CONFIG_FLASHPROG) += flashprog
+
+flashprog_depends := pciutils $(musl_dep)
+
+flashprog_change := 72991
+flashprog_revision := 5
+flashprog_version := $(flashprog_change)_$(flashprog_revision)
+flashprog_dir := flashprog-$(flashprog_version)
+flashprog_tar := $(flashprog_dir).tar.gz
+flashprog_url := https://review.sourcearcade.org/changes/flashprog~$(flashprog_change)/revisions/$(flashprog_revision)/archive?format=tgz
+flashprog_hash := 8e8e6d901d3bc37b80db1f10dd21b9490709bdb54a0ca06892f8922a284f2ed9
+
+# 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 :=