Skip to content

Flash.sh cleanup : flashrom specifics now in board configs #592

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.

Sign up for GitHub

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

Merged
tlaurion merged 27 commits into from
Feb 19, 2020
Merged

Flash.sh cleanup : flashrom specifics now in board configs #592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
ca9678b
Merge pull request #4 from osresearch/master
snmcmillan Jul 6, 2019
d2502cb
Update x230.config
snmcmillan Jul 6, 2019
68268d9
Update x230-flash.config
snmcmillan Jul 6, 2019
ddbe0d1
Update x220.config
snmcmillan Jul 6, 2019
5a3d358
Update librem13v2.config
snmcmillan Jul 6, 2019
ecbfb42
Update librem13v4.config
snmcmillan Jul 6, 2019
6d1ebd1
Update librem15v3.config
snmcmillan Jul 6, 2019
33d8596
Update librem15v4.config
snmcmillan Jul 6, 2019
78af844
Update kgpe-d16.config
snmcmillan Jul 6, 2019
91c3c39
Update flash.sh
snmcmillan Jul 6, 2019
77ba2c7
Merge pull request #5 from osresearch/master
snmcmillan Feb 4, 2020
f793269
Update librem15v4.config
snmcmillan Feb 4, 2020
6c27342
Update librem15v3.config
snmcmillan Feb 4, 2020
32920c1
Update librem15v3.config
snmcmillan Feb 4, 2020
36bb1b1
Update librem15v4.config
snmcmillan Feb 4, 2020
9a74dca
Update librem15v4.config
snmcmillan Feb 4, 2020
9cbb827
Update librem15v3.config
snmcmillan Feb 4, 2020
53e614a
Merge pull request #6 from SebastianMcMillan/clean-master
snmcmillan Feb 4, 2020
9105428
Update librem15v3.config
snmcmillan Feb 4, 2020
a9812e7
Update librem15v4.config
snmcmillan Feb 4, 2020
76864db
Update x220.config
snmcmillan Feb 19, 2020
aff7ee5
Update x230-flash.config
snmcmillan Feb 19, 2020
625b219
Update x230.config
snmcmillan Feb 19, 2020
2e1a22c
Update librem13v4.config
snmcmillan Feb 19, 2020
974981e
Update x220.config
snmcmillan Feb 19, 2020
18b92b3
Update librem15v3.config
snmcmillan Feb 19, 2020
a0fb861
Update librem15v4.config
snmcmillan Feb 19, 2020
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
1 change: 1 addition & 0 deletions boards/kgpe-d16/kgpe-d16.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,5 @@ export CONFIG_BOOT_KERNEL_REMOVE=""
export CONFIG_BOOT_DEV="/dev/sda1"
export CONFIG_USB_BOOT_DEV="/dev/sdb1"
export CONFIG_BOOT_RECOVERY_SERIAL="/dev/ttyS0"
export FLASHROM_OPTIONS='--force --noverify -p internal'
#export CONFIG_BOOT_STATIC_IP=192.168.1.2
1 change: 1 addition & 0 deletions boards/librem13v2/librem13v2.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,4 @@ export CONFIG_BOOT_GUI_MENU_NAME="Purism Librem 13v2 Heads Boot Menu"
export CONFIG_USB_BOOT_DEV="/dev/sdb1"
export CONFIG_WARNING_BG_COLOR="--background-gradient 0 0 0 150 125 0"
export CONFIG_ERROR_BG_COLOR="--background-gradient 0 0 0 150 0 0"
export FLASHROM_OPTIONS='-p internal:laptop=force_I_want_a_brick,ich_spi_mode=hwseq'
1 change: 1 addition & 0 deletions boards/librem13v4/librem13v4.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,4 @@ export CONFIG_BOOT_GUI_MENU_NAME="Purism Librem 13v2 Heads Boot Menu"
export CONFIG_USB_BOOT_DEV="/dev/sdb1"
export CONFIG_WARNING_BG_COLOR="--background-gradient 0 0 0 150 125 0"
export CONFIG_ERROR_BG_COLOR="--background-gradient 0 0 0 150 0 0"
export FLASHROM_OPTIONS='-p internal:laptop=force_I_want_a_brick,ich_spi_mode=hwseq'
1 change: 1 addition & 0 deletions boards/librem15v3/librem15v3.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,4 @@ export CONFIG_BOOT_GUI_MENU_NAME="Purism Librem 15v3 Heads Boot Menu"
export CONFIG_USB_BOOT_DEV="/dev/sdb1"
export CONFIG_WARNING_BG_COLOR="--background-gradient 0 0 0 150 125 0"
export CONFIG_ERROR_BG_COLOR="--background-gradient 0 0 0 150 0 0"
export FLASHROM_OPTIONS='-p internal:laptop=force_I_want_a_brick,ich_spi_mode=hwseq'
1 change: 1 addition & 0 deletions boards/librem15v4/librem15v4.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,4 @@ export CONFIG_BOOT_GUI_MENU_NAME="Purism Librem 15v4 Heads Boot Menu"
export CONFIG_USB_BOOT_DEV="/dev/sdb1"
export CONFIG_WARNING_BG_COLOR="--background-gradient 0 0 0 150 125 0"
export CONFIG_ERROR_BG_COLOR="--background-gradient 0 0 0 150 0 0"
export FLASHROM_OPTIONS='-p internal:laptop=force_I_want_a_brick,ich_spi_mode=hwseq'
1 change: 1 addition & 0 deletions boards/x220/x220.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,4 @@ export CONFIG_BOOT_KERNEL_ADD="intel_iommu=on"
export CONFIG_BOOT_KERNEL_REMOVE="quiet"
export CONFIG_BOOT_DEV="/dev/sda1"
export CONFIG_USB_BOOT_DEV="/dev/sdb1"
export FLASHROM_OPTIONS='--force --noverify-all -p internal:laptop=force_I_want_a_brick,ich_spi_mode=hwseq --ifd --image bios'
1 change: 1 addition & 0 deletions boards/x230-flash/x230-flash.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ CONFIG_LINUX_E1000E=y

