From dd3a1f4e69ffe693ddafa211d29f8b316dc3d6e2 Mon Sep 17 00:00:00 2001 From: Thierry Laurion Date: Mon, 26 Jul 2021 11:41:28 -0400 Subject: [PATCH] xx20/xx30 boards uniformisation when switching to coreboot 4.13 - all: coreboot NO_POST for all boards - all: coreboot NO_GFX_INIT (linux payload does the graphic init) - all: coreboot TPM_MEASURED_BOOT (no more patches under Heads for measured boot) - all: coreboot DRIVERS_PS2_KEYBOARD (fixes no keyboard on soft reboot and potentially xx30t xx20t fix for random raw keyboard (to be tested) - all: coreboot removal of DEFAULT_CONSOLE_LOGLEVEL_5 under some boards - all: coreboot removal of "loglevel=3" under some linux command line options booting Heads kernel - all: coreboot removal of DEBUG_SMM_RELOCATION (unneeded) - all: coreboot INCLUDE_CONFIG_FILE and COLLECT_TIMESTAMPS for all boards - all: coreboot CONSOLE_SERIAL present on all boards - all: coreboot add VBT - all: board configs switch to cryptsetup2 xx20 hotp-maximized boards: - removal of dropbear (not enough space to have htop + dropbear) txx0 boards coreboot: - USE_OPTION_TABLE and STATIC_OPTION_TABLE added (todo: check T430 boards optimization and find issue/PR and ammend this commit) --- .../t420-hotp-maximized.config | 6 +++--- boards/t420-maximized/t420-maximized.config | 6 ++---- .../t430-hotp-maximized.config | 4 ++-- boards/t430-maximized/t430-maximized.config | 6 +++--- .../x220-hotp-maximized.config | 8 +++---- boards/x220-maximized/x220-maximized.config | 6 +++--- .../x230-hotp-maximized.config | 2 +- boards/x230-maximized/x230-maximized.config | 4 ++-- config/coreboot-t420-hotp-maximized.config | 21 ++++++++++--------- config/coreboot-t420-maximized.config | 21 ++++++++++--------- config/coreboot-t430-hotp-maximized.config | 21 ++++++++++--------- config/coreboot-t430-maximized.config | 21 ++++++++++--------- config/coreboot-x220-hotp-maximized.config | 21 ++++++++----------- config/coreboot-x220-maximized.config | 21 ++++++++----------- config/coreboot-x230-hotp-maximized.config | 2 +- config/coreboot-x230-maximized.config | 2 +- 16 files changed, 84 insertions(+), 88 deletions(-) diff --git a/boards/t420-hotp-maximized/t420-hotp-maximized.config b/boards/t420-hotp-maximized/t420-hotp-maximized.config index 5ebed1088..e052bc4c9 100644 --- a/boards/t420-hotp-maximized/t420-hotp-maximized.config +++ b/boards/t420-hotp-maximized/t420-hotp-maximized.config @@ -1,4 +1,4 @@ -# Configuration for a T420 running Qubes and other Linux Based OSes (through kexec) +# Configuration for a T420 running Qubes 4.1 and other Linux Based OSes (through kexec) # # Includes # - Deactivated+neutered ME and expended consequent IFD BIOS regions @@ -15,7 +15,7 @@ CONFIG_LINUX_CONFIG=config/linux-x230.config CONFIG_LINUX_USB=y CONFIG_LINUX_E1000E=y -CONFIG_CRYPTSETUP=y +CONFIG_CRYPTSETUP2=y CONFIG_FLASHROM=y CONFIG_FLASHTOOLS=y CONFIG_GPG2=y @@ -48,7 +48,7 @@ CONFIG_FBWHIPTAIL=y #Additional tools: #SSH server (requires ethernet drivers, eg: CONFIG_LINUX_E1000E) -CONFIG_DROPBEAR=y +CONFIG_DROPBEAR=n export CONFIG_BOOTSCRIPT=/bin/gui-init export CONFIG_BOOT_REQ_HASH=n diff --git a/boards/t420-maximized/t420-maximized.config b/boards/t420-maximized/t420-maximized.config index e89948cbf..09c538746 100644 --- a/boards/t420-maximized/t420-maximized.config +++ b/boards/t420-maximized/t420-maximized.config @@ -1,11 +1,9 @@ -# Configuration for a T420 running Qubes and other Linux Based OSes (through kexec) +# Configuration for a T420 running Qubes 4.1 and other Linux Based OSes (through kexec) # # Includes # - Deactivated+neutered ME and expended consequent IFD BIOS regions # - Forged 00:DE:AD:C0:FF:EE MAC address (if not extracting gbe.bin from backup with blobs/xx20/extract.sh) # - Note that this MAC address can be modified under build/coreboot-VER/util/bincfg/gbe-82579LM.set -# -# - Includes Nitrokey/Librem Key HOTP Security dongle remote attestation (in addition to TOTP remote attestation through Qr Code) export CONFIG_COREBOOT=y export CONFIG_COREBOOT_VERSION=4.13 export CONFIG_LINUX_VERSION=4.14.62 @@ -17,7 +15,7 @@ CONFIG_LINUX_CONFIG=config/linux-x230.config CONFIG_LINUX_USB=y CONFIG_LINUX_E1000E=y -CONFIG_CRYPTSETUP=y +CONFIG_CRYPTSETUP2=y CONFIG_FLASHROM=y CONFIG_FLASHTOOLS=y CONFIG_GPG2=y diff --git a/boards/t430-hotp-maximized/t430-hotp-maximized.config b/boards/t430-hotp-maximized/t430-hotp-maximized.config index 5a92ca0dc..5a1bc2696 100644 --- a/boards/t430-hotp-maximized/t430-hotp-maximized.config +++ b/boards/t430-hotp-maximized/t430-hotp-maximized.config @@ -1,4 +1,4 @@ -# Configuration for a T430 running Qubes and other Linux Based OSes (through kexec) +# Configuration for a T430 running Qubes 4.1 and other Linux Based OSes (through kexec) # # Includes # - Deactivated+neutered ME and expanded consequent IFD BIOS regions @@ -7,7 +7,7 @@ # # - Includes Nitrokey/Librem Key HOTP Security dongle remote attestation (in addition to TOTP remote attestation through Qr Code) export CONFIG_COREBOOT=y -export CONFIG_COREBOOT_VERSION=4.8.1 +export CONFIG_COREBOOT_VERSION=4.13 export CONFIG_LINUX_VERSION=4.14.62 CONFIG_COREBOOT_CONFIG=config/coreboot-t430-hotp-maximized.config diff --git a/boards/t430-maximized/t430-maximized.config b/boards/t430-maximized/t430-maximized.config index a1bf3b8f1..b7d6bfcd1 100644 --- a/boards/t430-maximized/t430-maximized.config +++ b/boards/t430-maximized/t430-maximized.config @@ -1,4 +1,4 @@ -# Configuration for a T430 running Qubes and other Linux Based OSes (through kexec) +# Configuration for a T430 running Qubes 4.1 and other Linux Based OSes (through kexec) # # Includes # - Deactivated+neutered ME and expanded consequent IFD BIOS regions @@ -7,7 +7,7 @@ # # - DOES NOT INCLUDE Nitrokey/Librem Key HOTP Security dongle remote attestation (in addition to TOTP remote attestation through Qr Code) export CONFIG_COREBOOT=y -export CONFIG_COREBOOT_VERSION=4.8.1 +export CONFIG_COREBOOT_VERSION=4.13 export CONFIG_LINUX_VERSION=4.14.62 CONFIG_COREBOOT_CONFIG=config/coreboot-t430-maximized.config @@ -17,7 +17,7 @@ CONFIG_LINUX_CONFIG=config/linux-x230.config CONFIG_LINUX_USB=y CONFIG_LINUX_E1000E=y -CONFIG_CRYPTSETUP=y +CONFIG_CRYPTSETUP2=y CONFIG_FLASHROM=y CONFIG_FLASHTOOLS=y CONFIG_GPG2=y diff --git a/boards/x220-hotp-maximized/x220-hotp-maximized.config b/boards/x220-hotp-maximized/x220-hotp-maximized.config index 331033548..2a118eec8 100644 --- a/boards/x220-hotp-maximized/x220-hotp-maximized.config +++ b/boards/x220-hotp-maximized/x220-hotp-maximized.config @@ -1,11 +1,11 @@ -# Configuration for a X220 running Qubes and other Linux Based OSes (through kexec) +# Configuration for a X220 running Qubes 4.1 and other Linux Based OSes (through kexec) # # Includes # - Deactivated+neutered ME and expended consequent IFD BIOS regions # - Forged 00:DE:AD:C0:FF:EE MAC address (if not extracting gbe.bin from backup with blobs/xx20/extract.sh) # - Note that this MAC address can be modified under build/coreboot-VER/util/bincfg/gbe-82579LM.set export CONFIG_COREBOOT=y -export CONFIG_COREBOOT_VERSION=4.8.1 +export CONFIG_COREBOOT_VERSION=4.13 export CONFIG_LINUX_VERSION=4.14.62 CONFIG_COREBOOT_CONFIG=config/coreboot-x220-hotp-maximized.config @@ -15,7 +15,7 @@ CONFIG_LINUX_CONFIG=config/linux-x230.config CONFIG_LINUX_USB=y CONFIG_LINUX_E1000E=y -CONFIG_CRYPTSETUP=y +CONFIG_CRYPTSETUP2=y CONFIG_FLASHROM=y CONFIG_FLASHTOOLS=y CONFIG_GPG2=y @@ -48,7 +48,7 @@ CONFIG_FBWHIPTAIL=y #Additional tools: #SSH server (requires ethernet drivers, eg: CONFIG_LINUX_E1000E) -CONFIG_DROPBEAR=y +CONFIG_DROPBEAR=n export CONFIG_BOOTSCRIPT=/bin/gui-init export CONFIG_BOOT_REQ_HASH=n diff --git a/boards/x220-maximized/x220-maximized.config b/boards/x220-maximized/x220-maximized.config index 6d16697f9..cd1478023 100644 --- a/boards/x220-maximized/x220-maximized.config +++ b/boards/x220-maximized/x220-maximized.config @@ -1,11 +1,11 @@ -# Configuration for a X220 running Qubes and other Linux Based OSes (through kexec) +# Configuration for a X220 running Qubes 4.1 and other Linux Based OSes (through kexec) # # Includes # - Deactivated+neutered ME and expended consequent IFD BIOS regions # - Forged 00:DE:AD:C0:FF:EE MAC address (if not extracting gbe.bin from backup with blobs/xx20/extract.sh) # - Note that this MAC address can be modified under build/coreboot-VER/util/bincfg/gbe-82579LM.set export CONFIG_COREBOOT=y -export CONFIG_COREBOOT_VERSION=4.8.1 +export CONFIG_COREBOOT_VERSION=4.13 export CONFIG_LINUX_VERSION=4.14.62 CONFIG_COREBOOT_CONFIG=config/coreboot-x220-maximized.config @@ -15,7 +15,7 @@ CONFIG_LINUX_CONFIG=config/linux-x230.config CONFIG_LINUX_USB=y CONFIG_LINUX_E1000E=y -CONFIG_CRYPTSETUP=y +CONFIG_CRYPTSETUP2=y CONFIG_FLASHROM=y CONFIG_FLASHTOOLS=y CONFIG_GPG2=y diff --git a/boards/x230-hotp-maximized/x230-hotp-maximized.config b/boards/x230-hotp-maximized/x230-hotp-maximized.config index 247525f19..649956891 100644 --- a/boards/x230-hotp-maximized/x230-hotp-maximized.config +++ b/boards/x230-hotp-maximized/x230-hotp-maximized.config @@ -1,4 +1,4 @@ -# Configuration for a X230 running Qubes and other Linux Based OSes (through kexec) +# Configuration for a X230 running Qubes 4.1 and other Linux Based OSes (through kexec) # # Includes # - Deactivated+neutered ME and expanded consequent IFD BIOS regions diff --git a/boards/x230-maximized/x230-maximized.config b/boards/x230-maximized/x230-maximized.config index ee986241e..d951b94c3 100644 --- a/boards/x230-maximized/x230-maximized.config +++ b/boards/x230-maximized/x230-maximized.config @@ -1,4 +1,4 @@ -# Configuration for a X230 running Qubes and other Linux Based OSes (through kexec) +# Configuration for a X230 running Qubes 4.1 and other Linux Based OSes (through kexec) # # Includes # - Deactivated+neutered ME and expanded consequent IFD BIOS regions @@ -17,7 +17,7 @@ CONFIG_LINUX_CONFIG=config/linux-x230.config CONFIG_LINUX_USB=y CONFIG_LINUX_E1000E=y -CONFIG_CRYPTSETUP=y +CONFIG_CRYPTSETUP2=y CONFIG_FLASHROM=y CONFIG_FLASHTOOLS=y CONFIG_GPG2=y diff --git a/config/coreboot-t420-hotp-maximized.config b/config/coreboot-t420-hotp-maximized.config index 29b1cf3b0..8ee9f3a36 100644 --- a/config/coreboot-t420-hotp-maximized.config +++ b/config/coreboot-t420-hotp-maximized.config @@ -1,21 +1,22 @@ CONFIG_USE_BLOBS=y -CONFIG_TPM_MEASURED_BOOT=y +CONFIG_USE_OPTION_TABLE=y +CONFIG_STATIC_OPTION_TABLE=y CONFIG_VENDOR_LENOVO=y +CONFIG_NO_POST=y CONFIG_CBFS_SIZE=0x750000 -CONFIG_ONBOARD_VGA_IS_PRIMARY=y -CONFIG_HAVE_IFD_BIN=y -CONFIG_HAVE_ME_BIN=y -CONFIG_HAVE_GBE_BIN=y CONFIG_IFD_BIN_PATH="../../blobs/xx20/ifd.bin" CONFIG_ME_BIN_PATH="../../blobs/xx20/me.bin" +CONFIG_GBE_BIN_PATH="../../blobs/xx20/gbe.bin" +CONFIG_HAVE_IFD_BIN=y CONFIG_BOARD_LENOVO_T420=y +CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet" +CONFIG_UART_PCI_ADDR=0 +CONFIG_HAVE_ME_BIN=y +CONFIG_HAVE_GBE_BIN=y +CONFIG_NO_GFX_INIT=y CONFIG_DRIVERS_PS2_KEYBOARD=y -CONFIG_NO_POST=y -CONFIG_GBE_BIN_PATH="../../blobs/xx20/gbe.bin" +CONFIG_TPM_MEASURED_BOOT=y CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x80000 -CONFIG_DEFAULT_CONSOLE_LOGLEVEL_5=y CONFIG_PAYLOAD_LINUX=y CONFIG_PAYLOAD_FILE="../../build/t420-hotp-maximized/bzImage" -CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=3" CONFIG_LINUX_INITRD="../../build/t420-hotp-maximized/initrd.cpio.xz" -CONFIG_DEBUG_SMM_RELOCATION=y diff --git a/config/coreboot-t420-maximized.config b/config/coreboot-t420-maximized.config index 917385e6c..ddad909b6 100644 --- a/config/coreboot-t420-maximized.config +++ b/config/coreboot-t420-maximized.config @@ -1,21 +1,22 @@ CONFIG_USE_BLOBS=y -CONFIG_TPM_MEASURED_BOOT=y +CONFIG_USE_OPTION_TABLE=y +CONFIG_STATIC_OPTION_TABLE=y CONFIG_VENDOR_LENOVO=y +CONFIG_NO_POST=y CONFIG_CBFS_SIZE=0x750000 -CONFIG_ONBOARD_VGA_IS_PRIMARY=y -CONFIG_HAVE_IFD_BIN=y -CONFIG_HAVE_ME_BIN=y -CONFIG_HAVE_GBE_BIN=y CONFIG_IFD_BIN_PATH="../../blobs/xx20/ifd.bin" CONFIG_ME_BIN_PATH="../../blobs/xx20/me.bin" +CONFIG_GBE_BIN_PATH="../../blobs/xx20/gbe.bin" +CONFIG_HAVE_IFD_BIN=y CONFIG_BOARD_LENOVO_T420=y +CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet" +CONFIG_UART_PCI_ADDR=0 +CONFIG_HAVE_ME_BIN=y +CONFIG_HAVE_GBE_BIN=y +CONFIG_NO_GFX_INIT=y CONFIG_DRIVERS_PS2_KEYBOARD=y -CONFIG_NO_POST=y -CONFIG_GBE_BIN_PATH="../../blobs/xx20/gbe.bin" +CONFIG_TPM_MEASURED_BOOT=y CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x80000 -CONFIG_DEFAULT_CONSOLE_LOGLEVEL_5=y CONFIG_PAYLOAD_LINUX=y CONFIG_PAYLOAD_FILE="../../build/t420-maximized/bzImage" -CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=3" CONFIG_LINUX_INITRD="../../build/t420-maximized/initrd.cpio.xz" -CONFIG_DEBUG_SMM_RELOCATION=y diff --git a/config/coreboot-t430-hotp-maximized.config b/config/coreboot-t430-hotp-maximized.config index e647adca0..64ff4bb75 100644 --- a/config/coreboot-t430-hotp-maximized.config +++ b/config/coreboot-t430-hotp-maximized.config @@ -1,21 +1,22 @@ -CONFIG_MEASURED_BOOT=y +CONFIG_USE_BLOBS=y +CONFIG_USE_OPTION_TABLE=y +CONFIG_STATIC_OPTION_TABLE=y CONFIG_VENDOR_LENOVO=y +CONFIG_NO_POST=y CONFIG_CBFS_SIZE=0xB80000 -CONFIG_HAVE_IFD_BIN=y -CONFIG_HAVE_ME_BIN=y -CONFIG_HAVE_GBE_BIN=y CONFIG_IFD_BIN_PATH="../../blobs/xx30/ifd.bin" CONFIG_ME_BIN_PATH="../../blobs/xx30/me.bin" CONFIG_GBE_BIN_PATH="../../blobs/xx30/gbe.bin" +CONFIG_HAVE_IFD_BIN=y CONFIG_BOARD_LENOVO_THINKPAD_T430=y -CONFIG_NO_POST=y +CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet" CONFIG_UART_PCI_ADDR=0 -# CONFIG_CONSOLE_SERIAL is not set +CONFIG_HAVE_ME_BIN=y +CONFIG_HAVE_GBE_BIN=y +CONFIG_NO_GFX_INIT=y +CONFIG_DRIVERS_PS2_KEYBOARD=y +CONFIG_TPM_MEASURED_BOOT=y CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x80000 -CONFIG_DEFAULT_CONSOLE_LOGLEVEL_5=y CONFIG_PAYLOAD_LINUX=y CONFIG_PAYLOAD_FILE="../../build/t430-hotp-maximized/bzImage" -CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet" CONFIG_LINUX_INITRD="../../build/t430-hotp-maximized/initrd.cpio.xz" -CONFIG_USE_OPTION_TABLE=y -CONFIG_STATIC_OPTION_TABLE=y diff --git a/config/coreboot-t430-maximized.config b/config/coreboot-t430-maximized.config index e1a3aea44..1098c3989 100644 --- a/config/coreboot-t430-maximized.config +++ b/config/coreboot-t430-maximized.config @@ -1,21 +1,22 @@ -CONFIG_MEASURED_BOOT=y +CONFIG_USE_BLOBS=y +CONFIG_USE_OPTION_TABLE=y +CONFIG_STATIC_OPTION_TABLE=y CONFIG_VENDOR_LENOVO=y +CONFIG_NO_POST=y CONFIG_CBFS_SIZE=0xB80000 -CONFIG_HAVE_IFD_BIN=y -CONFIG_HAVE_ME_BIN=y -CONFIG_HAVE_GBE_BIN=y CONFIG_IFD_BIN_PATH="../../blobs/xx30/ifd.bin" CONFIG_ME_BIN_PATH="../../blobs/xx30/me.bin" CONFIG_GBE_BIN_PATH="../../blobs/xx30/gbe.bin" +CONFIG_HAVE_IFD_BIN=y CONFIG_BOARD_LENOVO_THINKPAD_T430=y -CONFIG_NO_POST=y +CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet" CONFIG_UART_PCI_ADDR=0 -# CONFIG_CONSOLE_SERIAL is not set +CONFIG_HAVE_ME_BIN=y +CONFIG_HAVE_GBE_BIN=y +CONFIG_NO_GFX_INIT=y +CONFIG_DRIVERS_PS2_KEYBOARD=y +CONFIG_TPM_MEASURED_BOOT=y CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x80000 -CONFIG_DEFAULT_CONSOLE_LOGLEVEL_5=y CONFIG_PAYLOAD_LINUX=y CONFIG_PAYLOAD_FILE="../../build/t430-maximized/bzImage" -CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet" CONFIG_LINUX_INITRD="../../build/t430-maximized/initrd.cpio.xz" -CONFIG_USE_OPTION_TABLE=y -CONFIG_STATIC_OPTION_TABLE=y diff --git a/config/coreboot-x220-hotp-maximized.config b/config/coreboot-x220-hotp-maximized.config index de5ea7682..b716c4f68 100644 --- a/config/coreboot-x220-hotp-maximized.config +++ b/config/coreboot-x220-hotp-maximized.config @@ -1,23 +1,20 @@ -# CONFIG_INCLUDE_CONFIG_FILE is not set -# CONFIG_COLLECT_TIMESTAMPS is not set CONFIG_USE_BLOBS=y -CONFIG_MEASURED_BOOT=y CONFIG_VENDOR_LENOVO=y +CONFIG_NO_POST=y CONFIG_CBFS_SIZE=0x750000 -CONFIG_ONBOARD_VGA_IS_PRIMARY=y -CONFIG_HAVE_IFD_BIN=y -CONFIG_HAVE_ME_BIN=y -CONFIG_HAVE_GBE_BIN=y CONFIG_IFD_BIN_PATH="../../blobs/xx20/ifd.bin" CONFIG_ME_BIN_PATH="../../blobs/xx20/me.bin" +CONFIG_GBE_BIN_PATH="../../blobs/xx20/gbe.bin" +CONFIG_HAVE_IFD_BIN=y CONFIG_BOARD_LENOVO_X220=y +CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet" +CONFIG_UART_PCI_ADDR=0 +CONFIG_HAVE_ME_BIN=y +CONFIG_HAVE_GBE_BIN=y +CONFIG_NO_GFX_INIT=y CONFIG_DRIVERS_PS2_KEYBOARD=y -CONFIG_NO_POST=y -CONFIG_GBE_BIN_PATH="../../blobs/xx20/gbe.bin" -#CONFIG_DEBUG_TPM=y +CONFIG_TPM_MEASURED_BOOT=y CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x80000 CONFIG_PAYLOAD_LINUX=y CONFIG_PAYLOAD_FILE="../../build/x220-hotp-maximized/bzImage" -CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=3" CONFIG_LINUX_INITRD="../../build/x220-hotp-maximized/initrd.cpio.xz" -CONFIG_DEBUG_SMM_RELOCATION=y diff --git a/config/coreboot-x220-maximized.config b/config/coreboot-x220-maximized.config index 7692d3f6f..6cd9fa0be 100644 --- a/config/coreboot-x220-maximized.config +++ b/config/coreboot-x220-maximized.config @@ -1,23 +1,20 @@ -# CONFIG_INCLUDE_CONFIG_FILE is not set -# CONFIG_COLLECT_TIMESTAMPS is not set CONFIG_USE_BLOBS=y -CONFIG_MEASURED_BOOT=y CONFIG_VENDOR_LENOVO=y +CONFIG_NO_POST=y CONFIG_CBFS_SIZE=0x750000 -CONFIG_ONBOARD_VGA_IS_PRIMARY=y -CONFIG_HAVE_IFD_BIN=y -CONFIG_HAVE_ME_BIN=y -CONFIG_HAVE_GBE_BIN=y CONFIG_IFD_BIN_PATH="../../blobs/xx20/ifd.bin" CONFIG_ME_BIN_PATH="../../blobs/xx20/me.bin" +CONFIG_GBE_BIN_PATH="../../blobs/xx20/gbe.bin" +CONFIG_HAVE_IFD_BIN=y CONFIG_BOARD_LENOVO_X220=y +CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet" +CONFIG_UART_PCI_ADDR=0 +CONFIG_HAVE_ME_BIN=y +CONFIG_HAVE_GBE_BIN=y +CONFIG_NO_GFX_INIT=y CONFIG_DRIVERS_PS2_KEYBOARD=y -CONFIG_NO_POST=y -CONFIG_GBE_BIN_PATH="../../blobs/xx20/gbe.bin" -#CONFIG_DEBUG_TPM=y +CONFIG_TPM_MEASURED_BOOT=y CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x80000 CONFIG_PAYLOAD_LINUX=y CONFIG_PAYLOAD_FILE="../../build/x220-maximized/bzImage" -CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=3" CONFIG_LINUX_INITRD="../../build/x220-maximized/initrd.cpio.xz" -CONFIG_DEBUG_SMM_RELOCATION=y diff --git a/config/coreboot-x230-hotp-maximized.config b/config/coreboot-x230-hotp-maximized.config index c792d1aa9..d59e790c8 100644 --- a/config/coreboot-x230-hotp-maximized.config +++ b/config/coreboot-x230-hotp-maximized.config @@ -1,3 +1,4 @@ +CONFIG_USE_BLOBS=y CONFIG_VENDOR_LENOVO=y CONFIG_NO_POST=y CONFIG_CBFS_SIZE=0xB80000 @@ -14,7 +15,6 @@ CONFIG_NO_GFX_INIT=y CONFIG_DRIVERS_PS2_KEYBOARD=y CONFIG_TPM_MEASURED_BOOT=y CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x80000 -CONFIG_DEFAULT_CONSOLE_LOGLEVEL_5=y CONFIG_PAYLOAD_LINUX=y CONFIG_PAYLOAD_FILE="../../build/x230-hotp-maximized/bzImage" CONFIG_LINUX_INITRD="../../build/x230-hotp-maximized/initrd.cpio.xz" diff --git a/config/coreboot-x230-maximized.config b/config/coreboot-x230-maximized.config index 622d439ee..4648a9541 100644 --- a/config/coreboot-x230-maximized.config +++ b/config/coreboot-x230-maximized.config @@ -1,3 +1,4 @@ +CONFIG_USE_BLOBS=y CONFIG_VENDOR_LENOVO=y CONFIG_NO_POST=y CONFIG_CBFS_SIZE=0xB80000 @@ -14,7 +15,6 @@ CONFIG_NO_GFX_INIT=y CONFIG_DRIVERS_PS2_KEYBOARD=y CONFIG_TPM_MEASURED_BOOT=y CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x80000 -CONFIG_DEFAULT_CONSOLE_LOGLEVEL_5=y CONFIG_PAYLOAD_LINUX=y CONFIG_PAYLOAD_FILE="../../build/x230-maximized/bzImage" CONFIG_LINUX_INITRD="../../build/x230-maximized/initrd.cpio.xz"