Include x220 files of PR linuxboot#578

boards/x220/x220.config

@@ -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
@@ -17,14 +17,21 @@ 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"
+export FLASHROM_OPTIONS='--force --noverify-all -p internal --ifd --image bios -c MX25L6405D'

config/coreboot-x220.config

@@ -16,10 +16,10 @@ CONFIG_DRIVERS_PS2_KEYBOARD=y
 CONFIG_NO_POST=y
 CONFIG_CHECK_ME=y
 CONFIG_GBE_BIN_PATH="../../blobs/x220/gbe.bin"
+#CONFIG_DEBUG_TPM=y
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x80000
-CONFIG_DEFAULT_CONSOLE_LOGLEVEL_5=y
 CONFIG_PAYLOAD_LINUX=y
 CONFIG_PAYLOAD_FILE="../../build/x220/bzImage"
-CONFIG_LINUX_COMMAND_LINE="quiet"
+CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=3"
 CONFIG_LINUX_INITRD="../../build/x220/initrd.cpio.xz"
 CONFIG_DEBUG_SMM_RELOCATION=y