Skip to content

Commit

Permalink
X200 board bringback without TPM and HOTP support as provided in master
Browse files Browse the repository at this point in the history
Based on past work https://github.com/tlaurion/heads/tree/x200_readd

TODO:
- upgrade coreboot to 4.12
- upgrade kernel to 5.x
- Test and merge linuxboot#836

Addresses linuxboot#878
  • Loading branch information
tlaurion committed Oct 30, 2020
1 parent e7faac2 commit 7373d53
Show file tree
Hide file tree
Showing 4 changed files with 412 additions and 0 deletions.
18 changes: 18 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,24 @@ jobs:
- store-artifacts:
path: build/t430-flash

- run:
name: x200
command: |
rm -rf build/x200/* build/log/* && make CPUS=4 \
V=1 \
BOARD=x200 || (find ./build/ -name "*.log" -type f -mmin -1|while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log;done; exit 1) \
no_output_timeout: 3h
- run:
name: Ouput x200 hashes
command: |
cat build/x200/hashes.txt \
- run:
name: Archiving build logs for x200
command: |
tar zcvf build/x200/logs.tar.gz build/log/*
- store-artifacts:
path: build/x200

- run:
name: t430
command: |
Expand Down
58 changes: 58 additions & 0 deletions boards/x200/x200.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
# Configuration for a x230-hotp-verification (Nitrokey/Purism USB Security dongle enabled HOTP support)
# running non-Qubes OSes.
#
# 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

CONFIG_COREBOOT_CONFIG=config/coreboot-x200.config
CONFIG_LINUX_CONFIG=config/linux-x200.config

CONFIG_CRYPTSETUP=y
CONFIG_FLASHROM=y
CONFIG_FLASHTOOLS=y
CONFIG_GPG2=y
CONFIG_KEXEC=y
CONFIG_UTIL_LINUX=y
CONFIG_LVM2=y
CONFIG_MBEDTLS=y
CONFIG_PCIUTILS=y
CONFIG_POPT=y
CONFIG_QRENCODE=y
CONFIG_TPMTOTP=y

#Heads GUI in text mode (console)
CONFIG_SLANG=y
CONFIG_NEWT=y
#Heads GUI in graphical mode (FB)
#CONFIG_CAIRO=y
#CONFIG_FBWHIPTAIL=y

#Board doesn't support TPM.
export CONFIG_TPM=n
#HOTP USB Security dongle support (Nitrokey Pro/Storage, Librem Key)
CONFIG_HOTPKEY=y

CONFIG_LINUX_USB=y
export CONFIG_LINUX_USB_COMPANION_CONTROLLER=y

#SSH client/server
CONFIG_DROPBEAR=n
#Ethernet driver (Heads only)
CONFIG_LINUX_E1000E=n

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 intel_iommu=igfx_off i915.modeset=1 video=1280x800"
export CONFIG_BOOT_KERNEL_REMOVE="quiet"
export CONFIG_BOOT_DEV="/dev/sda1"
export CONFIG_BOOT_GUI_MENU_NAME="x200 Heads Boot Menu"
export CONFIG_USB_BOOT_DEV="/dev/sdb1"
export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal --ifd --image bios"

12 changes: 12 additions & 0 deletions config/coreboot-x200.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
CONFIG_ANY_TOOLCHAIN=y
CONFIG_VENDOR_LENOVO=y
CONFIG_CBFS_SIZE=0x700000
CONFIG_BOARD_LENOVO_X200=y
CONFIG_NO_GFX_INIT=y
CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x80000
CONFIG_DEFAULT_CONSOLE_LOGLEVEL_5=y
CONFIG_PAYLOAD_LINUX=y
CONFIG_PAYLOAD_FILE="../../build/x200/bzImage"
CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet"
CONFIG_LINUX_INITRD="../../build/x200/initrd.cpio.xz"
CONFIG_DEBUG_SMM_RELOCATION=y
Loading

0 comments on commit 7373d53

Please sign in to comment.