Skip to content

Commit c1f0fbb

Browse files
tlauriontlaurion
committed
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 <[email protected]>
1 parent 91cbc66 commit c1f0fbb

File tree

68 files changed

+137
-137
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+137
-137
lines changed

‎boards/UNMAINTAINED_kgpe-d16_server-whiptail/UNMAINTAINED_kgpe-d16_server-whiptail.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ CONFIG_COREBOOT_CONFIG=config/coreboot-kgpe-d16_server-whiptail.config
2525
CONFIG_LINUX_CONFIG=config/linux-kgpe-d16_server-whiptail.config
2626

2727
CONFIG_CRYPTSETUP=y
28-
CONFIG_FLASHROM=y
28+
CONFIG_FLASHPROG=y
2929
CONFIG_FLASHTOOLS=y
3030
CONFIG_GPG2=y
3131
CONFIG_KEXEC=y
@@ -73,5 +73,5 @@ export CONFIG_BOOT_KERNEL_REMOVE="plymouth.ignore-serial-consoles"
7373
export CONFIG_BOOT_DEV="/dev/sda1"
7474
export CONFIG_BOARD_NAME="KGPE-D16 Server-whiptail"
7575
export CONFIG_USB_BOOT_DEV="/dev/sdb1"
76-
export CONFIG_FLASHROM_OPTIONS="--force --noverify -p internal"
76+
export CONFIG_FLASH_OPTIONS="flashprog memory --progress --programmer internal"
7777
#export CONFIG_BOOT_STATIC_IP=192.168.1.2

‎boards/UNMAINTAINED_kgpe-d16_server/UNMAINTAINED_kgpe-d16_server.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ CONFIG_COREBOOT_CONFIG=config/coreboot-kgpe-d16_server.config
2323
CONFIG_LINUX_CONFIG=config/linux-kgpe-d16_server.config
2424

2525
CONFIG_CRYPTSETUP=y
26-
CONFIG_FLASHROM=y
26+
CONFIG_FLASHPROG=y
2727
CONFIG_FLASHTOOLS=y
2828
CONFIG_GPG2=y
2929
CONFIG_KEXEC=y
@@ -60,5 +60,5 @@ export CONFIG_BOOT_DEV="/dev/sda1"
6060
export CONFIG_BOARD_NAME="KGPE-D16 Server"
6161
export CONFIG_USB_BOOT_DEV="/dev/sdb1"
6262

63-
export CONFIG_FLASHROM_OPTIONS="--force --noverify -p internal"
63+
export CONFIG_FLASH_OPTIONS="flashprog memory --progress --programmer internal"
6464
#export CONFIG_BOOT_STATIC_IP=192.168.1.2

‎boards/UNMAINTAINED_kgpe-d16_workstation-usb_keyboard/UNMAINTAINED_kgpe-d16_workstation-usb_keyboard.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ CONFIG_COREBOOT_CONFIG=config/coreboot-kgpe-d16_workstation-usb_keyboard.config
1919
CONFIG_LINUX_CONFIG=config/linux-kgpe-d16_workstation.config
2020

2121
CONFIG_CRYPTSETUP=y
22-
CONFIG_FLASHROM=y
22+
CONFIG_FLASHPROG=y
2323
CONFIG_FLASHTOOLS=y
2424
CONFIG_GPG2=y
2525
CONFIG_KEXEC=y
@@ -68,4 +68,4 @@ export CONFIG_BOOT_REQ_ROLLBACK=n
6868
export CONFIG_BOOT_DEV="/dev/sda1"
6969
export CONFIG_BOARD_NAME="KGPE-D16 Workstation-USB-Keyboard"
7070
export CONFIG_USB_BOOT_DEV="/dev/sdb1"
71-
export CONFIG_FLASHROM_OPTIONS="--force --noverify -p internal"
71+
export CONFIG_FLASH_OPTIONS="flashprog memory --progress --programmer internal"

