From b1886f3bf2be0f2f8ed8dab19da5fec459a34d41 Mon Sep 17 00:00:00 2001 From: Thierry Laurion Date: Sat, 19 Sep 2020 15:41:50 -0400 Subject: [PATCH 1/2] 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 --- boards/x230-hotp-verification/x230-hotp-verification.config | 5 +++-- config/coreboot-x230-hotp-verification.config | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/boards/x230-hotp-verification/x230-hotp-verification.config b/boards/x230-hotp-verification/x230-hotp-verification.config index 5eef5868c..ff86ebc42 100644 --- a/boards/x230-hotp-verification/x230-hotp-verification.config +++ b/boards/x230-hotp-verification/x230-hotp-verification.config @@ -19,7 +19,6 @@ CONFIG_PCIUTILS=y CONFIG_POPT=y CONFIG_QRENCODE=y CONFIG_TPMTOTP=y -CONFIG_DROPBEAR=y #CONFIG_SLANG=y #CONFIG_NEWT=y @@ -28,7 +27,9 @@ CONFIG_FBWHIPTAIL=y CONFIG_HOTPKEY=y CONFIG_LINUX_USB=y -CONFIG_LINUX_E1000E=y + +CONFIG_DROPBEAR=n +CONFIG_LINUX_E1000E=n export CONFIG_TPM=y export CONFIG_BOOTSCRIPT=/bin/gui-init 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 From 711ad4ba472391f812d3b97abb7236f07daa3fff Mon Sep 17 00:00:00 2001 From: Thierry Laurion Date: Wed, 23 Sep 2020 08:46:43 -0400 Subject: [PATCH 2/2] x230-htop-verification board: clarification on x230 board differences. Fixes #737 #770 #608 --- .../x230-hotp-verification.config | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/boards/x230-hotp-verification/x230-hotp-verification.config b/boards/x230-hotp-verification/x230-hotp-verification.config index ff86ebc42..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 @@ -28,7 +35,9 @@ CONFIG_HOTPKEY=y CONFIG_LINUX_USB=y +#SSH client/server CONFIG_DROPBEAR=n +#Ethernet driver (Heads only) CONFIG_LINUX_E1000E=n export CONFIG_TPM=y