Revert "Add new board: Purism Librem Mini (#806)"

This reverts commit 268fb90.
linuxboot · Sep 3, 2020 · dff4f9f · dff4f9f
1 parent ef96d64
commit dff4f9f
Show file tree

Hide file tree

Showing 18 changed files with 27 additions and 943 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -150,24 +150,6 @@ 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=librem_13v4
+make BOARD=librem13v4
 or
-make BOARD=librem_15v4
+make BOARD=librem15v4
 ```
diff --git a/blobs/librem_skl/readme.md b/blobs/librem_skl/readme.md
@@ -14,7 +14,5 @@ The script depends on: wget sha256sum python2.7 bspatch pv
 You can now compile the image with:
 
 ```
-make BOARD=librem_13v2
-or
-make BOARD=librem_15v3
+make BOARD=librem13v2
 ```
diff --git a/boards/librem_13v2/librem_13v2.config → boards/librem13v2/librem13v2.config b/boards/librem_13v2/librem_13v2.config → boards/librem13v2/librem13v2.config
@@ -1,6 +1,6 @@
-# Configuration for a librem_13v2
-CONFIG_LINUX_CONFIG=config/linux-librem_common.config
-CONFIG_COREBOOT_CONFIG=config/coreboot-librem_13v2.config
+# Configuration for a librem13v2
+CONFIG_LINUX_CONFIG=config/linux-librem13v2.config
+CONFIG_COREBOOT_CONFIG=config/coreboot-librem13v2.config
 
 export CONFIG_COREBOOT=y
 export CONFIG_COREBOOT_VERSION=4.8.1

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

diff --git a/boards/librem_15v3/librem_15v3.config → boards/librem15v3/librem15v3.config b/boards/librem_15v3/librem_15v3.config → boards/librem15v3/librem15v3.config
@@ -1,6 +1,8 @@
-# Configuration for a librem_15v3
-CONFIG_LINUX_CONFIG=config/linux-librem_common.config
-CONFIG_COREBOOT_CONFIG=config/coreboot-librem_15v3.config
+# 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
 
 export CONFIG_COREBOOT=y
 export CONFIG_COREBOOT_VERSION=4.8.1

diff --git a/boards/librem_15v4/librem_15v4.config → boards/librem15v4/librem15v4.config b/boards/librem_15v4/librem_15v4.config → boards/librem15v4/librem15v4.config
@@ -1,6 +1,8 @@
-# Configuration for a librem_15v4
-CONFIG_LINUX_CONFIG=config/linux-librem_common.config
-CONFIG_COREBOOT_CONFIG=config/coreboot-librem_15v4.config
+# 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
 
 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
diff --git a/config/coreboot-librem_13v2.config → config/coreboot-librem13v2.config b/config/coreboot-librem_13v2.config → config/coreboot-librem13v2.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/librem_13v2/bzImage"
+CONFIG_PAYLOAD_FILE="../../build/librem13v2/bzImage"
 CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=3"
-CONFIG_LINUX_INITRD="../../build/librem_13v2/initrd.cpio.xz"
+CONFIG_LINUX_INITRD="../../build/librem13v2/initrd.cpio.xz"
diff --git a/config/coreboot-librem_13v4.config → config/coreboot-librem13v4.config b/config/coreboot-librem_13v4.config → config/coreboot-librem13v4.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/librem_13v4/bzImage"
+CONFIG_PAYLOAD_FILE="../../build/librem13v4/bzImage"
 CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=3"
-CONFIG_LINUX_INITRD="../../build/librem_13v4/initrd.cpio.xz"
+CONFIG_LINUX_INITRD="../../build/librem13v4/initrd.cpio.xz"
diff --git a/config/coreboot-librem_15v3.config → config/coreboot-librem15v3.config b/config/coreboot-librem_15v3.config → config/coreboot-librem15v3.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/librem_15v3/bzImage"
+CONFIG_PAYLOAD_FILE="../../build/librem15v3/bzImage"
 CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=3"
-CONFIG_LINUX_INITRD="../../build/librem_15v3/initrd.cpio.xz"
+CONFIG_LINUX_INITRD="../../build/librem15v3/initrd.cpio.xz"
diff --git a/config/coreboot-librem_15v4.config → config/coreboot-librem15v4.config b/config/coreboot-librem_15v4.config → config/coreboot-librem15v4.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/librem_15v4/bzImage"
+CONFIG_PAYLOAD_FILE="../../build/librem15v4/bzImage"
 CONFIG_LINUX_COMMAND_LINE="intel_iommu=igfx_off quiet loglevel=3"
-CONFIG_LINUX_INITRD="../../build/librem_15v4/initrd.cpio.xz"
+CONFIG_LINUX_INITRD="../../build/librem15v4/initrd.cpio.xz"
diff --git a/config/coreboot-librem_mini.config b/config/coreboot-librem_mini.config
diff --git a/config/linux-librem_common.config → config/linux-librem13v2.config b/config/linux-librem_common.config → config/linux-librem13v2.config
@@ -319,4 +319,3 @@ 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,7 +8,6 @@ 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
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