‎boards/UNMAINTAINED_kgpe-d16_workstation/UNMAINTAINED_kgpe-d16_workstation.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ CONFIG_COREBOOT_CONFIG=config/coreboot-kgpe-d16_workstation.config
2323
CONFIG_LINUX_CONFIG=config/linux-kgpe-d16_workstation.config
2424

2525
CONFIG_CRYPTSETUP=y
26-
CONFIG_FLASHROM=y
26+
CONFIG_FLASHPROG=y
2727
CONFIG_FLASHTOOLS=y
2828
CONFIG_GPG2=y
2929
CONFIG_KEXEC=y
@@ -69,4 +69,4 @@ export CONFIG_BOOT_REQ_ROLLBACK=n
6969
export CONFIG_BOOT_DEV="/dev/sda1"
7070
export CONFIG_BOARD_NAME="KGPE-D16 Workstation"
7171
export CONFIG_USB_BOOT_DEV="/dev/sdb1"
72-
export CONFIG_FLASHROM_OPTIONS="--force --noverify -p internal"
72+
export CONFIG_FLASH_OPTIONS="flashprog memory --progress --programmer internal"

‎boards/librem_11/librem_11.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export CONFIG_COREBOOT_VERSION=purism
77
export CONFIG_LINUX_VERSION=6.1.8
88

99
CONFIG_CRYPTSETUP2=y
10-
CONFIG_FLASHROM=y
10+
CONFIG_FLASHPROG=y
1111
CONFIG_FLASHTOOLS=y
1212
CONFIG_GPG2=y
1313
CONFIG_KEXEC=y
@@ -37,7 +37,7 @@ export CONFIG_BOOT_KERNEL_ADD=""
3737
export CONFIG_BOOT_KERNEL_REMOVE=""
3838
export CONFIG_BOOT_DEV="/dev/nvme0n1p1"
3939
export CONFIG_BOARD_NAME="Librem 11"
40-
export CONFIG_FLASHROM_OPTIONS="-p internal"
40+
export CONFIG_FLASH_OPTIONS="flashprog memory --progress --programmer internal"
4141
export CONFIG_USB_KEYBOARD_REQUIRED=y
4242
export CONFIG_AUTO_BOOT_TIMEOUT=5
4343
export CONFIG_ROOT_DEV="/dev/nvme0n1p2"

‎boards/librem_13v2/librem_13v2.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export CONFIG_COREBOOT_VERSION=purism
77
export CONFIG_LINUX_VERSION=6.1.8
88

99
CONFIG_CRYPTSETUP2=y
10-
CONFIG_FLASHROM=y
10+
CONFIG_FLASHPROG=y
1111
CONFIG_FLASHTOOLS=y
1212
CONFIG_GPG2=y
1313
CONFIG_KEXEC=y
@@ -37,7 +37,7 @@ export CONFIG_BOOT_KERNEL_ADD=""
3737
export CONFIG_BOOT_KERNEL_REMOVE=""
3838
export CONFIG_BOOT_DEV="/dev/nvme0n1p1"
3939
export CONFIG_BOARD_NAME="Librem 13 v2/v3"
40-
export CONFIG_FLASHROM_OPTIONS="-p internal"
40+
export CONFIG_FLASH_OPTIONS="flashprog memory --progress --programmer internal"
4141
export CONFIG_AUTO_BOOT_TIMEOUT=5
4242
export CONFIG_ROOT_DEV="/dev/nvme0n1p2"
4343
export CONFIG_ROOT_DIRLIST="bin boot lib sbin usr"

‎boards/librem_13v4/librem_13v4.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export CONFIG_COREBOOT_VERSION=purism
77
export CONFIG_LINUX_VERSION=6.1.8
88

