Skip to content

Commit b62e702

Browse files
committed
coreboot 4.8.1: add upstreamed coreboot sutil patch and librem_15v3(Q4.0 compatible) board to CircleCI config to test build.
1 parent b220812 commit b62e702

2 files changed

Lines changed: 45 additions & 7 deletions

File tree

.circleci/config.yml

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,12 @@ jobs:
8888
8989
- run:
9090
name: Download and neuter xx30 ME (keep generated GBE and extracted IFD in tree)
91-
# me_cleaner.py present under heads xx30 blobs dir comes from https://github.com/corna/me_cleaner/blob/43612a630c79f3bc6f2653bfe90dfe0b7b137e08/me_cleaner.py
91+
# Below when we download me_cleaner it's not really that important to validate it's
92+
# integrity. This is because ./blobs/xx30/download_clean_me.sh does a hash check on
93+
# it's result anyway.
9294
command: |
95+
wget -O ./blobs/xx30/me_cleaner.py https://raw.githubusercontent.com/corna/me_cleaner/master/me_cleaner.py
96+
chmod +x ./blobs/xx30/me_cleaner.py
9397
./blobs/xx30/download_clean_me.sh -m $(readlink -f ./blobs/xx30/me_cleaner.py)
9498
9599
- persist_to_workspace:
@@ -163,6 +167,13 @@ workflows:
163167
# version. The last board in the sequence is the dependency
164168
# for the parallel boards built at the end, and also save_cache.
165169

170+
# Coreboot 4.8.1
171+
- build_and_persist:
172+
name: librem_15v3
173+
target: librem_15v3
174+
requires:
175+
- prep_env
176+
166177
# Coreboot 4.11
167178
- build_and_persist:
168179
name: kgpe-d16_workstation
@@ -266,12 +277,6 @@ workflows:
266277
requires:
267278
- x230-hotp-maximized
268279

269-
- build:
270-
name: qemu-coreboot
271-
target: qemu-coreboot
272-
requires:
273-
- librem_mini
274-
275280
- build:
276281
name: qemu-coreboot-fbwhiptail
277282
target: qemu-coreboot-fbwhiptail
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
From f02ed614d2a031aeb73777b06dc0934bb9520e50 Mon Sep 17 00:00:00 2001
2+
From: Patrick Georgi <patrick@georgi.software>
3+
Date: Fri, 22 Oct 2021 07:46:14 +0200
4+
Subject: [PATCH] util/sconfig: Avoid duplicate symbols in link step
5+
6+
Recent linkers became more picky about unifying identical symbols, so
7+
avoid struct *device head to appear several times by marking it
8+
"extern".
9+
10+
Follows a change in commit 79e8412665567c, but without carrying all the
11+
other refactorings done there.
12+
13+
Change-Id: Icede0936cc99f1c183c09812bffc3cc9a3993efa
14+
Signed-off-by: Patrick Georgi <patrick@georgi.software>
15+
Reviewed-on: https://review.coreboot.org/c/coreboot/+/58534
16+
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
17+
Reviewed-by: Martin Roth <martinroth@google.com>
18+
---
19+
20+
diff --git a/util/sconfig/sconfig.h b/util/sconfig/sconfig.h
21+
index 119d7b5..3ca13b3 100644
22+
--- a/util/sconfig/sconfig.h
23+
+++ b/util/sconfig/sconfig.h
24+
@@ -77,7 +77,7 @@
25+
struct reg *reg;
26+
};
27+
28+
-struct device *head;
29+
+extern struct device *head;
30+
31+
struct header;
32+
struct header {
33+

0 commit comments

Comments
 (0)