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

T420 initial support + X220 FBWhiptail Support #578

Merged
merged 33 commits into from
Feb 19, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
662a1dd
Add support for the Lenovo ThinkPad T420.
snmcmillan Mar 20, 2019
94e6e09
Fix the autodetection of ifdtool and me_cleaner.
snmcmillan Mar 20, 2019
be21220
Whoops, added the entire directory!
snmcmillan Mar 20, 2019
d38190e
Actually point to the T420 coreboot config file...
snmcmillan Mar 20, 2019
f2bdd98
Merge branch 'master' of https://github.com/SebastianMcMillan/heads
snmcmillan Mar 20, 2019
62d6a6c
Enable FBWhiptail mode for X220 and T420
snmcmillan Mar 26, 2019
6fb0a9d
Don't use iommu settings because it breaks graphics after kexec.
snmcmillan Mar 27, 2019
41e5301
Remove sandybridge patches. Causes 50 second delay when booting up, r…
snmcmillan Mar 27, 2019
584690f
Fixed TPM romstage measurements.
snmcmillan Mar 27, 2019
04d7df7
Turn on iommu, but do not enable igfx-off
snmcmillan Mar 27, 2019
cb74314
Revert "Fixed TPM romstage measurements."
snmcmillan Mar 28, 2019
04b59d2
Revert "Remove sandybridge patches. Causes 50 second delay when booti…
snmcmillan Mar 28, 2019
fe03f79
One more thing: Add flash.sh definitions for X220 and T420.
snmcmillan Mar 28, 2019
f17c519
Required SPI flash chip option to flahs internally
tlaurion Apr 9, 2019
5a437ea
Temporary coreboot config required to debug through cbmem under heads
tlaurion Apr 9, 2019
f3c8a2d
Revert "Required SPI flash chip option to flahs internally"
tlaurion Apr 9, 2019
68e2c76
Merge pull request #2 from tlaurion/x220_cbmem_temp_debug_requirements
snmcmillan Apr 9, 2019
1e705eb
Update flash.sh
snmcmillan Jun 7, 2019
3c0899f
Update x220.config
snmcmillan Jun 7, 2019
e356d2d
Update coreboot-x220.config
snmcmillan Jun 7, 2019
f60fd69
Update coreboot-x220.config
snmcmillan Jun 7, 2019
fe30018
Update x220.config
snmcmillan Jul 6, 2019
adc9f0a
Update t420.config
snmcmillan Jul 6, 2019
9b3da5b
Revert "Update flash.sh"
snmcmillan Jul 6, 2019
0e1f36b
Revert "One more thing: Add flash.sh definitions for X220 and T420."
snmcmillan Jul 6, 2019
6c7a2ff
Update t420.config
snmcmillan Feb 19, 2020
d8c018c
Update t420.config
snmcmillan Feb 19, 2020
dbdf051
Update coreboot-t420.config
snmcmillan Feb 19, 2020
52df283
Update coreboot-x220.config
snmcmillan Feb 19, 2020
5c5bca0
Update t420.config
snmcmillan Feb 19, 2020
e1e3418
Update x220.config
snmcmillan Feb 19, 2020
bac3936
Merge branch 'master' into t420-initial-support
tlaurion Feb 19, 2020
4afa41b
Remove space in x220 board config prior of FLASHROM_OPTIONS
tlaurion 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
18 changes: 12 additions & 6 deletions boards/t420/t420.config
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# Configuration for a T420 running Qubes and other OS
# The Linux configuration is close enough to the x230
# Configuration for a T420 running Qubes and other OS, X220 is identical to X230 on the Linux Side of things.
export CONFIG_COREBOOT=y
CONFIG_COREBOOT_CONFIG=config/coreboot-t420.config
CONFIG_COREBOOT_CONFIG=config/coreboot-T420.config
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

really uppercase T?

CONFIG_LINUX_CONFIG=config/linux-x230.config
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if correct, we should add a comment, why, I think

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is correct. If the already existing X220 is close enough to X230, and T420 is close enough to X220, T420 is close enough to X230.

Tested on my T420 as working.


CONFIG_CRYPTSETUP=y
CONFIG_FLASHROM=y
CONFIG_GPG=y
CONFIG_FLASHTOOLS=y
CONFIG_GPG2=y
CONFIG_KEXEC=y
CONFIG_UTIL_LINUX=y
CONFIG_LVM2=y
Expand All @@ -17,14 +17,20 @@ CONFIG_QRENCODE=y
CONFIG_TPMTOTP=y
CONFIG_DROPBEAR=y

CONFIG_CAIRO=y
CONFIG_FBWHIPTAIL=y

CONFIG_LINUX_USB=y
CONFIG_LINUX_E1000E=y

export CONFIG_BOOTSCRIPT=/bin/generic-init
export CONFIG_TPM=y
export CONFIG_BOOTSCRIPT=/bin/gui-init
export CONFIG_BOOT_REQ_HASH=n
export CONFIG_BOOT_REQ_ROLLBACK=n
export CONFIG_BOOT_KERNEL_ADD="intel_iommu=on"
export CONFIG_BOOT_KERNEL_ADD="intel_iommu=on intel_iommu=igfx_off"
export CONFIG_BOOT_KERNEL_REMOVE="quiet"
export CONFIG_BOOT_DEV="/dev/sda1"
export CONFIG_BOOT_GUI_MENU_NAME="ThinkPad T420 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"
16 changes: 11 additions & 5 deletions boards/x220/x220.config
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# Configuration for a x220 running Qubes and other OS
# The Linux configuration is close enough to the x230
# Configuration for a x220 running Qubes and other OS, X220 is identical to X230 on the Linux Side of things.
export CONFIG_COREBOOT=y
CONFIG_COREBOOT_CONFIG=config/coreboot-x220.config
CONFIG_LINUX_CONFIG=config/linux-x230.config

CONFIG_CRYPTSETUP=y
CONFIG_FLASHROM=y
CONFIG_GPG=y
CONFIG_FLASHTOOLS=y
CONFIG_GPG2=y
CONFIG_KEXEC=y
CONFIG_UTIL_LINUX=y
CONFIG_LVM2=y
Expand All @@ -17,14 +17,20 @@ CONFIG_QRENCODE=y
CONFIG_TPMTOTP=y
CONFIG_DROPBEAR=y

CONFIG_CAIRO=y
CONFIG_FBWHIPTAIL=y

CONFIG_LINUX_USB=y
CONFIG_LINUX_E1000E=y

export CONFIG_BOOTSCRIPT=/bin/generic-init
export CONFIG_TPM=y
export CONFIG_BOOTSCRIPT=/bin/gui-init
export CONFIG_BOOT_REQ_HASH=n
export CONFIG_BOOT_REQ_ROLLBACK=n
export CONFIG_BOOT_KERNEL_ADD="intel_iommu=on"
export CONFIG_BOOT_KERNEL_ADD="intel_iommu=on intel_iommu=igfx_off"
export CONFIG_BOOT_KERNEL_REMOVE="quiet"
export CONFIG_BOOT_DEV="/dev/sda1"
export CONFIG_BOOT_GUI_MENU_NAME="ThinkPad X220 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"