Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch from flashrom to flashprog #1769

Merged
merged 22 commits into from
Oct 29, 2024
Merged
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
0cd00f2
add flashprog support: failed attempt to use review.sourcearcade.org …
tlaurion Aug 31, 2024
f8eb0a2
flashprog: use latest head commit of wp_cli branch which is experimen…
tlaurion Sep 1, 2024
04bb3be
ash_functions: make sure newlines are passed, fix error redirection
tlaurion Sep 1, 2024
58081cb
flash.sh: FLASHROM_OPTIONS->FLASH_OPTIONS: require FLASH_OPTIONS to s…
tlaurion Sep 1, 2024
36aea9e
boards FLASH_OPTIONS: add --noverify. No point verifying flash with i…
tlaurion Sep 1, 2024
e26cd76
boards FLASH_OPTIONS: remove --noverify/--noverify-all for now
tlaurion Sep 1, 2024
8b524be
flash.sh: replace die calls by recovery calls where relevant otherwis…
tlaurion Sep 1, 2024
56ae5f7
xx20 boards: reintroduce hwseq for flashprog
tlaurion Sep 7, 2024
efb6126
kgpe-d16 server: TODO AST1100 patch still missing @i-c-o-n https://gi…
tlaurion Sep 8, 2024
668f697
boards CONFIG_FLASH_OPTIONS: 'flashprog memory' -> 'flashprog' since …
tlaurion Sep 9, 2024
af2c45b
Haswell boards : renamed to UNTESTED_* while still built by CircleCI …
tlaurion Sep 9, 2024
a407462
board t440p: move board away from UNTESTED_ with improved Makefile he…
tlaurion Sep 10, 2024
bd7b1c8
BOARD_TESTERS.md: updated and reordered testers
tlaurion Sep 10, 2024
29c97e8
WP_NOTES.md: add notes on WP wanted, work done and why it's still unused
tlaurion Sep 10, 2024
6fe86df
x230 legacy boards: move to unmaintained
tlaurion Sep 10, 2024
75f1c2a
move w541 boards back to tested to dodge drama. Still this board has …
tlaurion Sep 10, 2024
aad131b
WP_NOTES.md: add some more links to past discussions and Platform Chi…
tlaurion Sep 10, 2024
5cba23e
BOARD_TESTERS.md: add @ResendeGHF as first contact board tester for w…
tlaurion Sep 11, 2024
6c16a50
flash.sh: remove last references in code to flashrom, use more generi…
tlaurion Sep 11, 2024
d5ddab5
BOARD_TESTERS.md: reorder known testers by responsiveness
tlaurion Sep 11, 2024
2c6eec5
Merge remote-tracking branch 'osresearch/master' into flashprog
tlaurion Oct 28, 2024
32d5173
Optiplex boards: switch flashrom-> flashprog
tlaurion Oct 28, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
boards CONFIG_FLASH_OPTIONS: 'flashprog memory' -> 'flashprog' since …
…flashprog aims to be compatible with flashrom

Signed-off-by: Thierry Laurion <[email protected]>
tlaurion committed Sep 9, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 668f6974645a11a5e47c02c07223b634d47289e8
Original file line number Diff line number Diff line change
@@ -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_FLASH_OPTIONS="flashprog memory --progress --programmer internal"
export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
#export CONFIG_BOOT_STATIC_IP=192.168.1.2
Original file line number Diff line number Diff line change
@@ -61,5 +61,5 @@ export CONFIG_BOOT_KERNEL_REMOVE="plymouth.ignore-serial-consoles"
export CONFIG_BOARD_NAME="KGPE-D16 Server"
export CONFIG_USB_BOOT_DEV="/dev/sdb1"