export CONFIG_USB_BOOT_DEV="/dev/sdb1"
export CONFIG_BOOTSCRIPT=/bin/x230-flash.init
export FLASHROM_OPTIONS='--force --noverify-all -p internal:laptop=force_I_want_a_brick,ich_spi_mode=hwseq --ifd --image bios'

# This board is "special" in that we only want the top 4 MB of the ROM
# for flashing into SPI flash 1 on the mainboard. This is enough to
Expand Down
1 change: 1 addition & 0 deletions boards/x230/x230.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ export CONFIG_BOOT_GUI_MENU_NAME="Thinkpad X230 Heads Boot Menu"
export CONFIG_USB_BOOT_DEV="/dev/sdb1"
export CONFIG_WARNING_BG_COLOR="--background-gradient 0 0 0 150 125 0"
export CONFIG_ERROR_BG_COLOR="--background-gradient 0 0 0 150 0 0"
export FLASHROM_OPTIONS='--force --noverify-all -p internal:laptop=force_I_want_a_brick,ich_spi_mode=hwseq --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
Expand Down
12 changes: 3 additions & 9 deletions initrd/bin/flash.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,9 @@ set -e -o pipefail
. /etc/functions
. /tmp/config

case "$CONFIG_BOARD" in
librem* )
FLASHROM_OPTIONS='-p internal:laptop=force_I_want_a_brick,ich_spi_mode=hwseq'
;;
x230* )
FLASHROM_OPTIONS='--force --noverify-all --programmer internal --ifd --image bios'
;;
"kgpe-d16" )
FLASHROM_OPTIONS='--force --noverify --programmer internal'
case "$FLASHROM_OPTIONS" in
-* )
Comment thread
snmcmillan marked this conversation as resolved.
echo "Board $CONFIG_BOARD detected, continuing..."
;;
* )
die "ERROR: No board has been configured!\n\nEach board requires specific flashrom options and it's unsafe to flash without them.\n\nAborting."
Expand Down