99
CONFIG_CRYPTSETUP2=y
10-
CONFIG_FLASHROM=y
10+
CONFIG_FLASHPROG=y
1111
CONFIG_FLASHTOOLS=y
1212
CONFIG_GPG2=y
1313
CONFIG_KEXEC=y
@@ -37,7 +37,7 @@ export CONFIG_BOOT_KERNEL_ADD=""
3737
export CONFIG_BOOT_KERNEL_REMOVE=""
3838
export CONFIG_BOOT_DEV="/dev/nvme0n1p1"
3939
export CONFIG_BOARD_NAME="Librem 13 v4"
40-
export CONFIG_FLASHROM_OPTIONS="-p internal"
40+
export CONFIG_FLASH_OPTIONS="flashprog memory --progress --programmer internal"
4141
export CONFIG_AUTO_BOOT_TIMEOUT=5
4242
export CONFIG_ROOT_DEV="/dev/nvme0n1p2"
4343
export CONFIG_ROOT_DIRLIST="bin boot lib sbin usr"

‎boards/librem_14/librem_14.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export CONFIG_COREBOOT_VERSION=purism
77
export CONFIG_LINUX_VERSION=6.1.8
88

99
CONFIG_CRYPTSETUP2=y
10-
CONFIG_FLASHROM=y
10+
CONFIG_FLASHPROG=y
1111
CONFIG_FLASHTOOLS=y
1212
CONFIG_GPG2=y
1313
CONFIG_KEXEC=y
@@ -36,7 +36,7 @@ export CONFIG_BOOT_KERNEL_ADD=""
3636
export CONFIG_BOOT_KERNEL_REMOVE=""
3737
export CONFIG_BOOT_DEV="/dev/nvme0n1p1"
3838
export CONFIG_BOARD_NAME="Librem 14"
39-
export CONFIG_FLASHROM_OPTIONS="-p internal"
39+
export CONFIG_FLASH_OPTIONS="flashprog memory --progress --programmer internal"
4040

4141
export CONFIG_AUTO_BOOT_TIMEOUT=5
4242
export CONFIG_ROOT_DEV="/dev/nvme0n1p2"

‎boards/librem_15v3/librem_15v3.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export CONFIG_COREBOOT_VERSION=purism
77
export CONFIG_LINUX_VERSION=6.1.8
88

99
CONFIG_CRYPTSETUP2=y
10-
CONFIG_FLASHROM=y
10+
CONFIG_FLASHPROG=y
1111
CONFIG_FLASHTOOLS=y
1212
CONFIG_GPG2=y
1313
CONFIG_KEXEC=y
@@ -37,7 +37,7 @@ export CONFIG_BOOT_KERNEL_ADD=""
3737
export CONFIG_BOOT_KERNEL_REMOVE=""
3838
export CONFIG_BOOT_DEV="/dev/nvme0n1p1"
3939
export CONFIG_BOARD_NAME="Librem 15 v3"
40-
export CONFIG_FLASHROM_OPTIONS="-p internal"
40+
export CONFIG_FLASH_OPTIONS="flashprog memory --progress --programmer internal"
4141
export CONFIG_AUTO_BOOT_TIMEOUT=5
4242
export CONFIG_ROOT_DEV="/dev/nvme0n1p2"
4343
export CONFIG_ROOT_DIRLIST="bin boot lib sbin usr"

‎boards/librem_15v4/librem_15v4.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export CONFIG_COREBOOT_VERSION=purism
77
export CONFIG_LINUX_VERSION=6.1.8
88

99
CONFIG_CRYPTSETUP2=y
10-
CONFIG_FLASHROM=y
10+
CONFIG_FLASHPROG=y
1111
CONFIG_FLASHTOOLS=y
1212
CONFIG_GPG2=y
1313
CONFIG_KBD=y
@@ -38,7 +38,7 @@ export CONFIG_BOOT_KERNEL_ADD=""
3838
export CONFIG_BOOT_KERNEL_REMOVE=""
3939
export CONFIG_BOOT_DEV="/dev/nvme0n1p1"
4040
export CONFIG_BOARD_NAME="Librem 15 v4"
41-
export CONFIG_FLASHROM_OPTIONS="-p internal"
41+
export CONFIG_FLASH_OPTIONS="flashprog memory --progress --programmer internal"
4242
export CONFIG_AUTO_BOOT_TIMEOUT=5
4343
export CONFIG_ROOT_DEV="/dev/nvme0n1p2"
4444
export CONFIG_ROOT_DIRLIST="bin boot lib sbin usr"