export CONFIG_FLASH_OPTIONS="flashprog memory --progress --programmer internal"
export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
#export CONFIG_BOOT_STATIC_IP=192.168.1.2
Original file line number Diff line number Diff line change
@@ -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_FLASH_OPTIONS="flashprog memory --progress --programmer internal"
export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
Original file line number Diff line number Diff line change
@@ -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_FLASH_OPTIONS="flashprog memory --progress --programmer internal"
export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
2 changes: 1 addition & 1 deletion boards/librem_11/librem_11.config
Original file line number Diff line number Diff line change
@@ -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_FLASH_OPTIONS="flashprog memory --progress --programmer internal"
export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
export CONFIG_USB_KEYBOARD_REQUIRED=y
export CONFIG_AUTO_BOOT_TIMEOUT=5
export CONFIG_ROOT_DEV="/dev/nvme0n1p2"
2 changes: 1 addition & 1 deletion boards/librem_13v2/librem_13v2.config
Original file line number Diff line number Diff line change
@@ -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_FLASH_OPTIONS="flashprog memory --progress --programmer internal"
export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
export CONFIG_AUTO_BOOT_TIMEOUT=5
export CONFIG_ROOT_DEV="/dev/nvme0n1p2"
export CONFIG_ROOT_DIRLIST="bin boot lib sbin usr"
2 changes: 1 addition & 1 deletion boards/librem_13v4/librem_13v4.config
Original file line number Diff line number Diff line change
@@ -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_FLASH_OPTIONS="flashprog memory --progress --programmer internal"
export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
export CONFIG_AUTO_BOOT_TIMEOUT=5
export CONFIG_ROOT_DEV="/dev/nvme0n1p2"
export CONFIG_ROOT_DIRLIST="bin boot lib sbin usr"
2 changes: 1 addition & 1 deletion boards/librem_14/librem_14.config
Original file line number Diff line number Diff line change
@@ -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_FLASH_OPTIONS="flashprog memory --progress --programmer internal"
export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"

export CONFIG_AUTO_BOOT_TIMEOUT=5
export CONFIG_ROOT_DEV="/dev/nvme0n1p2"
2 changes: 1 addition & 1 deletion boards/librem_15v3/librem_15v3.config
Original file line number Diff line number Diff line change
@@ -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_FLASH_OPTIONS="flashprog memory --progress --programmer internal"
export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
export CONFIG_AUTO_BOOT_TIMEOUT=5
export CONFIG_ROOT_DEV="/dev/nvme0n1p2"
export CONFIG_ROOT_DIRLIST="bin boot lib sbin usr"
2 changes: 1 addition & 1 deletion boards/librem_15v4/librem_15v4.config
Original file line number Diff line number Diff line change
@@ -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_FLASH_OPTIONS="flashprog memory --progress --programmer internal"
export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
export CONFIG_AUTO_BOOT_TIMEOUT=5
export CONFIG_ROOT_DEV="/dev/nvme0n1p2"
export CONFIG_ROOT_DIRLIST="bin boot lib sbin usr"
2 changes: 1 addition & 1 deletion boards/librem_l1um/librem_l1um.config
Original file line number Diff line number Diff line change
@@ -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_FLASH_OPTIONS="flashprog memory --progress --programmer internal"
export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
export CONFIG_USB_KEYBOARD_REQUIRED=y
export CONFIG_ROOT_DEV="/dev/nvme0n1p2"
export CONFIG_ROOT_DIRLIST="bin boot lib sbin usr"
2 changes: 1 addition & 1 deletion boards/librem_l1um_v2/librem_l1um_v2.config
Original file line number Diff line number Diff line change
@@ -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_FLASH_OPTIONS="flashprog memory --progress --programmer internal"
export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
export CONFIG_USB_KEYBOARD_REQUIRED=y
export CONFIG_ROOT_DEV="/dev/nvme0n1p2"
export CONFIG_ROOT_DIRLIST="bin boot lib sbin usr"
2 changes: 1 addition & 1 deletion boards/librem_mini/librem_mini.config
Original file line number Diff line number Diff line change
@@ -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_FLASH_OPTIONS="flashprog memory --progress --programmer internal"
export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
export CONFIG_USB_KEYBOARD_REQUIRED=y
export CONFIG_AUTO_BOOT_TIMEOUT=5
export CONFIG_ROOT_DEV="/dev/nvme0n1p2"
2 changes: 1 addition & 1 deletion boards/librem_mini_v2/librem_mini_v2.config
Original file line number Diff line number Diff line change
@@ -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_FLASH_OPTIONS="flashprog memory --progress --programmer internal"
export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
export CONFIG_USB_KEYBOARD_REQUIRED=y
export CONFIG_AUTO_BOOT_TIMEOUT=5
export CONFIG_ROOT_DEV="/dev/nvme0n1p2"
2 changes: 1 addition & 1 deletion boards/nitropad-ns50/nitropad-ns50.config
Original file line number Diff line number Diff line change
@@ -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_FLASH_OPTIONS="flashprog memory --progress --programmer internal"
export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
export CONFIG_AUTO_BOOT_TIMEOUT=5
2 changes: 1 addition & 1 deletion boards/nitropad-nv41/nitropad-nv41.config
Original file line number Diff line number Diff line change
@@ -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_FLASH_OPTIONS="flashprog memory --progress --programmer internal"
export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
export CONFIG_AUTO_BOOT_TIMEOUT=5
Original file line number Diff line number Diff line change
@@ -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_FLASH_OPTIONS="flashprog memory --progress --programmer internal"
#export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
export CONFIG_AUTO_BOOT_TIMEOUT=5

