Add new board: Purism Librem Mini (#806)

* patches/coreboot-4.12: Add patch for Cannonlake ME status Add patch print ME status regardless of enablement state Signed-off-by: Matt DeVillier <matt.devillier@puri.sm> * modules: add purism-blobs module Rather than require users to manually run a script to download the required blobs to build Purism Librem boards, automate it so the correct version is automatically downloaded/extracted. Restrict to coreboot 4.12 for now since 4.8.1 still needs FSP blobs, which are not in module. Signed-off-by: Matt DeVillier <matt.devillier@puri.sm> * configs/linux-librem13v2: unset CONFIG_RETPOLINE Fixes compilation issue with newer kernels, ignored by older ones which don't need it Signed-off-by: Matt DeVillier <matt.devillier@puri.sm> * Add new board: Librem Mini Add Librem Mini board patch for coreboot 4.12, board config and coreboot config. Continue reusing existing librem13v2 Linux config, same as all other Librem boards currently. Use new purism-blobs module. Signed-off-by: Matt DeVillier <matt.devillier@puri.sm> * board/librem*: rename for consistency Use 'librem_<board>' notation for consistency across all models. Rename linux config file since used by multiple Librem models. Signed-off-by: Matt DeVillier <matt.devillier@puri.sm> * CircleCI: add librem_mini board to test Signed-off-by: Matt DeVillier <matt.devillier@puri.sm>
linuxboot · Sep 2, 2020 · 268fb90 · 268fb90
1 parent a075347
commit 268fb90
Show file tree

Hide file tree

Showing 18 changed files with 943 additions and 27 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -150,6 +150,24 @@ jobs:
  - store-artifacts:
  path: build/x230-hotp-verification
 
+ - run:
+ name: librem_mini
+ command: |
+ rm -rf build/librem_mini/* build/log/* && make --load 2 \
+ V=1 \
+ BOARD=librem_mini \
+ no_output_timeout: 3h
+ - run:
+ name: Ouput librem_mini hashes
+ command: |
+ cat build/librem_mini/hashes.txt \
+ - run:
+ name: Archiving build logs for librem_mini
+ command: |
+ tar zcvf build/librem_mini/logs.tar.gz build/log/*
+ - store-artifacts:
+ path: build/librem_mini
+
  - run:
  name: qemu-coreboot
  command: |

diff --git a/blobs/librem_kbl/readme.md b/blobs/librem_kbl/readme.md
@@ -14,7 +14,7 @@ The script depends on: wget sha256sum python2.7 bspatch pv
 You can now compile the image with:
 
 ```
-make BOARD=librem13v4
+make BOARD=librem_13v4
 or
-make BOARD=librem15v4
+make BOARD=librem_15v4
 ```
diff --git a/blobs/librem_skl/readme.md b/blobs/librem_skl/readme.md
@@ -14,5 +14,7 @@ The script depends on: wget sha256sum python2.7 bspatch pv
 You can now compile the image with:
 
 ```
-make BOARD=librem13v2
+make BOARD=librem_13v2
+or
+make BOARD=librem_15v3
 ```
diff --git a/boards/librem13v2/librem13v2.config → boards/librem_13v2/librem_13v2.config b/boards/librem13v2/librem13v2.config → boards/librem_13v2/librem_13v2.config
@@ -1,6 +1,6 @@
-# Configuration for a librem13v2
-CONFIG_LINUX_CONFIG=config/linux-librem13v2.config
-CONFIG_COREBOOT_CONFIG=config/coreboot-librem13v2.config
+# Configuration for a librem_13v2
+CONFIG_LINUX_CONFIG=config/linux-librem_common.config
+CONFIG_COREBOOT_CONFIG=config/coreboot-librem_13v2.config
 
 export CONFIG_COREBOOT=y
 export CONFIG_COREBOOT_VERSION=4.8.1

diff --git a/boards/librem13v4/librem13v4.config → boards/librem_13v4/librem_13v4.config b/boards/librem13v4/librem13v4.config → boards/librem_13v4/librem_13v4.config
@@ -1,6 +1,6 @@
-# Configuration for a librem13v4
-CONFIG_LINUX_CONFIG=config/linux-librem13v2.config
-CONFIG_COREBOOT_CONFIG=config/coreboot-librem13v4.config
+# Configuration for a librem_13v4
+CONFIG_LINUX_CONFIG=config/linux-librem_common.config
+CONFIG_COREBOOT_CONFIG=config/coreboot-librem_13v4.config
 
 export CONFIG_COREBOOT=y
 export CONFIG_COREBOOT_VERSION=4.8.1

diff --git a/boards/librem15v3/librem15v3.config → boards/librem_15v3/librem_15v3.config b/boards/librem15v3/librem15v3.config → boards/librem_15v3/librem_15v3.config
@@ -1,8 +1,6 @@
-# Configuration for a librem15v3
-
-# The L15v3 Linux config is the same as the L13v2 linux config
-CONFIG_LINUX_CONFIG=config/linux-librem13v2.config
-CONFIG_COREBOOT_CONFIG=config/coreboot-librem15v3.config
+# Configuration for a librem_15v3
+CONFIG_LINUX_CONFIG=config/linux-librem_common.config
+CONFIG_COREBOOT_CONFIG=config/coreboot-librem_15v3.config
 
 export CONFIG_COREBOOT=y
 export CONFIG_COREBOOT_VERSION=4.8.1

diff --git a/boards/librem15v4/librem15v4.config → boards/librem_15v4/librem_15v4.config b/boards/librem15v4/librem15v4.config → boards/librem_15v4/librem_15v4.config
@@ -1,8 +1,6 @@
-# Configuration for a librem15v4
-
-# The L15v4 Linux config is the same as the L13v2 linux config
-CONFIG_LINUX_CONFIG=config/linux-librem13v2.config
-CONFIG_COREBOOT_CONFIG=config/coreboot-librem15v4.config
+# Configuration for a librem_15v4
+CONFIG_LINUX_CONFIG=config/linux-librem_common.config
+CONFIG_COREBOOT_CONFIG=config/coreboot-librem_15v4.config
 
 export CONFIG_COREBOOT=y
 export CONFIG_COREBOOT_VERSION=4.8.1

diff --git a/boards/librem_mini/librem_mini.config b/boards/librem_mini/librem_mini.config
@@ -0,0 +1,42 @@
+# Configuration for a librem mini
+CONFIG_LINUX_CONFIG=config/linux-librem_common.config
+CONFIG_COREBOOT_CONFIG=config/coreboot-librem_mini.config
+
+export CONFIG_COREBOOT=y
+export CONFIG_COREBOOT_VERSION=4.12
+export CONFIG_LINUX_VERSION=4.19.139
+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=y
+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_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"
+export CONFIG_USB_KEYBOARD=y
diff --git a/config/coreboot-librem13v2.config → config/coreboot-librem_13v2.config b/config/coreboot-librem13v2.config → config/coreboot-librem_13v2.config
@@ -26,6 +26,6 @@ CONFIG_FSP_M_XIP=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 CONFIG_PAYLOAD_LINUX=y
-CONFIG_PAYLOAD_FILE="../../build/librem13v2/bzImage"
+CONFIG_PAYLOAD_FILE="../../build/librem_13v2/bzImage"
 CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=3"
-CONFIG_LINUX_INITRD="../../build/librem13v2/initrd.cpio.xz"
+CONFIG_LINUX_INITRD="../../build/librem_13v2/initrd.cpio.xz"
diff --git a/config/coreboot-librem13v4.config → config/coreboot-librem_13v4.config b/config/coreboot-librem13v4.config → config/coreboot-librem_13v4.config
@@ -26,6 +26,6 @@ CONFIG_FSP_M_XIP=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 CONFIG_PAYLOAD_LINUX=y
-CONFIG_PAYLOAD_FILE="../../build/librem13v4/bzImage"
+CONFIG_PAYLOAD_FILE="../../build/librem_13v4/bzImage"
 CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=3"
-CONFIG_LINUX_INITRD="../../build/librem13v4/initrd.cpio.xz"
+CONFIG_LINUX_INITRD="../../build/librem_13v4/initrd.cpio.xz"
diff --git a/config/coreboot-librem15v3.config → config/coreboot-librem_15v3.config b/config/coreboot-librem15v3.config → config/coreboot-librem_15v3.config
@@ -26,6 +26,6 @@ CONFIG_FSP_M_XIP=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 CONFIG_PAYLOAD_LINUX=y
-CONFIG_PAYLOAD_FILE="../../build/librem15v3/bzImage"
+CONFIG_PAYLOAD_FILE="../../build/librem_15v3/bzImage"
 CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=3"
-CONFIG_LINUX_INITRD="../../build/librem15v3/initrd.cpio.xz"
+CONFIG_LINUX_INITRD="../../build/librem_15v3/initrd.cpio.xz"
diff --git a/config/coreboot-librem15v4.config → config/coreboot-librem_15v4.config b/config/coreboot-librem15v4.config → config/coreboot-librem_15v4.config
@@ -26,6 +26,6 @@ CONFIG_FSP_M_XIP=y
 # CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
 CONFIG_PAYLOAD_LINUX=y
-CONFIG_PAYLOAD_FILE="../../build/librem15v4/bzImage"
+CONFIG_PAYLOAD_FILE="../../build/librem_15v4/bzImage"
 CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=3"
-CONFIG_LINUX_INITRD="../../build/librem15v4/initrd.cpio.xz"
+CONFIG_LINUX_INITRD="../../build/librem_15v4/initrd.cpio.xz"
diff --git a/config/coreboot-librem_mini.config b/config/coreboot-librem_mini.config
@@ -0,0 +1,14 @@
+CONFIG_LOCALVERSION="PureBoot-beta"
+CONFIG_VENDOR_PURISM=y
+CONFIG_INTEL_GMA_VBT_FILE="3rdparty/purism-blobs/mainboard/purism/librem_whl/vbt.bin"
+CONFIG_IFD_BIN_PATH="3rdparty/purism-blobs/mainboard/purism/librem_whl/flashdescriptor.bin"
+CONFIG_ME_BIN_PATH="3rdparty/purism-blobs/mainboard/purism/librem_whl/me.bin"
+CONFIG_HAVE_IFD_BIN=y
+CONFIG_BOARD_PURISM_LIBREM_MINI=y
+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/bzImage"
+CONFIG_LINUX_INITRD="../../build/librem_mini/initrd.cpio.xz"
+CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=2"
diff --git a/config/linux-librem13v2.config → config/linux-librem_common.config b/config/linux-librem13v2.config → config/linux-librem_common.config
@@ -319,3 +319,4 @@ CONFIG_CRC8=m
 CONFIG_XZ_DEC_TEST=m
 CONFIG_CORDIC=m
 CONFIG_IRQ_POLL=y
+# CONFIG_RETPOLINE is not set
diff --git a/modules/coreboot b/modules/coreboot
@@ -8,6 +8,7 @@ else ifeq "$(CONFIG_COREBOOT_VERSION)" "4.12"
  coreboot_version := 4.12
  coreboot_hash := edcad000ee9b73183c396ea76155629b3d27c693e0f1ae83e3424c4d936e2be2
  coreboot-blobs_hash := 4735ee6850d55d1e65dee8b08cc9b28b8af00b42acf31365f5d9545406579104
+ coreboot_depends := $(if $(CONFIG_PURISM_BLOBS), purism-blobs)
 else
  $(error "$(BOARD): does not specify coreboot version under CONFIG_COREBOOT_VERSION")
 endif 

diff --git a/modules/purism-blobs b/modules/purism-blobs
@@ -0,0 +1,12 @@
+modules-$(CONFIG_PURISM_BLOBS) += purism-blobs
+
+purism-blobs_base_dir := coreboot-$(CONFIG_COREBOOT_VERSION)/3rdparty/purism-blobs
+purism-blobs_version := f53d4074a81c70352d39839884caac20181274d1
+purism-blobs_tar := purism-blobs-${purism-blobs_version}.tar.gz
+purism-blobs_tar_opt := --strip 1
+purism-blobs_url := https://source.puri.sm/coreboot/purism-blobs/-/archive/${purism-blobs_version}/${purism-blobs_tar}
+purism-blobs_hash := f1abd419f085a6d519a2b9b141aee9900553aabf644f0fe1801618fb54157556
+
+## there is nothing to be built
+purism-blobs_output := .built
+purism-blobs_configure := echo -e 'all:\n\ttouch .built' > Makefile
diff --git a/patches/coreboot-4.12/0001-soc-cannonlake-me.c-Always-print-ME-status.patch b/patches/coreboot-4.12/0001-soc-cannonlake-me.c-Always-print-ME-status.patch
@@ -0,0 +1,31 @@
+From 32e60b698d33eec419bf0e4865ece7b86ea1355a Mon Sep 17 00:00:00 2001
+From: Matt DeVillier <matt.devillier@puri.sm>
+Date: Fri, 19 Jun 2020 17:02:22 -0500
+Subject: [PATCH] soc/cannonlake/me.c: Always print ME status
+
+Print the ME status even if the CSE device is disabled, so
+we know which disabled state it's in.
+
+Change-Id: I939333199aa699039fec727beb094e4eb2ad7149
+Signed-off-by: Matt DeVillier <matt.devillier@puri.sm>
+---
+ src/soc/intel/cannonlake/me.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/src/soc/intel/cannonlake/me.c b/src/soc/intel/cannonlake/me.c
+index a51b702e6a..3fae0bf534 100644
+--- a/src/soc/intel/cannonlake/me.c
++++ b/src/soc/intel/cannonlake/me.c
+@@ -103,9 +103,6 @@ void dump_me_status(void *unused)
+ union me_hfsts5 hfsts5;
+ union me_hfsts6 hfsts6;
+
+- if (!is_cse_enabled())
+- return;
+-
+ hfsts1.data = me_read_config32(PCI_ME_HFSTS1);
+ hfsts2.raw = me_read_config32(PCI_ME_HFSTS2);
+ hfsts3.data = me_read_config32(PCI_ME_HFSTS3);
+-- 
+2.20.1
+