‎boards/librem_l1um/librem_l1um.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export CONFIG_LINUX_VERSION=5.10.5
88
export CONFIG_PURISM_BLOBS=y
99

1010
CONFIG_CRYPTSETUP2=y
11-
CONFIG_FLASHROM=y
11+
CONFIG_FLASHPROG=y
1212
CONFIG_FLASHTOOLS=y
1313
CONFIG_GPG2=y
1414
CONFIG_KEXEC=y
@@ -37,7 +37,7 @@ export CONFIG_BOOT_KERNEL_REMOVE="plymouth.ignore-serial-consoles"
3737
export CONFIG_BOOT_DEV="/dev/nvme0n1p1"
3838
export CONFIG_BOARD_NAME="Librem Server L1UM"
3939
export CONFIG_AUTO_BOOT_TIMEOUT=5
40-
export CONFIG_FLASHROM_OPTIONS="-p internal"
40+
export CONFIG_FLASH_OPTIONS="flashprog memory --progress --programmer internal"
4141
export CONFIG_USB_KEYBOARD_REQUIRED=y
4242
export CONFIG_ROOT_DEV="/dev/nvme0n1p2"
4343
export CONFIG_ROOT_DIRLIST="bin boot lib sbin usr"

‎boards/librem_l1um_v2/librem_l1um_v2.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export CONFIG_COREBOOT_VERSION=purism
77
export CONFIG_LINUX_VERSION=6.1.8
88

99
CONFIG_CRYPTSETUP2=y
10-
CONFIG_FLASHROM=y
10+
CONFIG_FLASHPROG=y
1111
CONFIG_FLASHTOOLS=y
1212
CONFIG_GPG2=y
1313
CONFIG_KEXEC=y
@@ -41,7 +41,7 @@ export CONFIG_BOOT_RECOVERY_SERIAL="/dev/ttyS0"
4141
export CONFIG_BOOT_DEV="/dev/nvme0n1p1"
4242
export CONFIG_BOARD_NAME="Librem Server L1UM v2"
4343
export CONFIG_AUTO_BOOT_TIMEOUT=5
44-
export CONFIG_FLASHROM_OPTIONS="-p internal"
44+
export CONFIG_FLASH_OPTIONS="flashprog memory --progress --programmer internal"
4545
export CONFIG_USB_KEYBOARD_REQUIRED=y
4646
export CONFIG_ROOT_DEV="/dev/nvme0n1p2"
4747
export CONFIG_ROOT_DIRLIST="bin boot lib sbin usr"

‎boards/librem_mini/librem_mini.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export CONFIG_COREBOOT_VERSION=purism
77
export CONFIG_LINUX_VERSION=6.1.8
88

99
CONFIG_CRYPTSETUP2=y
10-
CONFIG_FLASHROM=y
10+
CONFIG_FLASHPROG=y
1111
CONFIG_FLASHTOOLS=y
1212
CONFIG_GPG2=y
1313
CONFIG_IOPORT=y
@@ -37,7 +37,7 @@ export CONFIG_BOOT_KERNEL_ADD=""
3737
export CONFIG_BOOT_KERNEL_REMOVE=""
3838
export CONFIG_BOOT_DEV="/dev/nvme0n1p1"
3939
export CONFIG_BOARD_NAME="Librem Mini"
40-
export CONFIG_FLASHROM_OPTIONS="-p internal"
40+
export CONFIG_FLASH_OPTIONS="flashprog memory --progress --programmer internal"
4141
export CONFIG_USB_KEYBOARD_REQUIRED=y
4242
export CONFIG_AUTO_BOOT_TIMEOUT=5
4343
export CONFIG_ROOT_DEV="/dev/nvme0n1p2"