BOARD_TARGETS := qemu
Original file line number Diff line number Diff line change
@@ -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_FLASH_OPTIONS="flashprog memory --progress --programmer internal"
#export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
#export CONFIG_AUTO_BOOT_TIMEOUT=5

BOARD_TARGETS := qemu
Original file line number Diff line number Diff line change
@@ -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_FLASH_OPTIONS="flashprog memory --progress --programmer internal"
#export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
export CONFIG_AUTO_BOOT_TIMEOUT=5

BOARD_TARGETS := qemu
Original file line number Diff line number Diff line change
@@ -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_FLASH_OPTIONS="flashprog memory --progress --programmer internal"
#export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
#export CONFIG_AUTO_BOOT_TIMEOUT=5

BOARD_TARGETS := qemu
Original file line number Diff line number Diff line change
@@ -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_FLASH_OPTIONS="flashprog memory --progress --programmer internal"
#export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
export CONFIG_AUTO_BOOT_TIMEOUT=5

BOARD_TARGETS := qemu
Original file line number Diff line number Diff line change
@@ -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_FLASH_OPTIONS="flashprog memory --progress --programmer internal"
#export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
#export CONFIG_AUTO_BOOT_TIMEOUT=5

BOARD_TARGETS := qemu
Original file line number Diff line number Diff line change
@@ -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_FLASH_OPTIONS="flashprog memory --progress --programmer internal"
#export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
export CONFIG_AUTO_BOOT_TIMEOUT=5

BOARD_TARGETS := qemu
Original file line number Diff line number Diff line change
@@ -89,7 +89,7 @@ export CONFIG_BOOT_RECOVERY_SERIAL="/dev/ttyS0"
export CONFIG_BOOT_KERNEL_ADD="console=ttyS0 console=tty systemd.zram=0"
export CONFIG_BOOT_KERNEL_REMOVE="quiet rhgb splash"
export CONFIG_BOARD_NAME="qemu-coreboot-whiptail-tpm2"
#export CONFIG_FLASH_OPTIONS="flashprog memory --progress --programmer internal"
#export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
#export CONFIG_AUTO_BOOT_TIMEOUT=5

BOARD_TARGETS := qemu
2 changes: 1 addition & 1 deletion boards/t420-hotp-maximized/t420-hotp-maximized.config
Original file line number Diff line number Diff line change
@@ -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_FLASH_OPTIONS="flashprog memory --progress --programmer internal:ich_spi_mode=hwseq"
export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal:ich_spi_mode=hwseq"

