From 9b101f1454dd409232094d00c815778fea30e0b4 Mon Sep 17 00:00:00 2001 From: Thierry Laurion Date: Sun, 1 Sep 2024 15:02:42 -0400 Subject: [PATCH] flash.sh: FLASHROM_OPTIONS->FLASH_OPTIONS: require FLASH_OPTIONS to specify 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 --- ...UNMAINTAINED_kgpe-d16_server-whiptail.config | 4 ++-- .../UNMAINTAINED_kgpe-d16_server.config | 4 ++-- ...NED_kgpe-d16_workstation-usb_keyboard.config | 4 ++-- .../UNMAINTAINED_kgpe-d16_workstation.config | 4 ++-- boards/librem_11/librem_11.config | 4 ++-- boards/librem_13v2/librem_13v2.config | 4 ++-- boards/librem_13v4/librem_13v4.config | 4 ++-- boards/librem_14/librem_14.config | 4 ++-- boards/librem_15v3/librem_15v3.config | 4 ++-- boards/librem_15v4/librem_15v4.config | 4 ++-- boards/librem_l1um/librem_l1um.config | 4 ++-- boards/librem_l1um_v2/librem_l1um_v2.config | 4 ++-- boards/librem_mini/librem_mini.config | 4 ++-- boards/librem_mini_v2/librem_mini_v2.config | 4 ++-- boards/nitropad-ns50/nitropad-ns50.config | 4 ++-- boards/nitropad-nv41/nitropad-nv41.config | 4 ++-- .../qemu-coreboot-fbwhiptail-tpm1-hotp.config | 4 ++-- .../qemu-coreboot-fbwhiptail-tpm1.config | 4 ++-- .../qemu-coreboot-fbwhiptail-tpm2-hotp.config | 4 ++-- .../qemu-coreboot-fbwhiptail-tpm2.config | 4 ++-- .../qemu-coreboot-whiptail-tpm1-hotp.config | 4 ++-- .../qemu-coreboot-whiptail-tpm1.config | 4 ++-- .../qemu-coreboot-whiptail-tpm2-hotp.config | 4 ++-- .../qemu-coreboot-whiptail-tpm2.config | 3 +-- .../t420-hotp-maximized.config | 4 ++-- boards/t420-maximized/t420-maximized.config | 4 ++-- .../t430-hotp-maximized.config | 4 ++-- boards/t430-maximized/t430-maximized.config | 4 ++-- boards/t440p-maximized/t440p-maximized.config | 4 ++-- .../t530-hotp-maximized.config | 4 ++-- boards/t530-maximized/t530-maximized.config | 4 ++-- boards/talos-2/talos-2.config | 4 ++-- .../w530-hotp-maximized.config | 4 ++-- boards/w530-maximized/w530-maximized.config | 4 ++-- boards/w541-maximized/w541-maximized.config | 4 ++-- .../x220-hotp-maximized.config | 4 ++-- boards/x220-maximized/x220-maximized.config | 4 ++-- boards/x230-hotp-legacy/x230-hotp-legacy.config | 4 ++-- .../x230-hotp-maximized-fhd_edp.config | 4 ++-- .../x230-hotp-maximized.config | 4 ++-- .../x230-hotp-maximized_usb-kb.config | 4 ++-- .../x230-legacy-flash/x230-legacy-flash.config | 4 ++-- boards/x230-legacy/x230-legacy.config | 4 ++-- .../x230-maximized-fhd_edp.config | 4 ++-- boards/x230-maximized/x230-maximized.config | 4 ++-- .../z220-cmt-maximized.config | 6 +++--- initrd/bin/flash.sh | 17 +++++++++-------- initrd/etc/ash_functions | 4 ++-- ...MAINTAINED_p8z77-m_pro-tpm1-maximized.config | 4 ++-- .../UNMAINTAINED_qemu-linuxboot.config | 2 +- .../UNMAINTAINED_t420/UNMAINTAINED_t420.config | 4 ++-- .../UNMAINTAINED_t430-hotp-legacy.config | 4 ++-- .../UNMAINTAINED_t430-legacy-flash.config | 4 ++-- .../UNMAINTAINED_t430-legacy.config | 4 ++-- .../UNMAINTAINED_t520-hotp-maximized.config | 4 ++-- .../UNMAINTAINED_t520-maximized.config | 4 ++-- ...UNMAINTAINED_t530-dgpu-hotp-maximized.config | 4 ++-- .../UNMAINTAINED_t530-dgpu-maximized.config | 4 ++-- ...AINED_w530-dgpu-K1000m-hotp-maximized.config | 4 ++-- ...MAINTAINED_w530-dgpu-K1000m-maximized.config | 4 ++-- ...AINED_w530-dgpu-K2000m-hotp-maximized.config | 4 ++-- ...MAINTAINED_w530-dgpu-K2000m-maximized.config | 4 ++-- .../UNMAINTAINED_x220/UNMAINTAINED_x220.config | 4 ++-- .../UNTESTED_leopard/UNTESTED_leopard.config | 2 +- .../UNTESTED_r630/UNTESTED_r630.config | 2 +- .../UNTESTED_s2600wf/UNTESTED_s2600wf.config | 2 +- .../UNTESTED_tioga/UNTESTED_tioga.config | 2 +- .../UNTESTED_winterfell.config | 2 +- 68 files changed, 137 insertions(+), 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 index bad8c12c..4a55e94f 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 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 index 995ee637..47cefb88 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,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 @@ -59,5 +59,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 memory --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 59ecbfd0..a82ebe36 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 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 index d88ad6ce..8972c9ba 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 memory --progress --programmer internal" diff --git a/boards/librem_11/librem_11.config b/boards/librem_11/librem_11.config index 2610fb7a..0c26c8f5 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 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 index 49c5dde1..6d1e352d 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 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 index d3ed7b02..b4d3a93b 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 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 index 47ca137f..2596ee0b 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 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 index ec5620b3..77db0afb 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 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 index 6f9b3cef..c8674f73 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 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 index 98f76a5c..81627f08 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 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 index 3981a1a8..8564a040 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 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 index 6e3f7176..6b1a9c55 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 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 index 0325ecab..24184212 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 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 index 07117cb8..038e169f 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 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 index adca07c6..b669aae3 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 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 index b4c6b3a1..b2a46559 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 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 index be28d0bc..1690918d 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 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 index 3c589c8f..f23fd7b0 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 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 index cca9f0df..fbb1b5e4 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 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 index fafdcaf8..e8f7fb83 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 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 index a0981ed4..929b5a5a 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 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 index e880fbe3..b1fe068f 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 memory --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 77ffbbb5..1c42f6f7 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,6 @@ CONFIG_BUSYBOX=n else #Modules packed into tools.cpio CONFIG_CRYPTSETUP2=y -#CONFIG_FLASHROM=y CONFIG_FLASHPROG=y CONFIG_FLASHTOOLS=y CONFIG_GPG2=y @@ -90,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 memory --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 3494f6f8..89259f92 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 memory --progress --programmer internal" #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 60ee80bd..8332c8a7 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 memory --progress --programmer internal" #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 fd549a08..3d3c1da4 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 memory --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 4e3addec..2fabc2da 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 memory --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 aaf34a8c..756ab46b 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 memory --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 7bcb5c10..119b0a17 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 memory --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 6d8c8e71..40350d0c 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 memory --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 b7f0923d..e3a93525 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 memory --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 670d0790..22c6e37c 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 memory --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 a318e37a..60b7e726 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 memory --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 3bd82de1..91a95448 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 memory --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 4ebbd7da..572524b2 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 memory --progress --programmer internal" #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 41d1abd5..81a36fcf 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 memory --progress --programmer internal" #Include bits related to sandybridge ME blob download/neutering down to BUP BOARD_TARGETS += xx20_me_blobs diff --git a/boards/x230-hotp-legacy/x230-hotp-legacy.config b/boards/x230-hotp-legacy/x230-hotp-legacy.config index 73e9ef07..3d3a78e7 100644 --- a/boards/x230-hotp-legacy/x230-hotp-legacy.config +++ b/boards/x230-hotp-legacy/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 memory --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-hotp-maximized-fhd_edp/x230-hotp-maximized-fhd_edp.config b/boards/x230-hotp-maximized-fhd_edp/x230-hotp-maximized-fhd_edp.config index a5550d4d..887bd03d 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 memory --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 d4011650..2dc8af49 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 memory --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 7e82616b..2139c5a5 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 memory --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-legacy-flash/x230-legacy-flash.config b/boards/x230-legacy-flash/x230-legacy-flash.config index 5122468c..1ffaec0d 100644 --- a/boards/x230-legacy-flash/x230-legacy-flash.config +++ b/boards/x230-legacy-flash/x230-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 @@ -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 memory --progress --programmer internal --ifd --image bios" CONFIG_LEGACY_FLASH=y diff --git a/boards/x230-legacy/x230-legacy.config b/boards/x230-legacy/x230-legacy.config index bda3f498..972b7556 100644 --- a/boards/x230-legacy/x230-legacy.config +++ b/boards/x230-legacy/x230-legacy.config @@ -15,7 +15,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 @@ -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 memory --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-maximized-fhd_edp/x230-maximized-fhd_edp.config b/boards/x230-maximized-fhd_edp/x230-maximized-fhd_edp.config index 5a6bf840..f7f930bc 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 memory --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 99b15b47..86c2364f 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 memory --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 a0e679cd..c0774905 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 memory --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 845d4661..b3e1d664 100755 --- a/initrd/bin/flash.sh +++ b/initrd/bin/flash.sh @@ -12,19 +12,20 @@ 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 flashrom options and 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}" \ + $CONFIG_FLASH_OPTIONS -r "${ROM}" \ || die "Backup to $ROM failed" else cp "$ROM" /tmp/${CONFIG_BOARD}.rom @@ -42,14 +43,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,7 +85,7 @@ 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 \ + $CONFIG_FLASH_OPTIONS -r /tmp/flash.sh.bak \ || die "Read of flash has failed" # ROM and bootblock already have ECC diff --git a/initrd/etc/ash_functions b/initrd/etc/ash_functions index 5aec832c..bf2e3289 100644 --- a/initrd/etc/ash_functions +++ b/initrd/etc/ash_functions @@ -7,7 +7,7 @@ die() { if [ "$CONFIG_DEBUG_OUTPUT" = "y" ];then echo -e " !!! ERROR: $* !!!" | tee -a /tmp/debug.log /dev/kmsg > /dev/null; else - echo -e "!!! ERROR: $* !!!" > &2; + echo -e >&2 "!!! ERROR: $* !!!"; fi sleep 2; exit 1; @@ -17,7 +17,7 @@ warn() { if [ "$CONFIG_DEBUG_OUTPUT" = "y" ];then echo -e " *** WARNING: $* ***" | tee -a /tmp/debug.log /dev/kmsg > /dev/null; else - echo -e " *** WARNING: $* ***" > &2; + echo -e >&2 " *** WARNING: $* ***"; fi sleep 1; } 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 c4a0487f..57dc8cbc 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 memory --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 ae7b034a..32beb674 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 3aab4db9..a766d2f9 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 memory --progress --programmer internal --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 6abe0e8a..a1a88c51 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 memory --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 d99b7ef1..ec87605a 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 memory --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 28d5c9dd..f4164e0b 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 memory --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 72898cad..eddf2f10 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 memory --progress --programmer internal" #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 96dd85d7..baf9e076 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 memory --progress --programmer internal" #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 43bb07e5..55967765 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 memory --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 02043168..64da9a8a 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 memory --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 15cb36a7..1b1a28e2 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 memory --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 7a110791..dba59540 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 memory --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 15794695..70225826 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 memory --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 9ad244a3..feb1532b 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 memory --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 bed15b49..c2d11429 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 memory --progress --programmer internal" --ifd --image bios" diff --git a/unmaintained_boards/UNTESTED_leopard/UNTESTED_leopard.config b/unmaintained_boards/UNTESTED_leopard/UNTESTED_leopard.config index d121609d..8d874d73 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 bd98df5e..14d6abb6 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 e5af0f07..2a0148d7 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 73d47583..109c02fc 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 27db8c52..d9cae653 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