From 30852aa2739e71ed8c2c889cae91ef3995cfe75a Mon Sep 17 00:00:00 2001 From: tlaurion Date: Mon, 19 Oct 2020 12:50:24 -0400 Subject: [PATCH] xx30 boards: suspend/resume fix (#838) * x230-hotp-verification: revert to coreboot "CONFIG_CBFS_SIZE=0x700000" by disabling board "CONFIG_DROPBEAR=y" and "CONFIG_LINUX_E1000E" to save space per @alex-nitrokey test under #770 to fix #608 * x230-htop-verification board: add clarifications on x230 board differences. Fixes #737 #770 #608 * X230 board & coreboot config: Fix x230 board, removing dropbear and e1000e driver. * t430: board and coreboot config par with x230 to circumvent CBFS linked suspend/resume issues. --- boards/t430/t430.config | 17 +++++++++++++++-- .../x230-hotp-verification.config | 16 +++++++++++++--- boards/x230/x230.config | 14 ++++++++++++-- config/coreboot-t430.config | 13 ++----------- config/coreboot-x230-hotp-verification.config | 2 +- config/coreboot-x230.config | 14 ++------------ 6 files changed, 45 insertions(+), 31 deletions(-) diff --git a/boards/t430/t430.config b/boards/t430/t430.config index dde673299..45585b167 100644 --- a/boards/t430/t430.config +++ b/boards/t430/t430.config @@ -1,4 +1,9 @@ # Configuration for a t430 running Qubes and other OSes +# STATIC_OPTION_TABLE is set inside of coreboot config +# +# Deactivated to fit in coreboot's CONFIG_CBFS_SIZE=0x700000 : +# dropbear support(ssh client/server) +# e1000e (ethernet driver) export CONFIG_COREBOOT=y export CONFIG_COREBOOT_VERSION=4.8.1 export CONFIG_LINUX_VERSION=4.14.62 @@ -18,13 +23,21 @@ CONFIG_PCIUTILS=y CONFIG_POPT=y CONFIG_QRENCODE=y CONFIG_TPMTOTP=y -CONFIG_DROPBEAR=y +#Whiptail in console mode +#CONFIG_SLANG=y +#CONFIG_NEWT=y + +#whiptail in graphical mode CONFIG_CAIRO=y CONFIG_FBWHIPTAIL=y CONFIG_LINUX_USB=y -CONFIG_LINUX_E1000E=y + +#SSH client/server +CONFIG_DROPBEAR=n +#Ethernet driver (Heads only) +CONFIG_LINUX_E1000E=n export CONFIG_TPM=y export CONFIG_BOOTSCRIPT=/bin/gui-init diff --git a/boards/x230-hotp-verification/x230-hotp-verification.config b/boards/x230-hotp-verification/x230-hotp-verification.config index 5eef5868c..9138ddf57 100644 --- a/boards/x230-hotp-verification/x230-hotp-verification.config +++ b/boards/x230-hotp-verification/x230-hotp-verification.config @@ -1,5 +1,12 @@ # Configuration for a x230-hotp-verification (Nitrokey/Purism USB Security dongle enabled HOTP support) -# running Qubes and other OSes +# running Qubes and other OSes. +# +# Deactivated to fit in coreboot's CONFIG_CBFS_SIZE=0x700000 : +# dropbear support(ssh client/server) +# e1000e (ethernet driver) +# +# Addition vs standard x230 board config: +# HOTP_KEY: HOTP challenge for currently supported USB Security dongles export CONFIG_COREBOOT=y export CONFIG_COREBOOT_VERSION=4.8.1 export CONFIG_LINUX_VERSION=4.14.62 @@ -19,7 +26,6 @@ CONFIG_PCIUTILS=y CONFIG_POPT=y CONFIG_QRENCODE=y CONFIG_TPMTOTP=y -CONFIG_DROPBEAR=y #CONFIG_SLANG=y #CONFIG_NEWT=y @@ -28,7 +34,11 @@ CONFIG_FBWHIPTAIL=y CONFIG_HOTPKEY=y CONFIG_LINUX_USB=y -CONFIG_LINUX_E1000E=y + +#SSH client/server +CONFIG_DROPBEAR=n +#Ethernet driver (Heads only) +CONFIG_LINUX_E1000E=n export CONFIG_TPM=y export CONFIG_BOOTSCRIPT=/bin/gui-init diff --git a/boards/x230/x230.config b/boards/x230/x230.config index f52fb3550..5333b34f8 100644 --- a/boards/x230/x230.config +++ b/boards/x230/x230.config @@ -1,4 +1,9 @@ # Configuration for a x230 running Qubes and other OSes +# STATIC_OPTION_TABLE is set inside of coreboot config +# +# Deactivated to fit in coreboot's CONFIG_CBFS_SIZE=0x700000 : +# dropbear support(ssh client/server) +# e1000e (ethernet driver) export CONFIG_COREBOOT=y export CONFIG_COREBOOT_VERSION=4.8.1 export CONFIG_LINUX_VERSION=4.14.62 @@ -18,13 +23,18 @@ CONFIG_PCIUTILS=y CONFIG_POPT=y CONFIG_QRENCODE=y CONFIG_TPMTOTP=y -CONFIG_DROPBEAR=y +#CONFIG_SLANG=y +#CONFIG_NEWT=y CONFIG_CAIRO=y CONFIG_FBWHIPTAIL=y CONFIG_LINUX_USB=y -CONFIG_LINUX_E1000E=y + +#SSH client/server +CONFIG_DROPBEAR=n +#Ethernet driver (Heads only) +CONFIG_LINUX_E1000E=n export CONFIG_TPM=y export CONFIG_BOOTSCRIPT=/bin/gui-init diff --git a/config/coreboot-t430.config b/config/coreboot-t430.config index b90f8d5a9..405e0bba1 100644 --- a/config/coreboot-t430.config +++ b/config/coreboot-t430.config @@ -1,26 +1,17 @@ CONFIG_LOCALVERSION="heads" CONFIG_ANY_TOOLCHAIN=y -# 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_CBFS_SIZE=0x710000 -# CONFIG_POST_IO is not set -# CONFIG_POST_DEVICE is not set -CONFIG_DRIVERS_UART_8250IO=y +CONFIG_CBFS_SIZE=0x700000 CONFIG_BOARD_LENOVO_THINKPAD_T430=y -CONFIG_DRIVERS_PS2_KEYBOARD=y +CONFIG_NO_POST=y CONFIG_UART_PCI_ADDR=0 # CONFIG_CONSOLE_SERIAL is not set CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x80000 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_5=y CONFIG_PAYLOAD_LINUX=y CONFIG_PAYLOAD_FILE="../../build/t430/bzImage" -CONFIG_PAYLOAD_OPTIONS="" -# CONFIG_PXE is not set CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet" CONFIG_LINUX_INITRD="../../build/t430/initrd.cpio.xz" -CONFIG_DEBUG_SMM_RELOCATION=y CONFIG_USE_OPTION_TABLE=y CONFIG_STATIC_OPTION_TABLE=y diff --git a/config/coreboot-x230-hotp-verification.config b/config/coreboot-x230-hotp-verification.config index 150c73332..092064afa 100644 --- a/config/coreboot-x230-hotp-verification.config +++ b/config/coreboot-x230-hotp-verification.config @@ -2,7 +2,7 @@ CONFIG_LOCALVERSION="heads" CONFIG_ANY_TOOLCHAIN=y CONFIG_MEASURED_BOOT=y CONFIG_VENDOR_LENOVO=y -CONFIG_CBFS_SIZE=0x710000 +CONFIG_CBFS_SIZE=0x700000 CONFIG_BOARD_LENOVO_X230=y CONFIG_NO_POST=y CONFIG_UART_PCI_ADDR=0 diff --git a/config/coreboot-x230.config b/config/coreboot-x230.config index 68ef480c1..ac344588a 100644 --- a/config/coreboot-x230.config +++ b/config/coreboot-x230.config @@ -1,27 +1,17 @@ CONFIG_LOCALVERSION="heads" CONFIG_ANY_TOOLCHAIN=y -# 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_CBFS_SIZE=0x710000 -# CONFIG_POST_IO is not set -# CONFIG_POST_DEVICE is not set -CONFIG_DRIVERS_UART_8250IO=y +CONFIG_CBFS_SIZE=0x700000 CONFIG_BOARD_LENOVO_X230=y -CONFIG_DRIVERS_PS2_KEYBOARD=y +CONFIG_NO_POST=y CONFIG_UART_PCI_ADDR=0 CONFIG_NO_GFX_INIT=y -# CONFIG_CONSOLE_SERIAL is not set CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x80000 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_5=y CONFIG_PAYLOAD_LINUX=y CONFIG_PAYLOAD_FILE="../../build/x230/bzImage" -CONFIG_PAYLOAD_OPTIONS="" -# CONFIG_PXE is not set CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet" CONFIG_LINUX_INITRD="../../build/x230/initrd.cpio.xz" -CONFIG_DEBUG_SMM_RELOCATION=y CONFIG_USE_OPTION_TABLE=y CONFIG_STATIC_OPTION_TABLE=y