Skip to content

Commit 96f379d

Browse files
tlauriontlaurion
committed
Merge branch 'xx20_xx30_kernel_510_bump' into HEAD
2 parents 12b0199 + 03e648c commit 96f379d

File tree

82 files changed

+36942
-1522
lines changed

Some content is hidden

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

82 files changed

+36942
-1522
lines changed

‎.circleci/config.yml

Lines changed: 11 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,7 @@ jobs:
189189
- build/x86/coreboot-4.14
190190
- build/x86/coreboot-4.15
191191
- build/x86/coreboot-4.17
192+
- build/x86/coreboot-4.19
192193
- build/ppc64/coreboot-git
193194
- save_cache:
194195
#Generate cache for the exact same modules definitions if hash is not previously existing
@@ -246,6 +247,7 @@ workflows:
246247
#
247248
#
248249

250+
#Coreboot 4.19 boards
249251
- build:
250252
name: x220-hotp-maximized
251253
target: x220-hotp-maximized
@@ -447,36 +449,37 @@ workflows:
447449
target: t440p-maximized
448450
subcommand: ""
449451
requires:
450-
- librem_14
452+
- x230-hotp-maximized
451453

452454
- build:
453455
name: t440p-hotp-maximized
454456
target: t440p-hotp-maximized
455457
subcommand: ""
456458
requires:
457-
- librem_14
459+
- x230-hotp-maximized
458460

459461
- build:
460-
name: qemu-coreboot
461-
target: qemu-coreboot
462+
name: qemu-coreboot-fbwhiptail-tpm2-hotp
463+
target: qemu-coreboot-fbwhiptail-tpm2-hotp
462464
subcommand: ""
463465
requires:
464466
- x230-hotp-maximized
465467

466468
- build:
467-
name: qemu-coreboot-fbwhiptail
468-
target: qemu-coreboot-fbwhiptail
469+
name: p8z77-m_pro-tpm1-maximized
470+
target: p8z77-m_pro-tpm1-maximized
469471
subcommand: ""
470472
requires:
471473
- x230-hotp-maximized
472474

473475
- build:
474-
name: qemu-coreboot-fbwhiptail-tpm2-hotp
475-
target: qemu-coreboot-fbwhiptail-tpm2-hotp
476+
name: p8z77-m_pro-tpm1-hotp-maximized
477+
target: p8z77-m_pro-tpm1-hotp-maximized
476478
subcommand: ""
477479
requires:
478480
- x230-hotp-maximized
479481

482+
#Coreboot 4.17 boards
480483
- build:
481484
name: librem_13v2
482485
target: librem_13v2
@@ -519,20 +522,6 @@ workflows:
519522
requires:
520523
- librem_14
521524

522-
- build:
523-
name: p8z77-m_pro-tpm1-maximized
524-
target: p8z77-m_pro-tpm1-maximized
525-
subcommand: ""
526-
requires:
527-
- librem_14
528-
529-
- build:
530-
name: p8z77-m_pro-tpm1-hotp-maximized
531-
target: p8z77-m_pro-tpm1-hotp-maximized
532-
subcommand: ""
533-
requires:
534-
- librem_14
535-
536525
# - build:
537526
# name: kgpe-d16_workstation-usb_keyboard
538527
# target: kgpe-d16_workstation-usb_keyboard

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ WGET ?= wget
3737
# Timestamps should be in ISO format
3838
DATE=`date --rfc-3339=seconds`
3939

40-
BOARD ?= qemu-coreboot
40+
BOARD ?= qemu-coreboot-fbwhiptail-tpm1
4141
CONFIG := $(pwd)/boards/$(BOARD)/$(BOARD).config
4242

4343
ifneq "y" "$(shell [ -r '$(CONFIG)' ] && echo y)"

‎blobs/ThePlexus-bootsplash-1024x768.jpg

35.5 KB
Loading

‎blobs/ThePlexus-logo.jpg

46.1 KB
Loading

‎blobs/bootsplash-1024x768.jpg

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ThePlexus-bootsplash-1024x768.jpg

‎blobs/d-dwid-janus-hexa_background-bootsplash-1024x768.jpg

82.3 KB
Loading

‎blobs/d-dwid-janus-hexa_background-logo.jpg

81.1 KB
Loading

‎blobs/d-dwid_janus_variant_of_ThePlexus-bootsplash-1024x768.jpg

36.4 KB
Loading

‎boards/p8z77-m_pro-tpm1-maximized/p8z77-m_pro-tpm1-maximized.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ CONFIG_LINUX_CONFIG=config/linux-x230-maximized.config
3939
CONFIG_COREBOOT_CONFIG=config/coreboot-p8z77-m_pro-tpm1.config
4040

