From 815a7ef24545064b0d36c66ebb7031cf6d86ff32 Mon Sep 17 00:00:00 2001
From: Thierry Laurion <insurgo@riseup.net>
Date: Thu, 4 Feb 2021 22:13:43 -0500
Subject: [PATCH] x230-nkstorecli PoC board removal, both in tree and in CI
 (board builds fails. fits in maximized boards.)

---
 .circleci/config.yml                          | 20 --------
 boards/x230-nkstorecli/x230-nkstorecli.config | 51 -------------------
 config/coreboot-x230-nkstorecli.config        | 13 -----
 3 files changed, 84 deletions(-)
 delete mode 100644 boards/x230-nkstorecli/x230-nkstorecli.config
 delete mode 100644 config/coreboot-x230-nkstorecli.config

diff --git a/.circleci/config.yml b/.circleci/config.yml
index dfe03cc6..f317ef5b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -404,26 +404,6 @@ jobs:
       - store-artifacts:
           path: build/x230-hotp-verification
 
-      - run:
-          name: x230-nkstorecli
-          command: |
-            rm -rf build/x230-nkstorecli/* build/log/* && make CPUS=24 V=1 BOARD=x230-nkstorecli || 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-nkstorecli hashes
-          command: |
-            cat build/x230-nkstorecli/hashes.txt \
-      - run:
-          name: Archiving build logs for x230-nkstorecli
-          command: |
-             tar zcvf build/x230-nkstorecli/logs.tar.gz build/log/*
-      - store-artifacts:
-          path: build/x230-nkstorecli
-
       - run:
           name: Download and neuter xx30 ME (keep generated GBE and extracted IFD in tree)
           command: |
diff --git a/boards/x230-nkstorecli/x230-nkstorecli.config b/boards/x230-nkstorecli/x230-nkstorecli.config
deleted file mode 100644
index e68f1d11..00000000
--- a/boards/x230-nkstorecli/x230-nkstorecli.config
+++ /dev/null
@@ -1,51 +0,0 @@
-# Configuration for a x230-nkstorecli (Nitrokey Storage client + HOTP support) 
-# running Qubes and other OSes
-# Note that CBFS region is too small. So e1000e (ethernet) and dropbear (ssh client/server) has been disabled.
-export CONFIG_COREBOOT=y
-export CONFIG_COREBOOT_VERSION=4.8.1
-export CONFIG_LINUX_VERSION=4.14.62
-
-CONFIG_COREBOOT_CONFIG=config/coreboot-x230-nkstorecli.config
-CONFIG_LINUX_CONFIG=config/linux-x230.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
-CONFIG_DROPBEAR=n
-CONFIG_NKSTORECLI=y
-
-#CONFIG_SLANG=y
-#CONFIG_NEWT=y
-CONFIG_CAIRO=y
-CONFIG_FBWHIPTAIL=y
-CONFIG_HOTPKEY=y
-
-CONFIG_LINUX_USB=y
-CONFIG_LINUX_E1000E=n
-
-export CONFIG_TPM=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-nkstorecli"
-export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal --ifd --image bios"
-
-# 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.
-#
-# Only flashing to the bios region is safe to do. The easiest is to
-# flash internally when the IFD is unlocked for writing, and x230-flash
-# is installed first.
diff --git a/config/coreboot-x230-nkstorecli.config b/config/coreboot-x230-nkstorecli.config
deleted file mode 100644
index 8d768233..00000000
--- a/config/coreboot-x230-nkstorecli.config
+++ /dev/null
@@ -1,13 +0,0 @@
-CONFIG_MEASURED_BOOT=y
-CONFIG_VENDOR_LENOVO=y
-CONFIG_CBFS_SIZE=0x710000
-CONFIG_BOARD_LENOVO_X230=y
-CONFIG_NO_POST=y
-CONFIG_UART_PCI_ADDR=0
-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/x230-nkstorecli/bzImage"
-CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet"
-CONFIG_LINUX_INITRD="../../build/x230-nkstorecli/initrd.cpio.xz"