x230-maximized-fhd: add fhd mod into coreboot x320

.circleci/config.yml

@@ -404,6 +404,30 @@ jobs:
       - store-artifacts:
           path: build/x230-hotp-verification
 
+      - run:
+          name: Download and neuter xx30 ME (keep generated GBE and extracted IFD in tree)
+          command: |
+            ./blobs/xx30/download_clean_me.sh
+      - run:
+          name: x230-maximized-fhd
+          command: |
+            rm -rf build/x230-maximized-fhd/* build/log/* && make CPUS=4 V=1 BOARD=x230-maximized-fhd || touch /tmp/failed_build
+          no_output_timeout: 3h
+      - run:
+          name: Output build failing logs
+          command: |
+            if [[ -f /tmp/failed_build ]]; then find ./build/ -name "*.log" -type f -mmin -1|while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log;done; exit 1;else echo "Not failing. Continuing..."; fi
+      - run:
+          name: Output x230-maximized-fhd hashes
+          command: |
+            cat build/x230-maximized-fhd/hashes.txt \
+      - run:
+          name: Archiving build logs for x230-maximized-fhd
+          command: |
+            tar zcvf build/x230-maximized-fhd/logs.tar.gz ./build/log/*
+      - store-artifacts:
+          path: build/x230-maximized-fhd
+
       - run:
           name: Download and neuter xx30 ME (keep generated GBE and extracted IFD in tree)
           command: |

boards/t430-hotp-maximized/t430-hotp-maximized.config

@@ -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.13
+export CONFIG_COREBOOT_VERSION=4.8.1
 export CONFIG_LINUX_VERSION=4.14.62
 
 CONFIG_COREBOOT_CONFIG=config/coreboot-t430-hotp-maximized.config

boards/t430-maximized/t430-maximized.config

@@ -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.13
+export CONFIG_COREBOOT_VERSION=4.8.1
 export CONFIG_LINUX_VERSION=4.14.62
 
 CONFIG_COREBOOT_CONFIG=config/coreboot-t430-maximized.config

boards/x230-hotp-maximized/x230-hotp-maximized.config

@@ -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.13
+export CONFIG_COREBOOT_VERSION=4.8.1
 export CONFIG_LINUX_VERSION=4.14.62
 
 CONFIG_COREBOOT_CONFIG=config/coreboot-x230-hotp-maximized.config

boards/x230-maximized-fhd/x230-maximized-fhd.config

@@ -0,0 +1,90 @@
+# Configuration for a X230 running Qubes and other Linux Based OSes (through kexec)
+#
+# Based on https://review.coreboot.org/c/coreboot/+/28950 for FHD mod
+# Includes 
+# - Deactivated+neutered ME and expanded consequent IFD BIOS regions 
+# - Forged 00:DE:AD:C0:FF:EE MAC address  (if not extracting gbe.bin from backup with blobs/xx30/extract.sh)
+#   - Note that this MAC address can be modified under build/coreboot-VER/util/bincfg/gbe-82579LM.set
+#
+# - 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.13
+export CONFIG_LINUX_VERSION=4.14.62
+
+CONFIG_COREBOOT_CONFIG=config/coreboot-x230-maximized-fhd.config
+CONFIG_LINUX_CONFIG=config/linux-x230.config
+
+#Additional hardware support
+CONFIG_LINUX_USB=y
+CONFIG_LINUX_E1000E=y
+
+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
+
+#Remote attestation support
+#TPM based requirements
+export CONFIG_TPM=y
+CONFIG_POPT=y
+CONFIG_QRENCODE=y
+CONFIG_TPMTOTP=y
+#HOTP based remote attestation for supported USB Security dongle
+#With/Without TPM support
+#CONFIG_HOTPKEY=y
+
+#Nitrokey Storage admin tool
+CONFIG_NKSTORECLI=n
+
+#GUI Support
+#Console based Whiptail support(Console based, no FB):
+#CONFIG_SLANG=y
+#CONFIG_NEWT=y
+#FBWhiptail based (Graphical):
+CONFIG_CAIRO=y
+CONFIG_FBWHIPTAIL=y
+
+#Additional tools:
+#SSH server (requires ethernet drivers, eg: CONFIG_LINUX_E1000E)
+CONFIG_DROPBEAR=y
+
+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"
+export CONFIG_BOOT_KERNEL_REMOVE="quiet"
+export CONFIG_BOOT_DEV="/dev/sda1"
+export CONFIG_BOARD_NAME="Thinkpad X230-maximized"
+export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
+
+# xx30-*-maximized boards require of you initially call one of the
+#  following to have gbe.bin ifd.bin and me.bin
+#  - blobs/xx30/download_clean_me.sh
+#     To download Lenovo original ME binary, neuter+deactivate ME, produce
+#      reduced IFD ME region and expanded BIOS IFD region.
+#  - blobs/xx30/extract.sh
+#     To extract from backuped 8M (bottom SPI) ME binary, GBE and IFD blobs.
+#
+# This board has two SPI flash chips, an 8 MB that holds the IFD,
+# the ME image and part of the coreboot image, and a 4 MB one that
+# has the rest of the coreboot and the reset vector.
+#   
+# As a consequence, this replaces the need of having to flash x230-flash 
+#  and expands available CBFS region (11.5Mb available CBFS space)
+#
+# When flashing via an external programmer it is easiest to have
+# two separate files for these pieces.
+all: $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom
+$(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-bottom.rom: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
+	$(call do,DD 8MB,$@,dd of=$@ if=$< bs=65536 count=128 skip=0 status=none)
+	@sha256sum $@
+
+all: $(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom
+$(build)/$(BOARD)/heads-$(BOARD)-$(HEADS_GIT_VERSION)-top.rom: $(build)/$(BOARD)/$(CB_OUTPUT_FILE)
+	$(call do,DD 4MB,$@,dd of=$@ if=$< bs=65536 count=64 skip=128 status=none)
+	@sha256sum $@

boards/x230-maximized/x230-maximized.config

@@ -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.13
+export CONFIG_COREBOOT_VERSION=4.8.1
 export CONFIG_LINUX_VERSION=4.14.62
 
 CONFIG_COREBOOT_CONFIG=config/coreboot-x230-maximized.config

config/coreboot-t430-hotp-maximized.config

@@ -1,21 +1,21 @@
-CONFIG_USE_OPTION_TABLE=y
-CONFIG_STATIC_OPTION_TABLE=y
+CONFIG_MEASURED_BOOT=y
 CONFIG_VENDOR_LENOVO=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_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet"
+CONFIG_NO_POST=y
 CONFIG_UART_PCI_ADDR=0
-CONFIG_HAVE_ME_BIN=y
-CONFIG_HAVE_GBE_BIN=y
-CONFIG_NO_GFX_INIT=y
-# CONFIG_INTEL_GMA_ADD_VBT is not set
-CONFIG_TPM_MEASURED_BOOT=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/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

config/coreboot-t430-maximized.config

@@ -1,21 +1,21 @@
-CONFIG_USE_OPTION_TABLE=y
-CONFIG_STATIC_OPTION_TABLE=y
+CONFIG_MEASURED_BOOT=y
 CONFIG_VENDOR_LENOVO=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_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet"
+CONFIG_NO_POST=y
 CONFIG_UART_PCI_ADDR=0
-CONFIG_HAVE_ME_BIN=y
-CONFIG_HAVE_GBE_BIN=y
-CONFIG_NO_GFX_INIT=y
-# CONFIG_INTEL_GMA_ADD_VBT is not set
-CONFIG_TPM_MEASURED_BOOT=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/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

config/coreboot-x230-hotp-maximized.config

@@ -1,20 +1,19 @@
+CONFIG_MEASURED_BOOT=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_X230=y
-CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet"
+CONFIG_NO_POST=y
 CONFIG_UART_PCI_ADDR=0
-CONFIG_HAVE_ME_BIN=y
-CONFIG_HAVE_GBE_BIN=y
 CONFIG_NO_GFX_INIT=y
-# CONFIG_INTEL_GMA_ADD_VBT is not set
-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_COMMAND_LINE="intel_iommu=igfx_off quiet"
 CONFIG_LINUX_INITRD="../../build/x230-hotp-maximized/initrd.cpio.xz"

config/coreboot-x230-maximized-fhd.config

@@ -0,0 +1,20 @@
+CONFIG_VENDOR_LENOVO=y
+CONFIG_NO_POST=y
+CONFIG_CBFS_SIZE=0xB80000
+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_X230_FHD=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_INTEL_GMA_ADD_VBT is not set
+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-fhd/bzImage"
+CONFIG_LINUX_INITRD="../../build/x230-maximized-fhd/initrd.cpio.xz"

config/coreboot-x230-maximized.config

@@ -1,20 +1,19 @@
+CONFIG_MEASURED_BOOT=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_X230=y
-CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet"
+CONFIG_NO_POST=y
 CONFIG_UART_PCI_ADDR=0
-CONFIG_HAVE_ME_BIN=y
-CONFIG_HAVE_GBE_BIN=y
 CONFIG_NO_GFX_INIT=y
-# CONFIG_INTEL_GMA_ADD_VBT is not set
-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_COMMAND_LINE="intel_iommu=igfx_off quiet"
 CONFIG_LINUX_INITRD="../../build/x230-maximized/initrd.cpio.xz"