Skip to content

Commit 05289c0

Browse files
tlauriontlaurion
authored
Merge pull request #1604 from tlaurion/422_fhd
4.22.01 fhd patch merged upstream (4.24) + bump all 4.19 boards to 4.22.01
2 parents ebdcc85 + 7fe2f9d commit 05289c0

82 files changed

Lines changed: 1322 additions & 827 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.circleci/config.yml‎

Lines changed: 22 additions & 126 deletions
Original file line numberDiff line numberDiff line change
@@ -193,9 +193,10 @@ jobs:
193193
- build/x86/coreboot-4.14
194194
- build/x86/coreboot-4.15
195195
- build/x86/coreboot-4.17
196-
- build/x86/coreboot-4.19
197-
- build/x86/coreboot-git
198-
- build/ppc64/coreboot-git
196+
- build/x86/coreboot-4.22.01
197+
- build/x86/coreboot-purism
198+
- build/x86/coreboot-nitrokey
199+
- build/ppc64/coreboot-talos_2
199200
- save_cache:
200201
#Generate cache for the exact same modules definitions if hash is not previously existing
201202
key: heads-modules-and-patches-{{ checksum "./tmpDir/all_modules_and_patches.sha256sums" }}{{ .Environment.CACHE_VERSION }}
@@ -215,7 +216,7 @@ workflows:
215216
# version. The last board in the sequence is the dependency
216217
# for the parallel boards built at the end, and also save_cache.
217218

218-
# coreboot 4.19
219+
# coreboot 4.22.01
219220
- build_and_persist:
220221
name: x230-hotp-maximized
221222
target: x230-hotp-maximized
@@ -256,14 +257,14 @@ workflows:
256257
- save_cache:
257258
requires:
258259
- talos-2
259-
- nitropad-nv41
260+
- librem_14
260261

261262
#
262263
# Those onboarding new boards should add their entries below.
263264
#
264265
#
265266

266-
#Coreboot 4.19 boards
267+
#Coreboot 4.22.01 boards
267268
- build:
268269
name: x220-hotp-maximized
269270
target: x220-hotp-maximized
@@ -285,55 +286,20 @@ workflows:
285286
requires:
286287
- x230-hotp-maximized
287288

288-
- build:
289-
name: UNTESTED_t520-hotp-maximized
290-
target: UNTESTED_t520-hotp-maximized
291-
subcommand: ""
292-
requires:
293-
- x230-hotp-maximized
294-
295289
- build:
296290
name: t420-maximized
297291
target: t420-maximized
298292
subcommand: ""
299293
requires:
300294
- x230-hotp-maximized
301295

302-
- build:
303-
name: UNTESTED_t520-maximized
304-
target: UNTESTED_t520-maximized
305-
subcommand: ""
306-
requires:
307-
- x230-hotp-maximized
308-
309296
- build:
310297
name: x230-legacy-flash
311298
target: x230-legacy-flash
312299
subcommand: ""
313300
requires:
314301
- x230-hotp-maximized
315302

316-
- build:
317-
name: UNTESTED_t430-legacy-flash
318-
target: UNTESTED_t430-legacy-flash
319-
subcommand: ""
320-
requires:
321-
- x230-hotp-maximized
322-
323-
- build:
324-
name: UNTESTED_t430-legacy
325-
target: UNTESTED_t430-legacy
326-
subcommand: ""
327-
requires:
328-
- x230-hotp-maximized
329-
330-
- build:
331-
name: UNTESTED_t430-hotp-legacy
332-
target: UNTESTED_t430-hotp-legacy
333-
subcommand: ""
334-
requires:
335-
- x230-hotp-maximized
336-
337303
- build:
338304
name: x230-legacy
339305
target: x230-legacy
@@ -383,83 +349,27 @@ workflows:
383349
requires:
384350
- x230-hotp-maximized
385351

386-
- build:
387-
name: UNTESTED_t530-hotp-maximized
388-
target: UNTESTED_t530-hotp-maximized
389-
subcommand: ""
390-
requires:
391-
- x230-hotp-maximized
392-
393-
- build:
394-
name: UNTESTED_t530-dgpu-hotp-maximized
395-
target: UNTESTED_t530-dgpu-hotp-maximized
396-
subcommand: ""
397-
requires:
398-
- x230-hotp-maximized
399-
400352
- build:
401353
name: w530-hotp-maximized
402354
target: w530-hotp-maximized
403355
subcommand: ""
404356
requires:
405357
- x230-hotp-maximized
406358

