boards: add vboot Sandy Bridge targets

added targets:
- vboot-x220 (Lenovo Thinkpad X220)
- vboot-t420 (Lenovo Thinkpad T420)

Move linux-x230.config to linux-thinkpad.config, so can be used
as generic linux kernel for all Thinkpads.

Signed-off-by: Marcello Sylvester Bauer <sylv@sylv.io>

boards/t420/t420.config

@@ -1,7 +1,7 @@
 # Configuration for a T420 running Qubes and other OS, T420 is identical to X230 on the Linux Side of things.
 export CONFIG_COREBOOT=y
 CONFIG_COREBOOT_CONFIG=config/coreboot-t420.config
-CONFIG_LINUX_CONFIG=config/linux-x230.config
+CONFIG_LINUX_CONFIG=config/linux-thinkpad.config
 
 CONFIG_CRYPTSETUP=y
 CONFIG_FLASHROM=y

boards/vboot-t420/vboot-t420.config

@@ -0,0 +1,36 @@
+# Configuration for a t420 running Qubes and other OSes
+export CONFIG_COREBOOT=y
+CONFIG_COREBOOT_CONFIG=config/coreboot-vboot-t420.config
+CONFIG_LINUX_CONFIG=config/linux-thinkpad.config
+
+CONFIG_CRYPTSETUP=y
+CONFIG_FLASHROM=y
+CONFIG_FLASHTOOLS=y
+CONFIG_GPG2=y
+CONFIG_KEXEC=y
+CONFIG_UTIL_LINUX=y
+CONFIG_LVM2=y
+CONFIG_MBEDTLS=y
+CONFIG_PCIUTILS=y
+CONFIG_POPT=y
+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_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 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_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 CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal:laptop=force_I_want_a_brick,ich_spi_mode=hwseq --ifd --image bios"

boards/vboot-x220/vboot-x220.config

@@ -0,0 +1,36 @@
+# Configuration for a x230 running Qubes and other OSes
+export CONFIG_COREBOOT=y
+CONFIG_COREBOOT_CONFIG=config/coreboot-vboot-x220.config
+CONFIG_LINUX_CONFIG=config/linux-thinkpad.config
+
+CONFIG_CRYPTSETUP=y
+CONFIG_FLASHROM=y
+CONFIG_FLASHTOOLS=y
+CONFIG_GPG2=y
+CONFIG_KEXEC=y
+CONFIG_UTIL_LINUX=y
+CONFIG_LVM2=y
+CONFIG_MBEDTLS=y
+CONFIG_PCIUTILS=y
+CONFIG_POPT=y
+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_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 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_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 CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal:laptop=force_I_want_a_brick,ich_spi_mode=hwseq --ifd --image bios"

boards/x220/x220.config

@@ -1,7 +1,7 @@
 # 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_LINUX_CONFIG=config/linux-thinkpad.config
 
 CONFIG_CRYPTSETUP=y
 CONFIG_FLASHROM=y

boards/x230-flash/x230-flash.config

@@ -11,7 +11,7 @@ CONFIG_PCIUTILS=y
 #CONFIG_TPMTOTP=y
 #CONFIG_DROPBEAR=y
 
-CONFIG_LINUX_CONFIG=config/linux-x230-flash.config
+CONFIG_LINUX_CONFIG=config/linux-thinkpad.config
 CONFIG_LINUX_USB=y
 CONFIG_LINUX_E1000E=y
 

boards/x230/x230.config

@@ -1,7 +1,7 @@
 # Configuration for a x230 running Qubes and other OSes
 export CONFIG_COREBOOT=y
 CONFIG_COREBOOT_CONFIG=config/coreboot-x230.config
-CONFIG_LINUX_CONFIG=config/linux-x230.config
+CONFIG_LINUX_CONFIG=config/linux-thinkpad.config
 
 CONFIG_CRYPTSETUP=y
 CONFIG_FLASHROM=y

config/coreboot-vboot-t420.config

@@ -0,0 +1,20 @@
+CONFIG_LOCALVERSION="heads"
+CONFIG_VENDOR_LENOVO=y
+CONFIG_FMDFILE="../../fmaps/8MiB_vboot-ro-minimal_me.fmd"
+CONFIG_VBOOT=y
+# CONFIG_VBOOT_SLOTS_RW_A is not set
+CONFIG_IFD_BIN_PATH="../../blobs/t420/ifd-minimal_me.bin"
+CONFIG_ME_BIN_PATH="../../blobs/t420/minimal_me.bin"
+CONFIG_HAVE_IFD_BIN=y
+CONFIG_BOARD_LENOVO_T420=y
+CONFIG_VALIDATE_INTEL_DESCRIPTOR=y
+CONFIG_HAVE_ME_BIN=y
+CONFIG_CHECK_ME=y
+CONFIG_HAVE_GBE_BIN=y
+CONFIG_GBE_BIN_PATH="../../blobs/t420/gbe.bin"
+CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
+CONFIG_VBOOT_MEASURED_BOOT=y
+CONFIG_DEFAULT_CONSOLE_LOGLEVEL_5=y
+CONFIG_PAYLOAD_LINUX=y
+CONFIG_PAYLOAD_FILE="../../build/vboot-t420/bzImage"
+CONFIG_LINUX_INITRD="../../build/vboot-t420/initrd.cpio.xz"

config/coreboot-vboot-x220.config

@@ -0,0 +1,20 @@
+CONFIG_LOCALVERSION="heads"
+CONFIG_VENDOR_LENOVO=y
+CONFIG_FMDFILE="../../fmaps/8MiB_vboot-ro-minimal_me.fmd"
+CONFIG_VBOOT=y
+# CONFIG_VBOOT_SLOTS_RW_A is not set
+CONFIG_IFD_BIN_PATH="../../blobs/x220/ifd-minimal_me.bin"
+CONFIG_ME_BIN_PATH="../../blobs/x220/minimal_me.bin"
+CONFIG_HAVE_IFD_BIN=y
+CONFIG_BOARD_LENOVO_X220=y
+CONFIG_VALIDATE_INTEL_DESCRIPTOR=y
+CONFIG_HAVE_ME_BIN=y
+CONFIG_CHECK_ME=y
+CONFIG_HAVE_GBE_BIN=y
+CONFIG_GBE_BIN_PATH="../../blobs/x220/gbe.bin"
+CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
+CONFIG_VBOOT_MEASURED_BOOT=y
+CONFIG_DEFAULT_CONSOLE_LOGLEVEL_5=y
+CONFIG_PAYLOAD_LINUX=y
+CONFIG_PAYLOAD_FILE="../../build/vboot-x220/bzImage"
+CONFIG_LINUX_INITRD="../../build/vboot-x220/initrd.cpio.xz"