From afa6753a3038eb111c31c314f0f84f1136f540dd Mon Sep 17 00:00:00 2001
From: MrChromebox <matt.devillier@puri.sm>
Date: Wed, 30 Sep 2020 15:13:15 -0500
Subject: [PATCH] librem_mini-NoTPM: drop '-noTPM' suffix (#843)

There's only one Librem Mini board, it doesn't use a TPM,
no reason to unnecesarily lengthen the board name.

Signed-off-by: Matt DeVillier <matt.devillier@puri.sm>
---
 .circleci/config.yml                             | 16 ++++++++--------
 .../librem_mini.config}                          |  4 ++--
 ...-NoTPM.config => coreboot-librem_mini.config} |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)
 rename boards/{librem_mini-NoTPM/librem_mini-NoTPM.config => librem_mini/librem_mini.config} (87%)
 rename config/{coreboot-librem_mini-NoTPM.config => coreboot-librem_mini.config} (83%)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index bd0806e4..772b7063 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -60,22 +60,22 @@ jobs:
 #          path: build/qemu-linuxboot/hashes.txt
 
       - run:
-          name: librem_mini-NoTPM
+          name: librem_mini
           command: |
-            rm -rf build/librem_mini-NoTPM/* build/log/* && make CPUS=4 \
+            rm -rf build/librem_mini/* build/log/* && make CPUS=4 \
                 V=1 \
-                BOARD=librem_mini-NoTPM || (find ./build/ -name "*.log" -type f -mmin -1|while read log; do echo ""; echo '==>' "$log" '<=='; echo ""; cat $log;done; exit 1) \
+                BOARD=librem_mini || (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 librem_mini-NoTPM hashes
+          name: Ouput librem_mini hashes
           command: |
-            cat build/librem_mini-NoTPM/hashes.txt \
+            cat build/librem_mini/hashes.txt \
       - run:
-          name: Archiving build logs for librem_mini-NoTPM
+          name: Archiving build logs for librem_mini
           command: |
-             tar zcvf build/librem_mini-NoTPM/logs.tar.gz build/log/*
+             tar zcvf build/librem_mini/logs.tar.gz build/log/*
       - store-artifacts:
-          path: build/librem_mini-NoTPM
+          path: build/librem_mini
 
       - run:
           name: x230-flash
diff --git a/boards/librem_mini-NoTPM/librem_mini-NoTPM.config b/boards/librem_mini/librem_mini.config
similarity index 87%
rename from boards/librem_mini-NoTPM/librem_mini-NoTPM.config
rename to boards/librem_mini/librem_mini.config
index 0005270f..5a0b255b 100644
--- a/boards/librem_mini-NoTPM/librem_mini-NoTPM.config
+++ b/boards/librem_mini/librem_mini.config
@@ -1,6 +1,6 @@
 # Configuration for a librem mini
 CONFIG_LINUX_CONFIG=config/linux-librem_common.config
-CONFIG_COREBOOT_CONFIG=config/coreboot-librem_mini-NoTPM.config
+CONFIG_COREBOOT_CONFIG=config/coreboot-librem_mini.config
 
 export CONFIG_COREBOOT=y
 export CONFIG_COREBOOT_VERSION=4.12
@@ -35,7 +35,7 @@ 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_BOOT_GUI_MENU_NAME="Purism Librem Mini NoTPM Heads Boot Menu"
+export CONFIG_BOOT_GUI_MENU_NAME="Purism Librem Mini Heads Boot Menu"
 export CONFIG_WARNING_BG_COLOR="--background-gradient 0 0 0 150 125 0"
 export CONFIG_ERROR_BG_COLOR="--background-gradient 0 0 0 150 0 0"
 export CONFIG_FLASHROM_OPTIONS="-p internal"
diff --git a/config/coreboot-librem_mini-NoTPM.config b/config/coreboot-librem_mini.config
similarity index 83%
rename from config/coreboot-librem_mini-NoTPM.config
rename to config/coreboot-librem_mini.config
index 04738650..ced1b4d2 100644
--- a/config/coreboot-librem_mini-NoTPM.config
+++ b/config/coreboot-librem_mini.config
@@ -9,6 +9,6 @@ CONFIG_CPU_MICROCODE_CBFS_EXTERNAL_BINS=y
 CONFIG_CPU_UCODE_BINARIES="3rdparty/purism-blobs/mainboard/purism/librem_whl/cpu_microcode_blob.bin"
 CONFIG_HAVE_ME_BIN=y
 CONFIG_PAYLOAD_LINUX=y
-CONFIG_PAYLOAD_FILE="../../build/librem_mini-NoTPM/bzImage"
-CONFIG_LINUX_INITRD="../../build/librem_mini-NoTPM/initrd.cpio.xz"
+CONFIG_PAYLOAD_FILE="../../build/librem_mini/bzImage"
+CONFIG_LINUX_INITRD="../../build/librem_mini/initrd.cpio.xz"
 CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=2"