407-
- build:
408-
name: UNTESTED_w530-dgpu-K1000m-hotp-maximized
409-
target: UNTESTED_w530-dgpu-K1000m-hotp-maximized
410-
subcommand: ""
411-
requires:
412-
- x230-hotp-maximized
413-
414-
- build:
415-
name: UNTESTED_w530-dgpu-K2000m-hotp-maximized
416-
target: UNTESTED_w530-dgpu-K2000m-hotp-maximized
417-
subcommand: ""
418-
requires:
419-
- x230-hotp-maximized
420-
421359
- build:
422360
name: t430-maximized
423361
target: t430-maximized
424362
subcommand: ""
425363
requires:
426364
- x230-hotp-maximized
427365

428-
- build:
429-
name: UNTESTED_t530-maximized
430-
target: UNTESTED_t530-maximized
431-
subcommand: ""
432-
requires:
433-
- x230-hotp-maximized
434-
435-
- build:
436-
name: UNTESTED_t530-dgpu-maximized
437-
target: UNTESTED_t530-dgpu-maximized
438-
subcommand: ""
439-
requires:
440-
- x230-hotp-maximized
441-
442366
- build:
443367
name: w530-maximized
444368
target: w530-maximized
445369
subcommand: ""
446370
requires:
447371
- x230-hotp-maximized
448372

449-
- build:
450-
name: UNTESTED_w530-dgpu-K1000m-maximized
451-
target: UNTESTED_w530-dgpu-K1000m-maximized
452-
subcommand: ""
453-
requires:
454-
- x230-hotp-maximized
455-
456-
- build:
457-
name: UNTESTED_w530-dgpu-K2000m-maximized
458-
target: UNTESTED_w530-dgpu-K2000m-maximized
459-
subcommand: ""
460-
requires:
461-
- x230-hotp-maximized
462-
463373
- build:
464374
name: t440p-maximized
465375
target: t440p-maximized
@@ -509,20 +419,6 @@ workflows:
509419
requires:
510420
- x230-hotp-maximized
511421

512-
- build:
513-
name: UNTESTED_p8z77-m_pro-tpm1-maximized
514-
target: UNTESTED_p8z77-m_pro-tpm1-maximized
515-
subcommand: ""
516-
requires:
517-
- x230-hotp-maximized
518-
519-
- build:
520-
name: UNTESTED_p8z77-m_pro-tpm1-hotp-maximized
521-
target: UNTESTED_p8z77-m_pro-tpm1-hotp-maximized
522-
subcommand: ""
523-
requires:
524-
- x230-hotp-maximized
525-
526422
#coreboot-git librem boards
527423
- build:
528424
name: librem_13v2
@@ -575,25 +471,25 @@ workflows:
575471
- nitropad-nv41
576472

577473
# - build:
578-
# name: UNTESTED_kgpe-d16_workstation-usb_keyboard
579-
# target: UNTESTED_kgpe-d16_workstation-usb_keyboard
474+
# name: UNMAINTAINED_kgpe-d16_workstation-usb_keyboard
475+
# target: UNMAINTAINED_kgpe-d16_workstation-usb_keyboard
580476
# subcommand: ""
581477
# requires:
582-
# - UNTESTED_kgpe-d16_workstation
478+
# - UNMAINTAINED_kgpe-d16_workstation
583479

584480
# - build:
585-
# name: UNTESTED_kgpe-d16_server
586-
# target: UNTESTED_kgpe-d16_server
481+
# name: UNMAINTAINED_kgpe-d16_server
482+
# target: UNMAINTAINED_kgpe-d16_server
587483
# subcommand: ""
588484
# requires:
589-
# - UNTESTED_kgpe-d16_workstation
485+
# - UNMAINTAINED_kgpe-d16_workstation
590486

