From 5f067ea908c1c22855801bfe4d9ee4f07739241e Mon Sep 17 00:00:00 2001 From: Thierry Laurion Date: Fri, 10 Jul 2020 09:44:01 -0400 Subject: [PATCH] coreboot: 4.8.1 fixed in Makefile, coreboot module and board configs (coreboot_481) to facilitate newer coreboot version integration and testing without breaking old fixed boards --- boards/kgpe-d16/kgpe-d16.config | 2 ++ boards/librem13v2/librem13v2.config | 2 ++ boards/librem13v4/librem13v4.config | 2 ++ boards/librem15v3/librem15v3.config | 2 ++ boards/librem15v4/librem15v4.config | 2 ++ .../qemu-coreboot-fbwhiptail.config | 2 ++ boards/qemu-coreboot/qemu-coreboot.config | 2 ++ boards/t420/t420.config | 2 ++ boards/t430-flash/t430-flash.config | 2 ++ boards/t430/t430.config | 2 ++ boards/x220/x220.config | 2 ++ boards/x230-flash/x230-flash.config | 2 ++ .../x230-hotp-verification/x230-hotp-verification.config | 2 ++ boards/x230/x230.config | 2 ++ modules/coreboot | 9 +++++++-- 15 files changed, 35 insertions(+), 2 deletions(-) diff --git a/boards/kgpe-d16/kgpe-d16.config b/boards/kgpe-d16/kgpe-d16.config index 072f36ac8..58130699e 100644 --- a/boards/kgpe-d16/kgpe-d16.config +++ b/boards/kgpe-d16/kgpe-d16.config @@ -1,5 +1,7 @@ # Configuration for a kgpe-d16 running non-Qubes export CONFIG_COREBOOT=y +export CONFIG_COREBOOT_VERSION=4.8.1 + CONFIG_COREBOOT_CONFIG=config/coreboot-kgpe-d16.config CONFIG_LINUX_CONFIG=config/linux-kgpe-d16.config diff --git a/boards/librem13v2/librem13v2.config b/boards/librem13v2/librem13v2.config index 312fb7225..72d4554c5 100644 --- a/boards/librem13v2/librem13v2.config +++ b/boards/librem13v2/librem13v2.config @@ -3,6 +3,8 @@ 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 + CONFIG_CRYPTSETUP=y CONFIG_FLASHROM=y CONFIG_FLASHTOOLS=y diff --git a/boards/librem13v4/librem13v4.config b/boards/librem13v4/librem13v4.config index 765c0d83f..c9200f8fd 100644 --- a/boards/librem13v4/librem13v4.config +++ b/boards/librem13v4/librem13v4.config @@ -3,6 +3,8 @@ 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 + CONFIG_CRYPTSETUP=y CONFIG_FLASHROM=y CONFIG_FLASHTOOLS=y diff --git a/boards/librem15v3/librem15v3.config b/boards/librem15v3/librem15v3.config index 82d2ad8ba..609afc36a 100644 --- a/boards/librem15v3/librem15v3.config +++ b/boards/librem15v3/librem15v3.config @@ -5,6 +5,8 @@ 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 + CONFIG_CRYPTSETUP=y CONFIG_FLASHROM=y CONFIG_FLASHTOOLS=y diff --git a/boards/librem15v4/librem15v4.config b/boards/librem15v4/librem15v4.config index 0fcddcbb5..c58e146d2 100644 --- a/boards/librem15v4/librem15v4.config +++ b/boards/librem15v4/librem15v4.config @@ -5,6 +5,8 @@ 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 + CONFIG_CRYPTSETUP=y CONFIG_FLASHROM=y CONFIG_FLASHTOOLS=y diff --git a/boards/qemu-coreboot-fbwhiptail/qemu-coreboot-fbwhiptail.config b/boards/qemu-coreboot-fbwhiptail/qemu-coreboot-fbwhiptail.config index 125879a46..73ced6bad 100644 --- a/boards/qemu-coreboot-fbwhiptail/qemu-coreboot-fbwhiptail.config +++ b/boards/qemu-coreboot-fbwhiptail/qemu-coreboot-fbwhiptail.config @@ -2,6 +2,8 @@ # the qemu emulator in GUI mode thanks to FBWhiptail export CONFIG_COREBOOT=y +export CONFIG_COREBOOT_VERSION=4.8.1 + CONFIG_COREBOOT_CONFIG=config/coreboot-qemu-fbwhiptail.config CONFIG_LINUX_CONFIG=config/linux-qemu.config diff --git a/boards/qemu-coreboot/qemu-coreboot.config b/boards/qemu-coreboot/qemu-coreboot.config index a36b70326..ce2a2fa74 100644 --- a/boards/qemu-coreboot/qemu-coreboot.config +++ b/boards/qemu-coreboot/qemu-coreboot.config @@ -2,6 +2,8 @@ # the qemu emulator. Note that the TPM does not work, so this # will just drop into the recovery shell. export CONFIG_COREBOOT=y +export CONFIG_COREBOOT_VERSION=4.8.1 + CONFIG_COREBOOT_CONFIG=config/coreboot-qemu.config CONFIG_LINUX_CONFIG=config/linux-qemu.config diff --git a/boards/t420/t420.config b/boards/t420/t420.config index 71d769f23..c83e3097d 100644 --- a/boards/t420/t420.config +++ b/boards/t420/t420.config @@ -1,5 +1,7 @@ # Configuration for a T420 running Qubes and other OS, T420 is identical to X230 on the Linux Side of things. export CONFIG_COREBOOT=y +export CONFIG_COREBOOT_VERSION=4.8.1 + CONFIG_COREBOOT_CONFIG=config/coreboot-t420.config CONFIG_LINUX_CONFIG=config/linux-x230.config diff --git a/boards/t430-flash/t430-flash.config b/boards/t430-flash/t430-flash.config index 16b3617f2..626fde196 100644 --- a/boards/t430-flash/t430-flash.config +++ b/boards/t430-flash/t430-flash.config @@ -2,6 +2,8 @@ BOARD=t430.flash export CONFIG_COREBOOT=y +export CONFIG_COREBOOT_VERSION=4.8.1 + CONFIG_FLASHROM=y CONFIG_FLASHTOOLS=y CONFIG_PCIUTILS=y diff --git a/boards/t430/t430.config b/boards/t430/t430.config index b2487e439..3eaaba715 100644 --- a/boards/t430/t430.config +++ b/boards/t430/t430.config @@ -1,5 +1,7 @@ # Configuration for a t430 running Qubes and other OSes export CONFIG_COREBOOT=y +export CONFIG_COREBOOT_VERSION=4.8.1 + CONFIG_COREBOOT_CONFIG=config/coreboot-t430.config CONFIG_LINUX_CONFIG=config/linux-x230.config diff --git a/boards/x220/x220.config b/boards/x220/x220.config index 7548b773a..0efffec41 100644 --- a/boards/x220/x220.config +++ b/boards/x220/x220.config @@ -1,5 +1,7 @@ # Configuration for a x220 running Qubes and other OS, X220 is identical to X230 on the Linux Side of things. export CONFIG_COREBOOT=y +export CONFIG_COREBOOT_VERSION=4.8.1 + CONFIG_COREBOOT_CONFIG=config/coreboot-x220.config CONFIG_LINUX_CONFIG=config/linux-x230.config diff --git a/boards/x230-flash/x230-flash.config b/boards/x230-flash/x230-flash.config index f991b1161..c878012de 100644 --- a/boards/x230-flash/x230-flash.config +++ b/boards/x230-flash/x230-flash.config @@ -2,6 +2,8 @@ BOARD=x230.flash export CONFIG_COREBOOT=y +export CONFIG_COREBOOT_VERSION=4.8.1 + CONFIG_FLASHROM=y #CONFIG_GPG=y CONFIG_FLASHTOOLS=y diff --git a/boards/x230-hotp-verification/x230-hotp-verification.config b/boards/x230-hotp-verification/x230-hotp-verification.config index 1c9ef31b2..c5d83ee19 100644 --- a/boards/x230-hotp-verification/x230-hotp-verification.config +++ b/boards/x230-hotp-verification/x230-hotp-verification.config @@ -1,6 +1,8 @@ # Configuration for a x230-hotp-verification (Nitrokey/Purism USB Security dongle enabled HOTP support) # running Qubes and other OSes export CONFIG_COREBOOT=y +export CONFIG_COREBOOT_VERSION=4.8.1 + CONFIG_COREBOOT_CONFIG=config/coreboot-x230-hotp-verification.config CONFIG_LINUX_CONFIG=config/linux-x230.config diff --git a/boards/x230/x230.config b/boards/x230/x230.config index 48a11525b..8a04bc570 100644 --- a/boards/x230/x230.config +++ b/boards/x230/x230.config @@ -1,5 +1,7 @@ # Configuration for a x230 running Qubes and other OSes export CONFIG_COREBOOT=y +export CONFIG_COREBOOT_VERSION=4.8.1 + CONFIG_COREBOOT_CONFIG=config/coreboot-x230.config CONFIG_LINUX_CONFIG=config/linux-x230.config diff --git a/modules/coreboot b/modules/coreboot index 2f63ee2ef..a14ea3eda 100644 --- a/modules/coreboot +++ b/modules/coreboot @@ -1,13 +1,18 @@ modules-$(CONFIG_COREBOOT) += coreboot +ifeq "$(CONFIG_COREBOOT_VERSION)" "4.8.1" +coreboot_version := 4.8.1 +coreboot_hash := f0ddf4db0628c1fe1e8348c40084d9cbeb5771400c963fd419cda3995b69ad23 +else +$(error "$(BOARD): does not specify coreboot version under CONFIG_COREBOOT_VERSION") +endif + #coreboot_version := git #coreboot_repo := https://github.com/osresearch/coreboot -coreboot_version := 4.8.1 coreboot_base_dir := coreboot-$(coreboot_version) coreboot_dir := $(coreboot_base_dir)/$(BOARD) coreboot_tar := coreboot-$(coreboot_version).tar.xz coreboot_url := https://www.coreboot.org/releases/$(coreboot_tar) -coreboot_hash := f0ddf4db0628c1fe1e8348c40084d9cbeb5771400c963fd419cda3995b69ad23 # coreboot builds are specialized on a per-target basis. # The builds are done in a per-target subdirectory