‎boards/librem_mini_v2/librem_mini_v2.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export CONFIG_COREBOOT_VERSION=purism
77
export CONFIG_LINUX_VERSION=6.1.8
88

99
CONFIG_CRYPTSETUP2=y
10-
CONFIG_FLASHROM=y
10+
CONFIG_FLASHPROG=y
1111
CONFIG_FLASHTOOLS=y
1212
CONFIG_GPG2=y
1313
CONFIG_IOPORT=y
@@ -37,7 +37,7 @@ export CONFIG_BOOT_KERNEL_ADD=""
3737
export CONFIG_BOOT_KERNEL_REMOVE=""
3838
export CONFIG_BOOT_DEV="/dev/nvme0n1p1"
3939
export CONFIG_BOARD_NAME="Librem Mini v2"
40-
export CONFIG_FLASHROM_OPTIONS="-p internal"
40+
export CONFIG_FLASH_OPTIONS="flashprog memory --progress --programmer internal"
4141
export CONFIG_USB_KEYBOARD_REQUIRED=y
4242
export CONFIG_AUTO_BOOT_TIMEOUT=5
4343
export CONFIG_ROOT_DEV="/dev/nvme0n1p2"

‎boards/nitropad-ns50/nitropad-ns50.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ CONFIG_MOBILE_TETHERING=y
2121

2222
#Modules packed into tools.cpio
2323
CONFIG_CRYPTSETUP2=y
24-
CONFIG_FLASHROM=y
24+
CONFIG_FLASHPROG=y
2525
CONFIG_FLASHTOOLS=y
2626
CONFIG_GPG2=y
2727
CONFIG_KEXEC=y
@@ -69,5 +69,5 @@ export CONFIG_BOOT_KERNEL_ADD=""
6969
export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off"
7070
export CONFIG_BOOT_DEV="/dev/nvme0n1"
7171
export CONFIG_BOARD_NAME="Nitropad NS50"
72-
export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
72+
export CONFIG_FLASH_OPTIONS="flashprog memory --progress --programmer internal"
7373
export CONFIG_AUTO_BOOT_TIMEOUT=5

‎boards/nitropad-nv41/nitropad-nv41.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ CONFIG_MOBILE_TETHERING=y
2121

2222
#Modules packed into tools.cpio
2323
CONFIG_CRYPTSETUP2=y
24-
CONFIG_FLASHROM=y
24+
CONFIG_FLASHPROG=y
2525
CONFIG_FLASHTOOLS=y
2626
CONFIG_GPG2=y
2727
CONFIG_KEXEC=y
@@ -69,5 +69,5 @@ export CONFIG_BOOT_KERNEL_ADD=""
6969
export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off"
7070
export CONFIG_BOOT_DEV="/dev/nvme0n1"
7171
export CONFIG_BOARD_NAME="Nitropad NV41"
72-
export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
72+
export CONFIG_FLASH_OPTIONS="flashprog memory --progress --programmer internal"
7373
export CONFIG_AUTO_BOOT_TIMEOUT=5

‎boards/qemu-coreboot-fbwhiptail-tpm1-hotp/qemu-coreboot-fbwhiptail-tpm1-hotp.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ CONFIG_BUSYBOX=n
3939
else
4040
#Modules packed into tools.cpio
4141
CONFIG_CRYPTSETUP2=y
42-
CONFIG_FLASHROM=y
42+
CONFIG_FLASHPROG=y
4343
CONFIG_FLASHTOOLS=y
4444
CONFIG_GPG2=y
4545
CONFIG_KEXEC=y
@@ -92,7 +92,7 @@ export CONFIG_BOOT_KERNEL_ADD="console=ttyS0 console=tty systemd.zram=0"
9292
export CONFIG_BOOT_KERNEL_REMOVE="quiet rhgb splash"
9393
export CONFIG_BOOT_DEV="/dev/vda1"
9494
export CONFIG_BOARD_NAME="qemu-coreboot-fbwhiptail-tpm1-hotp"
95-
#export CONFIG_FLASHROM_OPTIONS="-p internal"
95+
#export CONFIG_FLASH_OPTIONS="flashprog memory --progress --programmer internal"
9696
export CONFIG_AUTO_BOOT_TIMEOUT=5
9797