4141
export CONFIG_COREBOOT=y
42-
export CONFIG_COREBOOT_VERSION=4.17
43-
export CONFIG_LINUX_VERSION=4.14.62
42+
export CONFIG_COREBOOT_VERSION=4.19
43+
export CONFIG_LINUX_VERSION=5.10.5
4444

4545
CONFIG_CRYPTSETUP2=y
4646
CONFIG_FLASHROM=y

‎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.13
7+
export CONFIG_COREBOOT_VERSION=4.19
88
export CONFIG_LINUX_VERSION=5.10.5
99

1010
#Enable DEBUG output

‎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.13
6+
export CONFIG_COREBOOT_VERSION=4.19
77
export CONFIG_LINUX_VERSION=5.10.5
88

99
#Enable DEBUG output

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

Lines changed: 0 additions & 66 deletions
This file was deleted.

‎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.13
7+
export CONFIG_COREBOOT_VERSION=4.19
88
export CONFIG_LINUX_VERSION=5.10.5
99

1010
#Enable DEBUG output

‎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.13
6+
export CONFIG_COREBOOT_VERSION=4.19
77
export CONFIG_LINUX_VERSION=5.10.5
88

99
#Enable DEBUG output

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

Lines changed: 0 additions & 67 deletions
This file was deleted.

‎boards/t420-hotp-maximized/t420-hotp-maximized.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
export CONFIG_COREBOOT=y
1212
export CONFIG_COREBOOT_VERSION=4.19
13-
export CONFIG_LINUX_VERSION=4.14.62
13+
export CONFIG_LINUX_VERSION=5.10.5
1414

1515
CONFIG_COREBOOT_CONFIG=config/coreboot-t420-maximized.config
1616
CONFIG_LINUX_CONFIG=config/linux-x230-maximized.config

‎boards/t420-maximized/t420-maximized.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# - dropbear
1010
export CONFIG_COREBOOT=y
1111
export CONFIG_COREBOOT_VERSION=4.19
12-
export CONFIG_LINUX_VERSION=4.14.62
12+
export CONFIG_LINUX_VERSION=5.10.5
1313

1414
CONFIG_COREBOOT_CONFIG=config/coreboot-t420-maximized.config
1515
CONFIG_LINUX_CONFIG=config/linux-x230-maximized.config

‎boards/t420/t420.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Configuration for a t420 running Qubes 4.1 and other OS, X220 is identical to X230 on the Linux Side of things.
22
export CONFIG_COREBOOT=y
33
export CONFIG_COREBOOT_VERSION=4.19
4-
export CONFIG_LINUX_VERSION=4.14.62
4+
export CONFIG_LINUX_VERSION=5.10.5
55

66
CONFIG_COREBOOT_CONFIG=config/coreboot-t420.config
77
CONFIG_LINUX_CONFIG=config/linux-x230-legacy.config

‎boards/t430-hotp-legacy/t430-hotp-legacy.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# HOTP_KEY: HOTP challenge for currently supported USB Security dongles
1010
export CONFIG_COREBOOT=y
1111
export CONFIG_COREBOOT_VERSION=4.19
12-
export CONFIG_LINUX_VERSION=4.14.62
12+
export CONFIG_LINUX_VERSION=5.10.5
1313

1414
CONFIG_COREBOOT_CONFIG=config/coreboot-t430-legacy.config
1515
CONFIG_LINUX_CONFIG=config/linux-x230-legacy.config

‎boards/t430-hotp-maximized/t430-hotp-maximized.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# - Includes Nitrokey/Librem Key HOTP Security dongle remote attestation (in addition to TOTP remote attestation through Qr Code)
99
export CONFIG_COREBOOT=y
1010
export CONFIG_COREBOOT_VERSION=4.19
11-
export CONFIG_LINUX_VERSION=4.14.62
11+
export CONFIG_LINUX_VERSION=5.10.5
1212

1313
CONFIG_COREBOOT_CONFIG=config/coreboot-t430-maximized.config
1414
CONFIG_LINUX_CONFIG=config/linux-x230-maximized.config

‎boards/t430-legacy-flash/t430-legacy-flash.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
export CONFIG_COREBOOT=y
44
export CONFIG_COREBOOT_VERSION=4.19
5-
export CONFIG_LINUX_VERSION=4.14.62
5+
export CONFIG_LINUX_VERSION=5.10.5
66

77
CONFIG_BASH=n
88
CONFIG_FLASHROM=y

‎boards/t430-legacy/t430-legacy.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# e1000e (ethernet driver)
77
export CONFIG_COREBOOT=y
88
export CONFIG_COREBOOT_VERSION=4.19
9-
export CONFIG_LINUX_VERSION=4.14.62
9+
export CONFIG_LINUX_VERSION=5.10.5
1010