#Include bits related to sandybridge ME blob download/neutering down to BUP
BOARD_TARGETS := xx20_me_blobs
2 changes: 1 addition & 1 deletion boards/t420-maximized/t420-maximized.config
Original file line number Diff line number Diff line change
@@ -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_FLASH_OPTIONS="flashprog memory --progress --programmer internal:ich_spi_mode=hwseq"
export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal:ich_spi_mode=hwseq"

#Include bits related to sandybridge ME blob download/neutering down to BUP
BOARD_TARGETS := xx20_me_blobs
2 changes: 1 addition & 1 deletion boards/t430-hotp-maximized/t430-hotp-maximized.config
Original file line number Diff line number Diff line change
@@ -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_FLASH_OPTIONS="flashprog memory --progress --programmer internal"
export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"

#Include bits related to ivybridge ME blob download/neutering down to BUP+ROMP
BOARD_TARGETS := xx30_me_blobs
2 changes: 1 addition & 1 deletion boards/t430-maximized/t430-maximized.config
Original file line number Diff line number Diff line change
@@ -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_FLASH_OPTIONS="flashprog memory --progress --programmer internal"
export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"

#Include bits related to ivybridge ME blob download/neutering down to BUP+ROMP
BOARD_TARGETS := xx30_me_blobs
2 changes: 1 addition & 1 deletion boards/t440p-maximized/t440p-maximized.config
Original file line number Diff line number Diff line change
@@ -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_FLASH_OPTIONS="flashprog memory --progress --programmer internal"
export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"

# Make the Coreboot build depend on the following 3rd party blobs:
$(build)/coreboot-$(CONFIG_COREBOOT_VERSION)/$(BOARD)/.build: \
2 changes: 1 addition & 1 deletion boards/t530-hotp-maximized/t530-hotp-maximized.config
Original file line number Diff line number Diff line change
@@ -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_FLASH_OPTIONS="flashprog memory --progress --programmer internal"
export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"

#Include bits related to ivybridge ME blob download/neutering down to BUP+ROMP
BOARD_TARGETS := xx30_me_blobs
2 changes: 1 addition & 1 deletion boards/t530-maximized/t530-maximized.config
Original file line number Diff line number Diff line change
@@ -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_FLASH_OPTIONS="flashprog memory --progress --programmer internal"
export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"

#Include bits related to ivybridge ME blob download/neutering down to BUP+ROMP
BOARD_TARGETS := xx30_me_blobs
2 changes: 1 addition & 1 deletion boards/talos-2/talos-2.config
Original file line number Diff line number Diff line change
@@ -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_FLASH_OPTIONS="flashprog memory --progress --programmer linux_mtd"
export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer linux_mtd"

BOARD_TARGETS := ppc_tgz
2 changes: 1 addition & 1 deletion boards/w530-hotp-maximized/w530-hotp-maximized.config
Original file line number Diff line number Diff line change
@@ -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_FLASH_OPTIONS="flashprog memory --progress --programmer internal"
export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"

#Include bits related to ivybridge ME blob download/neutering down to BUP+ROMP
BOARD_TARGETS := xx30_me_blobs
2 changes: 1 addition & 1 deletion boards/w530-maximized/w530-maximized.config
Original file line number Diff line number Diff line change
@@ -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_FLASH_OPTIONS="flashprog memory --progress --programmer internal"
export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"

#Include bits related to ivybridge ME blob download/neutering down to BUP+ROMP
BOARD_TARGETS := xx30_me_blobs
2 changes: 1 addition & 1 deletion boards/w541-maximized/w541-maximized.config
Original file line number Diff line number Diff line change
@@ -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_FLASH_OPTIONS="flashprog memory --progress --programmer internal"
export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"

# Make the Coreboot build depend on the following 3rd party blobs:
$(build)/coreboot-$(CONFIG_COREBOOT_VERSION)/$(BOARD)/.build: \
2 changes: 1 addition & 1 deletion boards/x220-hotp-maximized/x220-hotp-maximized.config
Original file line number Diff line number Diff line change
@@ -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_FLASH_OPTIONS="flashprog memory --progress --programmer internal:ich_spi_mode=hwseq"
export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal:ich_spi_mode=hwseq"