9898
BOARD_TARGETS := qemu

‎boards/qemu-coreboot-fbwhiptail-tpm1/qemu-coreboot-fbwhiptail-tpm1.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ CONFIG_BUSYBOX=n
3737
else
3838
#Modules packed into tools.cpio
3939
CONFIG_CRYPTSETUP2=y
40-
CONFIG_FLASHROM=y
40+
CONFIG_FLASHPROG=y
4141
CONFIG_FLASHTOOLS=y
4242
CONFIG_GPG2=y
4343
CONFIG_KEXEC=y
@@ -90,7 +90,7 @@ export CONFIG_BOOT_KERNEL_ADD="console=ttyS0 console=tty systemd.zram=0"
9090
export CONFIG_BOOT_KERNEL_REMOVE="quiet rhgb splash"
9191
export CONFIG_BOOT_DEV="/dev/vda1"
9292
export CONFIG_BOARD_NAME="qemu-coreboot-fbwhiptail-tpm1"
93-
#export CONFIG_FLASHROM_OPTIONS="-p internal"
93+
#export CONFIG_FLASH_OPTIONS="flashprog memory --progress --programmer internal"
9494
#export CONFIG_AUTO_BOOT_TIMEOUT=5
9595

9696
BOARD_TARGETS := qemu

‎boards/qemu-coreboot-fbwhiptail-tpm2-hotp/qemu-coreboot-fbwhiptail-tpm2-hotp.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ CONFIG_BUSYBOX=n
3838
else
3939
#Modules packed into tools.cpio
4040
CONFIG_CRYPTSETUP2=y
41-
CONFIG_FLASHROM=y
41+
CONFIG_FLASHPROG=y
4242
CONFIG_FLASHTOOLS=y
4343
CONFIG_GPG2=y
4444
CONFIG_KEXEC=y
@@ -91,7 +91,7 @@ export CONFIG_BOOT_KERNEL_ADD="console=ttyS0 console=tty systemd.zram=0"
9191
export CONFIG_BOOT_KERNEL_REMOVE="quiet rhgb splash"
9292
export CONFIG_BOOT_DEV="/dev/vda1"
9393
export CONFIG_BOARD_NAME="qemu-coreboot-fbwhiptail-tpm2-hotp"
94-
#export CONFIG_FLASHROM_OPTIONS="-p internal"
94+
#export CONFIG_FLASH_OPTIONS="flashprog memory --progress --programmer internal"
9595
export CONFIG_AUTO_BOOT_TIMEOUT=5
9696

9797
BOARD_TARGETS := qemu

‎boards/qemu-coreboot-fbwhiptail-tpm2/qemu-coreboot-fbwhiptail-tpm2.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ CONFIG_BUSYBOX=n
3737
else
3838
#Modules packed into tools.cpio
3939
CONFIG_CRYPTSETUP2=y
40-
CONFIG_FLASHROM=y
40+
CONFIG_FLASHPROG=y
4141
CONFIG_FLASHTOOLS=y
4242
CONFIG_GPG2=y
4343
CONFIG_KEXEC=y
@@ -90,7 +90,7 @@ export CONFIG_BOOT_KERNEL_ADD="console=ttyS0 console=tty systemd.zram=0"
9090
export CONFIG_BOOT_KERNEL_REMOVE="quiet rhgb splash"
9191
export CONFIG_BOOT_DEV="/dev/vda1"
9292
export CONFIG_BOARD_NAME="qemu-coreboot-fbwhiptail-tpm2"
93-
#export CONFIG_FLASHROM_OPTIONS="-p internal"
93+
#export CONFIG_FLASH_OPTIONS="flashprog memory --progress --programmer internal"
9494
#export CONFIG_AUTO_BOOT_TIMEOUT=5
9595

