Merge commit 'refs/pull/838/head' of https://github.com/osresearch/heads

 into nitropad_x230

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
@@ -29,7 +35,11 @@ CONFIG_HOTPKEY=y
 CONFIG_TPM_NO_LUKS_DISK_UNLOCK=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

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