#Include bits related to sandybridge ME blob download/neutering down to BUP
BOARD_TARGETS := xx20_me_blobs
2 changes: 1 addition & 1 deletion boards/x220-maximized/x220-maximized.config
Original file line number Diff line number Diff line change
@@ -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_FLASH_OPTIONS="flashprog memory --progress --programmer internal:ich_spi_mode=hwseq"
export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal:ich_spi_mode=hwseq"

#Include bits related to sandybridge ME blob download/neutering down to BUP
BOARD_TARGETS += xx20_me_blobs
2 changes: 1 addition & 1 deletion boards/x230-hotp-legacy/x230-hotp-legacy.config
Original file line number Diff line number Diff line change
@@ -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_FLASH_OPTIONS="flashprog memory --progress --programmer internal --ifd --image bios"
export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal --ifd --image bios"

# This board has two SPI flash chips, an 8 MB that holds the IFD,
# the ME image and part of the coreboot image, and a 4 MB one that
Original file line number Diff line number Diff line change
@@ -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_FLASH_OPTIONS="flashprog memory --progress --programmer internal"
export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"

#Include bits related to ivybridge ME blob download/neutering down to BUP+ROMP
BOARD_TARGETS := xx30_me_blobs
2 changes: 1 addition & 1 deletion boards/x230-hotp-maximized/x230-hotp-maximized.config
Original file line number Diff line number Diff line change
@@ -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_FLASH_OPTIONS="flashprog memory --progress --programmer internal"
export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"

#Include bits related to ivybridge ME blob download/neutering down to BUP+ROMP
BOARD_TARGETS := xx30_me_blobs
Original file line number Diff line number Diff line change
@@ -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_FLASH_OPTIONS="flashprog memory --progress --programmer internal"
export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"

#Include bits related to ivybridge ME blob download/neutering down to BUP+ROMP
BOARD_TARGETS := xx30_me_blobs
2 changes: 1 addition & 1 deletion boards/x230-legacy-flash/x230-legacy-flash.config
Original file line number Diff line number Diff line change
@@ -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_FLASH_OPTIONS="flashprog memory --progress --programmer internal --ifd --image bios"
export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal --ifd --image bios"

CONFIG_LEGACY_FLASH=y

2 changes: 1 addition & 1 deletion boards/x230-legacy/x230-legacy.config
Original file line number Diff line number Diff line change
@@ -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_FLASH_OPTIONS="flashprog memory --progress --programmer internal --ifd --image bios"
export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal --ifd --image bios"

# This board has two SPI flash chips, an 8 MB that holds the IFD,
# the ME image and part of the coreboot image, and a 4 MB one that
Original file line number Diff line number Diff line change
@@ -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_FLASH_OPTIONS="flashprog memory --progress --programmer internal"
export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"

#Include bits related to ivybridge ME blob download/neutering down to BUP+ROMP
BOARD_TARGETS := xx30_me_blobs
2 changes: 1 addition & 1 deletion boards/x230-maximized/x230-maximized.config
Original file line number Diff line number Diff line change
@@ -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_FLASH_OPTIONS="flashprog memory --progress --programmer internal"
export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"

#Include bits related to ivybridge ME blob download/neutering down to BUP+ROMP
BOARD_TARGETS := xx30_me_blobs
2 changes: 1 addition & 1 deletion boards/z220-cmt-maximized/z220-cmt-maximized.config
Original file line number Diff line number Diff line change
@@ -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_FLASH_OPTIONS="flashprog memory --progress --programmer internal"
export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"

# Make the Coreboot build depend on the following 3rd party blobs:
$(build)/coreboot-$(CONFIG_COREBOOT_VERSION)/$(BOARD)/.build: \
Original file line number Diff line number Diff line change
@@ -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_FLASH_OPTIONS="flashprog memory --progress --programmer internal"
export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"
#Set this option to zero out the VSCC table https://github.com/osresearch/heads/pull/1358#discussion_r1153251399
export CONFIG_ZERO_IFD_VSCC=y

