From 7ee4a11d1b12d83baedd27ef56eda7414f2d6bbb Mon Sep 17 00:00:00 2001
From: Matt DeVillier <matt.devillier@puri.sm>
Date: Fri, 16 Oct 2020 16:57:49 -0500
Subject: [PATCH] Add new board: Purism Librem Mini v2

Add board config, coreboot config, Circle CI entry.

Signed-off-by: Matt DeVillier <matt.devillier@puri.sm>
---
 .circleci/config.yml                        | 20 ++++++++++
 boards/librem_mini_v2/librem_mini_v2.config | 41 +++++++++++++++++++++
 config/coreboot-librem_mini_v2.config       | 14 +++++++
 3 files changed, 75 insertions(+)
 create mode 100644 boards/librem_mini_v2/librem_mini_v2.config
 create mode 100644 config/coreboot-librem_mini_v2.config

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 06800a3c..92bc0746 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -99,6 +99,26 @@ jobs:
       - store-artifacts:
           path: build/librem_mini
 
+      - run:
+          name: librem_mini_v2
+          command: |
+            rm -rf build/librem_mini_v2/* build/log/* && make CPUS=4 V=1 BOARD=librem_mini_v2 || 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 librem_mini_v2 hashes
+          command: |
+            cat build/librem_mini_v2/hashes.txt \
+      - run:
+          name: Archiving build logs for librem_mini_v2
+          command: |
+             tar zcvf build/librem_mini_v2/logs.tar.gz build/log/*
+      - store-artifacts:
+          path: build/librem_mini_v2
+
       - run:
           name: x230-flash
           #We delete build/make-4.2.1/ directory until issue #799 is fixed.
diff --git a/boards/librem_mini_v2/librem_mini_v2.config b/boards/librem_mini_v2/librem_mini_v2.config
new file mode 100644
index 00000000..7c8b18bb
--- /dev/null
+++ b/boards/librem_mini_v2/librem_mini_v2.config
@@ -0,0 +1,41 @@
+# Configuration for a librem mini v2
+CONFIG_LINUX_CONFIG=config/linux-librem_common.config
+CONFIG_COREBOOT_CONFIG=config/coreboot-librem_mini_v2.config
+
+export CONFIG_COREBOOT=y
+export CONFIG_COREBOOT_VERSION=4.12
+export CONFIG_LINUX_VERSION=5.4.69
+export CONFIG_PURISM_BLOBS=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
+CONFIG_POPT=y
+CONFIG_QRENCODE=y
+CONFIG_TPMTOTP=y
+
+CONFIG_CAIRO=y
+CONFIG_FBWHIPTAIL=y
+CONFIG_HOTPKEY=y
+
+CONFIG_LINUX_USB=y
+
+export CONFIG_TPM=n
+export CONFIG_TPM_NO_LUKS_DISK_UNLOCK=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"
+export CONFIG_BOOT_KERNEL_REMOVE=""
+export CONFIG_BOOT_DEV="/dev/nvme0n1p1"
+export CONFIG_BOARD_NAME="Librem Mini v2"
+export CONFIG_FLASHROM_OPTIONS="-p internal"
+export CONFIG_USB_KEYBOARD=y
+export CONFIG_AUTO_BOOT_TIMEOUT=5
diff --git a/config/coreboot-librem_mini_v2.config b/config/coreboot-librem_mini_v2.config
new file mode 100644
index 00000000..83510725
--- /dev/null
+++ b/config/coreboot-librem_mini_v2.config
@@ -0,0 +1,14 @@
+CONFIG_ANY_TOOLCHAIN=y
+CONFIG_VENDOR_PURISM=y
+CONFIG_INTEL_GMA_VBT_FILE="3rdparty/purism-blobs/mainboard/purism/librem_cnl/mini/vbt.bin"
+CONFIG_IFD_BIN_PATH="3rdparty/purism-blobs/mainboard/purism/librem_cnl/mini_v2/flashdescriptor.bin"
+CONFIG_ME_BIN_PATH="3rdparty/purism-blobs/mainboard/purism/librem_cnl/mini_v2/me.bin"
+CONFIG_HAVE_IFD_BIN=y
+CONFIG_BOARD_PURISM_LIBREM_MINI_V2=y
+CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS=y
+CONFIG_CPU_UCODE_BINARIES="3rdparty/purism-blobs/mainboard/purism/librem_cnl/cpu_microcode_blob.bin"
+CONFIG_HAVE_ME_BIN=y
+CONFIG_PAYLOAD_LINUX=y
+CONFIG_PAYLOAD_FILE="../../build/librem_mini_v2/bzImage"
+CONFIG_LINUX_INITRD="../../build/librem_mini_v2/initrd.cpio.xz"
+CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=2"