591487
# - build:
592-
# name: UNTESTED_kgpe-d16_server-whiptail
593-
# target: UNTESTED_kgpe-d16_server-whiptail
488+
# name: UNMAINTAINED_kgpe-d16_server-whiptail
489+
# target: UNMAINTAINED_kgpe-d16_server-whiptail
594490
# subcommand: ""
595491
# requires:
596-
# - UNTESTED_kgpe-d16_workstation
492+
# - UNMAINTAINED_kgpe-d16_workstation
597493

598494
# - build:
599495
# name: librem_l1um
@@ -610,24 +506,24 @@ workflows:
610506
# linuxboot steps need something to pass in the kernel header path
611507
# skipping for now
612508
# - run:
613-
# name: UNTESTED_qemu-linuxboot-edk2
509+
# name: UNMAINTAINED_qemu-linuxboot-edk2
614510
# command: |
615511
# ./build/make-4.2.1/make \
616512
# CROSS=/cross/bin/x86_64-linux-musl- \
617-
# BOARD=UNTESTED_qemu-linuxboot \
513+
# BOARD=UNMAINTAINED_qemu-linuxboot \
618514
# `/bin/pwd`/build/linuxboot-git/build/qemu/.configured \
619515
# # Run first to avoid too many processes
620516
#
621517
# - run:
622-
# name: UNTESTED_qemu-linuxboot
518+
# name: UNMAINTAINED_qemu-linuxboot
623519
# command: |
624520
# ./build/make-4.2.1/make \
625521
# CROSS=/cross/bin/x86_64-linux-musl- \
626522
# CPUS=16 \
627523
# V=1 \
628-
# BOARD=UNTESTED_qemu-linuxboot \
524+
# BOARD=UNMAINTAINED_qemu-linuxboot \
629525
#
630526
# - store-artifacts:
631-
# path: build/UNTESTED_qemu-linuxboot/linuxboot.rom
527+
# path: build/UNMAINTAINED_qemu-linuxboot/linuxboot.rom
632528
# - store-artifacts:
633-
# path: build/UNTESTED_qemu-linuxboot/hashes.txt
529+
# path: build/UNMAINTAINED_qemu-linuxboot/hashes.txt

‎Makefile‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -748,6 +748,18 @@ board.move_untested_to_tested:
748748
echo "Replacing $$BOARD with $$NEW_BOARD in .circleci/config.yml"; \
749749
sed -i "s/$$BOARD/$$NEW_BOARD/g" .circleci/config.yml
750750

751+
board.move_untested_to_unmaintained:
752+
@echo "NEW_BOARD variable will move from UNTESTED_ to UNMAINTAINED_ from $(BOARD)"
753+
@NEW_BOARD=$$(echo $(BOARD) | sed 's/^UNTESTED_/UNMAINTAINED_/g'); \
754+
echo "Renaming boards/$$BOARD/$$BOARD.config to boards/$$BOARD/$$NEW_BOARD.config"; \
755+
mkdir -p unmaintained_boards; \
756+
mv boards/$$BOARD/$$BOARD.config unmaintained_boards/$$BOARD/$$NEW_BOARD.config; \
757+
echo "Renaming boards/$$BOARD to unmaintainted_boards/$$NEW_BOARD"; \
758+
rm -rf boards/$$NEW_BOARD; \
759+
mv boards/$$BOARD unmaintained_boards/$$NEW_BOARD; \
760+
echo "Replacing $$BOARD with $$NEW_BOARD in .circleci/config.yml. Delete manually entries"; \
761+
sed -i "s/$$BOARD/$$NEW_BOARD/g" .circleci/config.yml
762+
751763
board.move_tested_to_untested:
752764
@echo "NEW_BOARD variable will add UNTESTED_ prefix to $(BOARD)"
753765
@NEW_BOARD=UNTESTED_$(BOARD); \

‎boards/qemu-coreboot-fbwhiptail-tpm1-hotp/qemu-coreboot-fbwhiptail-tpm1-hotp.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Nitrokey Pro can also be used by forwarding the USB device from the host to
66
# the VM.
77
export CONFIG_COREBOOT=y
8-
export CONFIG_COREBOOT_VERSION=4.19
8+
export CONFIG_COREBOOT_VERSION=4.22.01
99
export CONFIG_LINUX_VERSION=5.10.5
1010

