flash.sh: FLASHROM_OPTIONS->FLASH_OPTIONS: require FLASH_OPTIONS to s…

…pecify flash program in board configs - boards: switch flashrom->flashprog, FLASH_OPTIONS: flashprog memory --progress --programmer internal TODO: check, Might break: - xx20 : x220/t420/t520: used hwseq: verify compat - legacy : not sure --ifd bios are support: verify compat (and drop, future PR drop legacy boards anyway...) - talos: linux_mtd is used: verify compat Tested: - x230 works with awesome progress bar on read, erase and write. Signed-off-by: Thierry Laurion <[email protected]>
linuxboot · Sep 1, 2024 · c1f0fbb · c1f0fbb
1 parent 91cbc66
commit c1f0fbb
Show file tree

Hide file tree

Showing 68 changed files with 137 additions and 137 deletions.
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
@@ -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
@@ -73,5 +73,5 @@ export CONFIG_BOOT_KERNEL_REMOVE="plymouth.ignore-serial-consoles"
 export CONFIG_BOOT_DEV="/dev/sda1"
 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 memory --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
@@ -23,7 +23,7 @@ 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
 CONFIG_FLASHTOOLS=y
 CONFIG_GPG2=y
 CONFIG_KEXEC=y
@@ -60,5 +60,5 @@ export CONFIG_BOOT_DEV="/dev/sda1"
 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 memory --progress --programmer internal"
 #export CONFIG_BOOT_STATIC_IP=192.168.1.2
diff --git a/...D_kgpe-d16_workstation-usb_keyboard/UNMAINTAINED_kgpe-d16_workstation-usb_keyboard.config b/...D_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
@@ -68,4 +68,4 @@ export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOOT_DEV="/dev/sda1"
 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 memory --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
@@ -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
@@ -69,4 +69,4 @@ export CONFIG_BOOT_REQ_ROLLBACK=n
 export CONFIG_BOOT_DEV="/dev/sda1"
 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 memory --progress --programmer internal"
diff --git 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
@@ -37,7 +37,7 @@ export CONFIG_BOOT_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE=""
 export CONFIG_BOOT_DEV="/dev/nvme0n1p1"
 export CONFIG_BOARD_NAME="Librem 11"
-export CONFIG_FLASHROM_OPTIONS="-p internal"
+export CONFIG_FLASH_OPTIONS="flashprog memory --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
@@ -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
@@ -37,7 +37,7 @@ export CONFIG_BOOT_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE=""
 export CONFIG_BOOT_DEV="/dev/nvme0n1p1"
 export CONFIG_BOARD_NAME="Librem 13 v2/v3"
-export CONFIG_FLASHROM_OPTIONS="-p internal"
+export CONFIG_FLASH_OPTIONS="flashprog memory --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
@@ -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
@@ -37,7 +37,7 @@ export CONFIG_BOOT_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE=""
 export CONFIG_BOOT_DEV="/dev/nvme0n1p1"
 export CONFIG_BOARD_NAME="Librem 13 v4"
-export CONFIG_FLASHROM_OPTIONS="-p internal"
+export CONFIG_FLASH_OPTIONS="flashprog memory --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
@@ -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_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE=""
 export CONFIG_BOOT_DEV="/dev/nvme0n1p1"
 export CONFIG_BOARD_NAME="Librem 14"
-export CONFIG_FLASHROM_OPTIONS="-p internal"
+export CONFIG_FLASH_OPTIONS="flashprog memory --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
@@ -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
@@ -37,7 +37,7 @@ export CONFIG_BOOT_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE=""
 export CONFIG_BOOT_DEV="/dev/nvme0n1p1"
 export CONFIG_BOARD_NAME="Librem 15 v3"
-export CONFIG_FLASHROM_OPTIONS="-p internal"
+export CONFIG_FLASH_OPTIONS="flashprog memory --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
@@ -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
@@ -38,7 +38,7 @@ export CONFIG_BOOT_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE=""
 export CONFIG_BOOT_DEV="/dev/nvme0n1p1"
 export CONFIG_BOARD_NAME="Librem 15 v4"
-export CONFIG_FLASHROM_OPTIONS="-p internal"
+export CONFIG_FLASH_OPTIONS="flashprog memory --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
@@ -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
@@ -37,7 +37,7 @@ export CONFIG_BOOT_KERNEL_REMOVE="plymouth.ignore-serial-consoles"
 export CONFIG_BOOT_DEV="/dev/nvme0n1p1"
 export CONFIG_BOARD_NAME="Librem Server L1UM"
 export CONFIG_AUTO_BOOT_TIMEOUT=5
-export CONFIG_FLASHROM_OPTIONS="-p internal"
+export CONFIG_FLASH_OPTIONS="flashprog memory --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
@@ -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
@@ -41,7 +41,7 @@ export CONFIG_BOOT_RECOVERY_SERIAL="/dev/ttyS0"
 export CONFIG_BOOT_DEV="/dev/nvme0n1p1"
 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 memory --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
@@ -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
@@ -37,7 +37,7 @@ export CONFIG_BOOT_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE=""
 export CONFIG_BOOT_DEV="/dev/nvme0n1p1"
 export CONFIG_BOARD_NAME="Librem Mini"
