Skip to content

Commit 7c9f0a7

Browse files
committed
coreboot+coreboot patch+CircleCI config: adapt to have nv41/ns50 build on top of linuxboot#1417 and linuxboot#1462
PoC: reuse 4.19 buildstack to make clear if there is a gain or not, since nv41/ns50 are based on x230-hotp-maximized which wil be cached after clean build
1 parent 89b9e5e commit 7c9f0a7

File tree

3 files changed

+39
-3
lines changed

3 files changed

+39
-3
lines changed

.circleci/config.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -231,13 +231,17 @@ workflows:
231231
requires:
232232
- x230-hotp-maximized
233233

234-
# coreboot-git Nitropads on top of coreboot-git librems
234+
# coreboot-git Nitropads depending on x230-hotp-maximized cache
235+
# since kernel is 6.x and coreboot is git is unshared
236+
# We use nitropad's coreboot's fork crossgcc
237+
# No need to wait further for other board's cache.
238+
# We reuse built modules from x230-hotp-maximized cache only
235239
- build_and_persist:
236240
name: nitropad-nv41
237241
target: nitropad-nv41
238242
subcommand: ""
239243
requires:
240-
- librem_14
244+
- x230-hotp-maximized
241245

242246
# coreboot-git Talos II (PPC)
243247
- build_and_persist:
@@ -548,7 +552,7 @@ workflows:
548552
requires:
549553
- librem_14
550554

551-
#coreboot-git Nitrokey NV
555+
#coreboot-git dasharo clevo_release + staging IASL patch
552556
- build:
553557
name: nitropad-ns50
554558
target: nitropad-ns50

modules/coreboot

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,14 @@ coreboot-purism_repo := https://source.puri.sm/firmware/coreboot.git
8585
coreboot-purism_commit_hash := a899f08d2789db1dd9b02cff34179c4d38e6d0e3
8686
$(eval $(call coreboot_module,purism,))
8787

88+
#Nitrokey nv41/ns50 are based on Dasharo coreboot port,
89+
# with patches staging under coreboot-clevo_release
90+
coreboot-nitrokey_repo := https://github.com/dasharo/coreboot
91+
coreboot-nitrokey_commit_hash := ae10b20f5c6abc9c23f709b65c46be6525da8c13
92+
coreboot-nitrokey_patch_version := clevo_release
93+
#We use clevo_release's crossgcc for now, unshared but between nitropad nv41/ns50
94+
$(eval $(call coreboot_module,nitrokey,4.19))
95+
8896
# Check that the board configured the coreboot version correctly
8997
ifeq "$(CONFIG_COREBOOT_VERSION)" ""
9098
$(error "$(BOARD): does not specify coreboot version under CONFIG_COREBOOT_VERSION")
@@ -99,6 +107,7 @@ coreboot_dir := $($(coreboot_module)_dir)
99107
coreboot_base_dir := $($(coreboot_module)_base_dir)
100108

101109
$(coreboot_module)_depends += $(if $(CONFIG_PURISM_BLOBS), purism-blobs)
110+
$(coreboot_module)_depends += $(if $(CONFIG_NITROKEY_BLOBS), nitrokey-blobs)
102111

103112
# coreboot builds are specialized on a per-target basis.
104113
# The builds are done in a per-target subdirectory
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
From 6328eebb101fd0ded7168e1377da6a1a82a8e2da Mon Sep 17 00:00:00 2001
2+
From: Markus Meissner <[email protected]>
3+
Date: Wed, 19 Jul 2023 20:36:57 +0200
4+
Subject: [PATCH] change acpica-unix2 location to a mirror
5+
6+
---
7+
util/crossgcc/buildgcc | 2 +-
8+
1 file changed, 1 insertion(+), 1 deletion(-)
9+
10+
diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc
11+
index 03c24da1be9..8880c89ea66 100755
12+
--- a/util/crossgcc/buildgcc
13+
+++ b/util/crossgcc/buildgcc
14+
@@ -52,7 +52,7 @@ MPFR_ARCHIVE="https://ftpmirror.gnu.org/mpfr/mpfr-${MPFR_VERSION}.tar.xz"
15+
MPC_ARCHIVE="https://ftpmirror.gnu.org/mpc/mpc-${MPC_VERSION}.tar.gz"
16+
GCC_ARCHIVE="https://ftpmirror.gnu.org/gcc/gcc-${GCC_VERSION}/gcc-${GCC_VERSION}.tar.xz"
17+
BINUTILS_ARCHIVE="https://ftpmirror.gnu.org/binutils/binutils-${BINUTILS_VERSION}.tar.xz"
18+
-IASL_ARCHIVE="https://acpica.org/sites/acpica/files/acpica-unix2-${IASL_VERSION}.tar.gz"
19+
+IASL_ARCHIVE="https://gsdview.appspot.com/chromeos-localmirror/distfiles/acpica-unix2-${IASL_VERSION}.tar.gz"
20+
# CLANG toolchain archive locations
21+
LLVM_ARCHIVE="https://github.com/llvm/llvm-project/releases/download/llvmorg-${CLANG_VERSION}/llvm-${CLANG_VERSION}.src.tar.xz"
22+
CLANG_ARCHIVE="https://github.com/llvm/llvm-project/releases/download/llvmorg-${CLANG_VERSION}/clang-${CLANG_VERSION}.src.tar.xz"
23+

0 commit comments

Comments
 (0)