Original file line number Diff line number Diff line change
@@ -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_FLASH_OPTIONS="flashprog memory --progress --programmer internal:ich_spi_mode=hwseq --ifd --image bios"
export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal:ich_spi_mode=hwseq --ifd --image bios"
Original file line number Diff line number Diff line change
@@ -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_FLASH_OPTIONS="flashprog memory --progress --programmer internal --ifd --image bios"
export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal --ifd --image bios"

# This board has two SPI flash chips, an 8 MB that holds the IFD,
# the ME image and part of the coreboot image, and a 4 MB one that
Original file line number Diff line number Diff line change
@@ -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_FLASH_OPTIONS="flashprog memory --progress --programmer internal --ifd --image bios"
export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal --ifd --image bios"

CONFIG_LEGACY_FLASH=y

Original file line number Diff line number Diff line change
@@ -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_FLASH_OPTIONS="flashprog memory --progress --programmer internal --ifd --image bios"
export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal --ifd --image bios"

# This board has two SPI flash chips, an 8 MB that holds the IFD,
# the ME image and part of the coreboot image, and a 4 MB one that
Original file line number Diff line number Diff line change
@@ -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_FLASH_OPTIONS="flashprog memory --progress --programmer internal:ich_spi_mode=hwseq"
export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal:ich_spi_mode=hwseq"

#Include bits related to sandybridge ME blob download/neutering down to BUP
BOARD_TARGETS := xx20_me_blobs
Original file line number Diff line number Diff line change
@@ -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_FLASH_OPTIONS="flashprog memory --progress --programmer internal:ich_spi_mode=hwseq"
export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal:ich_spi_mode=hwseq"

#Include bits related to sandybridge ME blob download/neutering down to BUP
BOARD_TARGETS := xx20_me_blobs
Original file line number Diff line number Diff line change
@@ -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_FLASH_OPTIONS="flashprog memory --progress --programmer internal"
export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"

# Make the Coreboot build depend on the following 3rd party blobs:
$(build)/coreboot-$(CONFIG_COREBOOT_VERSION)/$(BOARD)/.build: \
Original file line number Diff line number Diff line change
@@ -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_FLASH_OPTIONS="flashprog memory --progress --programmer internal"
export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"

# Make the Coreboot build depend on the following 3rd party blobs:
$(build)/coreboot-$(CONFIG_COREBOOT_VERSION)/$(BOARD)/.build: \
Original file line number Diff line number Diff line change
@@ -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_FLASH_OPTIONS="flashprog memory --progress --programmer internal"
export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"

# xx30-*-maximized boards require of you initially call one of the
# following to have gbe.bin ifd.bin and me.bin
Original file line number Diff line number Diff line change
@@ -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_FLASH_OPTIONS="flashprog memory --progress --programmer internal"
export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"

# xx30-*-maximized boards require of you initially call one of the
# following to have gbe.bin ifd.bin and me.bin
Original file line number Diff line number Diff line change
@@ -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_FLASH_OPTIONS="flashprog memory --progress --programmer internal"
export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"

# xx30-*-maximized boards require of you initially call one of the
# following to have gbe.bin ifd.bin and me.bin
Original file line number Diff line number Diff line change
@@ -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_FLASH_OPTIONS="flashprog memory --progress --programmer internal"
export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal"

# xx30-*-maximized boards require of you initially call one of the
# following to have gbe.bin ifd.bin and me.bin
Original file line number Diff line number Diff line change
@@ -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_FLASH_OPTIONS="flashprog memory --progress --programmer internal:ich_spi_mode=hwseq --ifd --image bios"
export CONFIG_FLASH_OPTIONS="flashprog --progress --programmer internal:ich_spi_mode=hwseq --ifd --image bios"