9696
BOARD_TARGETS := qemu

‎boards/qemu-coreboot-whiptail-tpm1-hotp/qemu-coreboot-whiptail-tpm1-hotp.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ CONFIG_BUSYBOX=n
3939
else
4040
#Modules packed into tools.cpio
4141
CONFIG_CRYPTSETUP2=y
42-
CONFIG_FLASHROM=y
42+
CONFIG_FLASHPROG=y
4343
CONFIG_FLASHTOOLS=y
4444
CONFIG_GPG2=y
4545
CONFIG_KEXEC=y
@@ -92,7 +92,7 @@ export CONFIG_BOOT_KERNEL_ADD="console=ttyS0 console=tty systemd.zram=0"
9292
export CONFIG_BOOT_KERNEL_REMOVE="quiet rhgb splash"
9393
export CONFIG_BOOT_DEV="/dev/vda1"
9494
export CONFIG_BOARD_NAME="qemu-coreboot-whiptail-tpm1-hotp"
95-
#export CONFIG_FLASHROM_OPTIONS="-p internal"
95+
#export CONFIG_FLASH_OPTIONS="flashprog memory --progress --programmer internal"
9696
export CONFIG_AUTO_BOOT_TIMEOUT=5
9797

9898
BOARD_TARGETS := qemu

‎boards/qemu-coreboot-whiptail-tpm1/qemu-coreboot-whiptail-tpm1.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ CONFIG_BUSYBOX=n
3737
else
3838
#Modules packed into tools.cpio
3939
CONFIG_CRYPTSETUP2=y
40-
CONFIG_FLASHROM=y
40+
CONFIG_FLASHPROG=y
4141
CONFIG_FLASHTOOLS=y
4242
CONFIG_GPG2=y
4343
CONFIG_KEXEC=y
@@ -90,7 +90,7 @@ export CONFIG_BOOT_KERNEL_ADD="console=ttyS0 console=tty systemd.zram=0"
9090
export CONFIG_BOOT_KERNEL_REMOVE="quiet rhgb splash"
9191
export CONFIG_BOOT_DEV="/dev/vda1"
9292
export CONFIG_BOARD_NAME="qemu-coreboot-whiptail-tpm1"
93-
#export CONFIG_FLASHROM_OPTIONS="-p internal"
93+
#export CONFIG_FLASH_OPTIONS="flashprog memory --progress --programmer internal"
9494
#export CONFIG_AUTO_BOOT_TIMEOUT=5
9595

9696
BOARD_TARGETS := qemu

‎boards/qemu-coreboot-whiptail-tpm2-hotp/qemu-coreboot-whiptail-tpm2-hotp.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ CONFIG_BUSYBOX=n
3838
else
3939
#Modules packed into tools.cpio
4040
CONFIG_CRYPTSETUP2=y
41-
CONFIG_FLASHROM=y
41+
CONFIG_FLASHPROG=y
4242
CONFIG_FLASHTOOLS=y
4343
CONFIG_GPG2=y
4444
CONFIG_KEXEC=y
@@ -91,7 +91,7 @@ export CONFIG_BOOT_KERNEL_ADD="console=ttyS0 console=tty systemd.zram=0"
9191
export CONFIG_BOOT_KERNEL_REMOVE="quiet rhgb splash"
9292
export CONFIG_BOOT_DEV="/dev/vda1"
9393
export CONFIG_BOARD_NAME="qemu-coreboot-whiptail-tpm2-hotp"
94-
#export CONFIG_FLASHROM_OPTIONS="-p internal"
94+
#export CONFIG_FLASH_OPTIONS="flashprog memory --progress --programmer internal"
9595
export CONFIG_AUTO_BOOT_TIMEOUT=5
9696

9797
BOARD_TARGETS := qemu

0 commit comments

Comments
 (0)