From e6dbfab3c2e62bc7b2de07e579e7b54320f94f1a Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Fri, 8 Oct 2021 17:27:11 -0500 Subject: [PATCH] board/librem_{mini,mini_v2}: Migrate from coreboot 4.13 to 4.14 - adjust board configs - move/rename coreboot patch - adjust comment in CI config Signed-off-by: Matt DeVillier --- .circleci/config.yml | 2 +- boards/librem_mini/librem_mini.config | 2 +- boards/librem_mini_v2/librem_mini_v2.config | 2 +- .../0001-soc-cannonlake-me.c-Always-print-ME-status.patch | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename patches/{coreboot-4.13 => coreboot-4.14}/0001-soc-cannonlake-me.c-Always-print-ME-status.patch (100%) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5fdbea50..8afe42ec 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -179,7 +179,7 @@ workflows: requires: - qemu-coreboot - # Coreboot 4.13 + # Coreboot 4.14 - build_and_persist: name: librem_mini target: librem_mini diff --git a/boards/librem_mini/librem_mini.config b/boards/librem_mini/librem_mini.config index c898b6c2..42461ee1 100644 --- a/boards/librem_mini/librem_mini.config +++ b/boards/librem_mini/librem_mini.config @@ -3,7 +3,7 @@ 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.13 +export CONFIG_COREBOOT_VERSION=4.14 export CONFIG_LINUX_VERSION=5.10.5 export CONFIG_PURISM_BLOBS=y diff --git a/boards/librem_mini_v2/librem_mini_v2.config b/boards/librem_mini_v2/librem_mini_v2.config index 7b70dc0b..ad1c009f 100644 --- a/boards/librem_mini_v2/librem_mini_v2.config +++ b/boards/librem_mini_v2/librem_mini_v2.config @@ -3,7 +3,7 @@ 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.13 +export CONFIG_COREBOOT_VERSION=4.14 export CONFIG_LINUX_VERSION=5.10.5 export CONFIG_PURISM_BLOBS=y diff --git a/patches/coreboot-4.13/0001-soc-cannonlake-me.c-Always-print-ME-status.patch b/patches/coreboot-4.14/0001-soc-cannonlake-me.c-Always-print-ME-status.patch similarity index 100% rename from patches/coreboot-4.13/0001-soc-cannonlake-me.c-Always-print-ME-status.patch rename to patches/coreboot-4.14/0001-soc-cannonlake-me.c-Always-print-ME-status.patch