1111
#Enable only one RESTRICTED/BASIC boot modes below to test them manually (we cannot inject config under QEMU (no internal flashing)

‎boards/qemu-coreboot-fbwhiptail-tpm1/qemu-coreboot-fbwhiptail-tpm1.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# TPM can be used with a qemu software TPM (TIS, 1.2).
55
export CONFIG_COREBOOT=y
6-
export CONFIG_COREBOOT_VERSION=4.19
6+
export CONFIG_COREBOOT_VERSION=4.22.01
77
export CONFIG_LINUX_VERSION=5.10.5
88

99
#Enable only one RESTRICTED/BASIC boot modes below to test them manually (we cannot inject config under QEMU (no internal flashing)

‎boards/qemu-coreboot-fbwhiptail-tpm2-hotp/qemu-coreboot-fbwhiptail-tpm2-hotp.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# TPM can be used with a qemu software TPM (TIS, 2.0).
66
export CONFIG_COREBOOT=y
7-
export CONFIG_COREBOOT_VERSION=4.19
7+
export CONFIG_COREBOOT_VERSION=4.22.01
88
export CONFIG_LINUX_VERSION=5.10.5
99

1010
#Enable only one RESTRICTED/BASIC boot modes below to test them manually (we cannot inject config under QEMU (no internal flashing)

‎boards/qemu-coreboot-fbwhiptail-tpm2/qemu-coreboot-fbwhiptail-tpm2.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# TPM can be used with a qemu software TPM (TIS, 2.0).
55
export CONFIG_COREBOOT=y
6-
export CONFIG_COREBOOT_VERSION=4.19
6+
export CONFIG_COREBOOT_VERSION=4.22.01
77
export CONFIG_LINUX_VERSION=5.10.5
88

99
#Enable only one RESTRICTED/BASIC boot modes below to test them manually (we cannot inject config under QEMU (no internal flashing)

‎boards/qemu-coreboot-whiptail-tpm1-hotp/qemu-coreboot-whiptail-tpm1-hotp.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Nitrokey Pro can also be used by forwarding the USB device from the host to
66
# the VM.
77
export CONFIG_COREBOOT=y
8-
export CONFIG_COREBOOT_VERSION=4.19
8+
export CONFIG_COREBOOT_VERSION=4.22.01
99
export CONFIG_LINUX_VERSION=5.10.5
1010

1111
#Enable only one RESTRICTED/BASIC boot modes below to test them manually (we cannot inject config under QEMU (no internal flashing)

‎boards/qemu-coreboot-whiptail-tpm1/qemu-coreboot-whiptail-tpm1.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# TPM can be used with a qemu software TPM (TIS, 1.2).
55
export CONFIG_COREBOOT=y
6-
export CONFIG_COREBOOT_VERSION=4.19
6+
export CONFIG_COREBOOT_VERSION=4.22.01
77
export CONFIG_LINUX_VERSION=5.10.5
88

99
#Enable only one RESTRICTED/BASIC boot modes below to test them manually (we cannot inject config under QEMU (no internal flashing))

‎boards/qemu-coreboot-whiptail-tpm2-hotp/qemu-coreboot-whiptail-tpm2-hotp.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# TPM can be used with a qemu software TPM (TIS, 2.0).
66
export CONFIG_COREBOOT=y
7-
export CONFIG_COREBOOT_VERSION=4.19
7+
export CONFIG_COREBOOT_VERSION=4.22.01
88
export CONFIG_LINUX_VERSION=5.10.5
99

1010
#Enable only one RESTRICTED/BASIC boot modes below to test them manually (we cannot inject config under QEMU (no internal flashing)

‎boards/qemu-coreboot-whiptail-tpm2/qemu-coreboot-whiptail-tpm2.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# TPM can be used with a qemu software TPM (TIS, 2.0).
55
export CONFIG_COREBOOT=y
6-
export CONFIG_COREBOOT_VERSION=4.19
6+
export CONFIG_COREBOOT_VERSION=4.22.01
77
export CONFIG_LINUX_VERSION=5.10.5
88

99
#Enable only one RESTRICTED/BASIC boot modes below to test them manually (we cannot inject config under QEMU (no internal flashing)

0 commit comments

Comments
 (0)