-export CONFIG_FLASHROM_OPTIONS="-p internal"
+export CONFIG_FLASH_OPTIONS="flashprog memory --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
@@ -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
@@ -37,7 +37,7 @@ export CONFIG_BOOT_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE=""
 export CONFIG_BOOT_DEV="/dev/nvme0n1p1"
 export CONFIG_BOARD_NAME="Librem Mini v2"
-export CONFIG_FLASHROM_OPTIONS="-p internal"
+export CONFIG_FLASH_OPTIONS="flashprog memory --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
@@ -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
@@ -69,5 +69,5 @@ export CONFIG_BOOT_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off"
 export CONFIG_BOOT_DEV="/dev/nvme0n1"
 export CONFIG_BOARD_NAME="Nitropad NS50"
-export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
+export CONFIG_FLASH_OPTIONS="flashprog memory --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
@@ -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
@@ -69,5 +69,5 @@ export CONFIG_BOOT_KERNEL_ADD=""
 export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off"
 export CONFIG_BOOT_DEV="/dev/nvme0n1"
 export CONFIG_BOARD_NAME="Nitropad NV41"
-export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
+export CONFIG_FLASH_OPTIONS="flashprog memory --progress --programmer internal"
 export CONFIG_AUTO_BOOT_TIMEOUT=5
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
@@ -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
@@ -92,7 +92,7 @@ export CONFIG_BOOT_KERNEL_ADD="console=ttyS0 console=tty systemd.zram=0"
 export CONFIG_BOOT_KERNEL_REMOVE="quiet rhgb splash"
 export CONFIG_BOOT_DEV="/dev/vda1"
 export CONFIG_BOARD_NAME="qemu-coreboot-fbwhiptail-tpm1-hotp"
-#export CONFIG_FLASHROM_OPTIONS="-p internal"
+#export CONFIG_FLASH_OPTIONS="flashprog memory --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
@@ -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
@@ -90,7 +90,7 @@ export CONFIG_BOOT_KERNEL_ADD="console=ttyS0 console=tty systemd.zram=0"
 export CONFIG_BOOT_KERNEL_REMOVE="quiet rhgb splash"
 export CONFIG_BOOT_DEV="/dev/vda1"
 export CONFIG_BOARD_NAME="qemu-coreboot-fbwhiptail-tpm1"
-#export CONFIG_FLASHROM_OPTIONS="-p internal"
+#export CONFIG_FLASH_OPTIONS="flashprog memory --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
@@ -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
@@ -91,7 +91,7 @@ export CONFIG_BOOT_KERNEL_ADD="console=ttyS0 console=tty systemd.zram=0"
 export CONFIG_BOOT_KERNEL_REMOVE="quiet rhgb splash"
 export CONFIG_BOOT_DEV="/dev/vda1"
 export CONFIG_BOARD_NAME="qemu-coreboot-fbwhiptail-tpm2-hotp"
-#export CONFIG_FLASHROM_OPTIONS="-p internal"
+#export CONFIG_FLASH_OPTIONS="flashprog memory --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
@@ -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
@@ -90,7 +90,7 @@ export CONFIG_BOOT_KERNEL_ADD="console=ttyS0 console=tty systemd.zram=0"
 export CONFIG_BOOT_KERNEL_REMOVE="quiet rhgb splash"
 export CONFIG_BOOT_DEV="/dev/vda1"
 export CONFIG_BOARD_NAME="qemu-coreboot-fbwhiptail-tpm2"
-#export CONFIG_FLASHROM_OPTIONS="-p internal"
+#export CONFIG_FLASH_OPTIONS="flashprog memory --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
@@ -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
@@ -92,7 +92,7 @@ export CONFIG_BOOT_KERNEL_ADD="console=ttyS0 console=tty systemd.zram=0"
 export CONFIG_BOOT_KERNEL_REMOVE="quiet rhgb splash"
 export CONFIG_BOOT_DEV="/dev/vda1"
 export CONFIG_BOARD_NAME="qemu-coreboot-whiptail-tpm1-hotp"
-#export CONFIG_FLASHROM_OPTIONS="-p internal"
+#export CONFIG_FLASH_OPTIONS="flashprog memory --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
@@ -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
@@ -90,7 +90,7 @@ export CONFIG_BOOT_KERNEL_ADD="console=ttyS0 console=tty systemd.zram=0"
 export CONFIG_BOOT_KERNEL_REMOVE="quiet rhgb splash"
 export CONFIG_BOOT_DEV="/dev/vda1"
 export CONFIG_BOARD_NAME="qemu-coreboot-whiptail-tpm1"
-#export CONFIG_FLASHROM_OPTIONS="-p internal"
+#export CONFIG_FLASH_OPTIONS="flashprog memory --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
@@ -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
@@ -91,7 +91,7 @@ export CONFIG_BOOT_KERNEL_ADD="console=ttyS0 console=tty systemd.zram=0"
 export CONFIG_BOOT_KERNEL_REMOVE="quiet rhgb splash"
 export CONFIG_BOOT_DEV="/dev/vda1"
 export CONFIG_BOARD_NAME="qemu-coreboot-whiptail-tpm2-hotp"
-#export CONFIG_FLASHROM_OPTIONS="-p internal"
+#export CONFIG_FLASH_OPTIONS="flashprog memory --progress --programmer internal"
 export CONFIG_AUTO_BOOT_TIMEOUT=5
 
 BOARD_TARGETS := qemu