1111
CONFIG_COREBOOT_CONFIG=config/coreboot-t430-legacy.config
1212
CONFIG_LINUX_CONFIG=config/linux-x230-legacy.config

‎boards/t430-maximized/t430-maximized.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# - DOES NOT INCLUDE Nitrokey/Librem Key HOTP Security dongle remote attestation (in addition to TOTP remote attestation through Qr Code)
99
export CONFIG_COREBOOT=y
1010
export CONFIG_COREBOOT_VERSION=4.19
11-
export CONFIG_LINUX_VERSION=4.14.62
11+
export CONFIG_LINUX_VERSION=5.10.5
1212

1313
CONFIG_COREBOOT_CONFIG=config/coreboot-t430-maximized.config
1414
CONFIG_LINUX_CONFIG=config/linux-x230-maximized.config

‎boards/t440p-maximized/t440p-maximized.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ CONFIG_COREBOOT_CONFIG=config/coreboot-t440p.config
44
CONFIG_LINUX_CONFIG=config/linux-t440p.config
55

66
export CONFIG_COREBOOT=y
7-
export CONFIG_COREBOOT_VERSION=4.17
7+
export CONFIG_COREBOOT_VERSION=4.19
88
export CONFIG_LINUX_VERSION=5.10.5
99

1010
CONFIG_CRYPTSETUP2=y

‎boards/t520-hotp-maximized/t520-hotp-maximized.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# - Note that this MAC address can be modified under build/coreboot-VER/util/bincfg/gbe-82579LM.set
77
export CONFIG_COREBOOT=y
88
export CONFIG_COREBOOT_VERSION=4.19
9-
export CONFIG_LINUX_VERSION=4.14.62
9+
export CONFIG_LINUX_VERSION=5.10.5
1010

1111
CONFIG_COREBOOT_CONFIG=config/coreboot-t520-maximized.config
1212
CONFIG_LINUX_CONFIG=config/linux-x230-maximized.config

‎boards/t520-maximized/t520-maximized.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# - Note that this MAC address can be modified under build/coreboot-VER/util/bincfg/gbe-82579LM.set
77
export CONFIG_COREBOOT=y
88
export CONFIG_COREBOOT_VERSION=4.19
9-
export CONFIG_LINUX_VERSION=4.14.62
9+
export CONFIG_LINUX_VERSION=5.10.5
1010

1111
CONFIG_COREBOOT_CONFIG=config/coreboot-t520-maximized.config
1212
CONFIG_LINUX_CONFIG=config/linux-x230-maximized.config

‎boards/t530-dgpu-hotp-maximized/t530-dgpu-hotp-maximized.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# This board is designed for a t530 with a dGPU. Initialization of the dGPU is necessary in order to use an external monitor via the DisplayPort (either the in-built mini-DisplayPort or the DisplayPort in the dock). In order to build this the relevant script in the blobs directory must be run (or self-pulled roms placed in that directory) and after building the rom, the nvramtool must be run on the 12MB rom to change the default graphics mode away from integrated-only graphics (see README_vbios in the blobs directory).
1010
export CONFIG_COREBOOT=y
1111
export CONFIG_COREBOOT_VERSION=4.19
12-
export CONFIG_LINUX_VERSION=4.14.62
12+
export CONFIG_LINUX_VERSION=5.10.5
1313

1414
CONFIG_COREBOOT_CONFIG=config/coreboot-t530-dgpu-maximized.config
1515
CONFIG_LINUX_CONFIG=config/linux-x230-maximized.config

‎boards/t530-dgpu-maximized/t530-dgpu-maximized.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# This board is designed for a t530 with a dGPU. Initialization of the dGPU is necessary in order to use an external monitor via the DisplayPort (either the in-built mini-DisplayPort or the DisplayPort in the dock). In order to build this the relevant script in the blobs directory must be run (or self-pulled roms placed in that directory) and after building the rom, the nvramtool must be run on the 12MB rom to change the default graphics mode away from integrated-only graphics (see README_vbios in the blobs directory).
1010
export CONFIG_COREBOOT=y
1111
export CONFIG_COREBOOT_VERSION=4.19
12-
export CONFIG_LINUX_VERSION=4.14.62
12+
export CONFIG_LINUX_VERSION=5.10.5
1313

1414
CONFIG_COREBOOT_CONFIG=config/coreboot-t530-dgpu-maximized.config
1515
CONFIG_LINUX_CONFIG=config/linux-x230-maximized.config

0 commit comments

Comments
 (0)