Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Staging branch for merging 5.10 kernel changes, gnupg2.4 and flashrom 1.3 (testing needed) #1398

Merged
merged 37 commits into from
Jul 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
7e6987a
config/linux-x230-*: migrate from 4.14 to 5.10 + add CONFIG_DRM_FBDEV…
tlaurion Apr 19, 2023
e14d7c3
config/linux-t440p.config : bump to 5.10.5
tlaurion Jun 7, 2023
5fce7bf
config/linux-qemu.config : add CONFIG_DRM_BOCHS=y and CONFIG_FB_SIMPL…
tlaurion Apr 20, 2023
f2d0a6a
config/coreboot-* : adapt i915drmfb driven boards framebuffer require…
tlaurion Apr 19, 2023
c84a0f7
config/coreboot-qemu-fbwhiptail: extend CBFS_SIZE to 0x7E7FFF to acco…
tlaurion Jun 7, 2023
13daaa1
modules/ coreboot+linux: add helpers to edit config in place + save i…
tlaurion Apr 19, 2023
e8bc003
boards/p8z77-m_pro-tpm1-maximized: bump linux from 4.14 to 5.10
tlaurion Apr 19, 2023
e022284
boards: bump non-tpm qemu*, xx20 and xx30 boards to use linux kernel …
tlaurion May 23, 2023
f34d2dd
bump qemu-tpm boards to coreboot 4.19
tlaurion May 23, 2023
dbc931e
config/linux* saved in oldconfig format to ease boards comparison for…
tlaurion May 23, 2023
cc9a482
Remove qemu-coreboot and qemu-coreboot-fbwhiptail board+coreboot configs
tlaurion Jun 21, 2023
00e7156
linux configs for intel: select proper CPU and trust CPU randomization
tlaurion Jun 21, 2023
cdd0c6f
Adding bootspashes by @ThePlexus and @d-dwid posted under https://git…
tlaurion May 19, 2023
5710eaf
coreboot configs: sandy/ivy/haswell : readd libgfxinit and bootsplash…
tlaurion Jun 21, 2023
da4c306
t440p p8z77-m_pro: pass to coreboot 4.19 and with comparable lockdown…
tlaurion Jun 21, 2023
252c9df
CircleCI config: remove generic qemu-coreboot/qemu-coreboot-fbwhiptai…
tlaurion Jun 21, 2023
4d75855
WiP: linux config global tweaks overhaul, unifying kernel configs and…
tlaurion Jun 22, 2023
a4f5965
Makefile: point default board to qemu-coreboot-fbwhiptail-tpm1 so aut…
tlaurion Jun 23, 2023
14e7a76
coreboot config: correct CONFIG_INTEL_CHIPSET_LOCKDOWN behavior to ma…
tlaurion Jun 26, 2023
6245339
linux-x230-legacy.config: Disable network related option while leavin…
tlaurion Jun 26, 2023
7cef74b
libgpg-error 1.46
saper Mar 24, 2023
7c51116
libksba 1.4.0 -> 1.6.3
saper Mar 24, 2023
b97f34e
libassuan 2.5.3 -> 2.5.5
saper Mar 24, 2023
1518292
libgcrypt 1.8.6 -> 1.10.1
saper Mar 24, 2023
d4ade89
gnupg 2.2.21 -> 2.4.0
saper Mar 24, 2023
fda8848
Do not start second scdaemon for /etc/distro
saper Mar 24, 2023
74e60fb
libgcrypt: disconnect tests from the build
saper Mar 26, 2023
c20c2bc
oem-factory-reset needed changes to comply with gpg 2.4 toolstack cha…
tlaurion Mar 28, 2023
b849cc0
With gpg 2.3+ user name can be empty
saper Apr 6, 2023
e14b869
gpg2: remove tools/gpg-connect-agent bin, build with --disable-libdns…
tlaurion Jun 26, 2023
58d5a29
libassuan: build with --disable-doc
tlaurion Jun 26, 2023
a1be4e4
modules/flashrom: Update to 1776bb46
JonathonHall-Purism Jun 23, 2023
979c9dd
flashrom: remove DUMMY and AST1100 by default on both x86/ppc64, leav…
tlaurion Jun 26, 2023
08d865e
config/linux-*: remove CPU_ISOLATION since no observable gains as is …
tlaurion Jun 27, 2023
30cc112
Merge branch 'saper_gnupg-2.4.0-update_reduce_size_some_more' into st…
tlaurion Jun 28, 2023
92e29c4
Merge branch 'upstream_flashrom_13' into staging_all
tlaurion Jun 28, 2023
f8cb3db
untested boards: move and rename untested boards, while still buildin…
tlaurion Jul 4, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
127 changes: 58 additions & 69 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@ jobs:
- build/x86/coreboot-4.14
- build/x86/coreboot-4.15
- build/x86/coreboot-4.17
- build/x86/coreboot-4.19
- build/ppc64/coreboot-git
- save_cache:
#Generate cache for the exact same modules definitions if hash is not previously existing
Expand Down Expand Up @@ -250,6 +251,7 @@ workflows:
#
#

#Coreboot 4.19 boards
- build:
name: x220-hotp-maximized
target: x220-hotp-maximized
Expand All @@ -265,29 +267,29 @@ workflows:
- x230-hotp-maximized

- build:
name: t420-hotp-maximized
target: t420-hotp-maximized
name: UNTESTED_t420-hotp-maximized
target: UNTESTED_t420-hotp-maximized
subcommand: ""
requires:
- x230-hotp-maximized

- build:
name: t520-hotp-maximized
target: t520-hotp-maximized
name: UNTESTED_t520-hotp-maximized
target: UNTESTED_t520-hotp-maximized
subcommand: ""
requires:
- x230-hotp-maximized

- build:
name: t420-maximized
target: t420-maximized
name: UNTESTED_t420-maximized
target: UNTESTED_t420-maximized
subcommand: ""
requires:
- x230-hotp-maximized

- build:
name: t520-maximized
target: t520-maximized
name: UNTESTED_t520-maximized
target: UNTESTED_t520-maximized
subcommand: ""
requires:
- x230-hotp-maximized
Expand Down Expand Up @@ -356,50 +358,50 @@ workflows:
- x230-hotp-maximized

- build:
name: x230-maximized-fhd_edp
target: x230-maximized-fhd_edp
name: UNTESTED_x230-maximized-fhd_edp
target: UNTESTED_x230-maximized-fhd_edp
subcommand: ""
requires:
- x230-hotp-maximized

- build:
name: x230-hotp-maximized-fhd_edp
target: x230-hotp-maximized-fhd_edp
name: UNTESTED_x230-hotp-maximized-fhd_edp
target: UNTESTED_x230-hotp-maximized-fhd_edp
subcommand: ""
requires:
- x230-hotp-maximized

- build:
name: t530-hotp-maximized
target: t530-hotp-maximized
name: UNTESTED_t530-hotp-maximized
target: UNTESTED_t530-hotp-maximized
subcommand: ""
requires:
- x230-hotp-maximized

- build:
name: t530-dgpu-hotp-maximized
target: t530-dgpu-hotp-maximized
name: UNTESTED_t530-dgpu-hotp-maximized
target: UNTESTED_t530-dgpu-hotp-maximized
subcommand: ""
requires:
- x230-hotp-maximized

- build:
name: w530-hotp-maximized
target: w530-hotp-maximized
name: UNTESTED_w530-hotp-maximized
target: UNTESTED_w530-hotp-maximized
subcommand: ""
requires:
- x230-hotp-maximized

- build:
name: w530-dgpu-K1000m-hotp-maximized
target: w530-dgpu-K1000m-hotp-maximized
name: UNTESTED_w530-dgpu-K1000m-hotp-maximized
target: UNTESTED_w530-dgpu-K1000m-hotp-maximized
subcommand: ""
requires:
- x230-hotp-maximized

- build:
name: w530-dgpu-K2000m-hotp-maximized
target: w530-dgpu-K2000m-hotp-maximized
name: UNTESTED_w530-dgpu-K2000m-hotp-maximized
target: UNTESTED_w530-dgpu-K2000m-hotp-maximized
subcommand: ""
requires:
- x230-hotp-maximized
Expand All @@ -412,36 +414,36 @@ workflows:
- x230-hotp-maximized

- build:
name: t530-maximized
target: t530-maximized
name: UNTESTED_t530-maximized
target: UNTESTED_t530-maximized
subcommand: ""
requires:
- x230-hotp-maximized

- build:
name: t530-dgpu-maximized
target: t530-dgpu-maximized
name: UNTESTED_t530-dgpu-maximized
target: UNTESTED_t530-dgpu-maximized
subcommand: ""
requires:
- x230-hotp-maximized

- build:
name: w530-maximized
target: w530-maximized
name: UNTESTED_w530-maximized
target: UNTESTED_w530-maximized
subcommand: ""
requires:
- x230-hotp-maximized

- build:
name: w530-dgpu-K1000m-maximized
target: w530-dgpu-K1000m-maximized
name: UNTESTED_w530-dgpu-K1000m-maximized
target: UNTESTED_w530-dgpu-K1000m-maximized
subcommand: ""
requires:
- x230-hotp-maximized

- build:
name: w530-dgpu-K2000m-maximized
target: w530-dgpu-K2000m-maximized
name: UNTESTED_w530-dgpu-K2000m-maximized
target: UNTESTED_w530-dgpu-K2000m-maximized
subcommand: ""
requires:
- x230-hotp-maximized
Expand All @@ -451,36 +453,37 @@ workflows:
target: t440p-maximized
subcommand: ""
requires:
- librem_14
- x230-hotp-maximized

- build:
name: t440p-hotp-maximized
target: t440p-hotp-maximized
subcommand: ""
requires:
- librem_14
- x230-hotp-maximized

- build:
name: qemu-coreboot
target: qemu-coreboot
name: qemu-coreboot-fbwhiptail-tpm2-hotp
target: qemu-coreboot-fbwhiptail-tpm2-hotp
subcommand: ""
requires:
- x230-hotp-maximized

- build:
name: qemu-coreboot-fbwhiptail
target: qemu-coreboot-fbwhiptail
name: UNTESTED_p8z77-m_pro-tpm1-maximized
target: UNTESTED_p8z77-m_pro-tpm1-maximized
subcommand: ""
requires:
- x230-hotp-maximized

- build:
name: qemu-coreboot-fbwhiptail-tpm2-hotp
target: qemu-coreboot-fbwhiptail-tpm2-hotp
name: UNTESTED_p8z77-m_pro-tpm1-hotp-maximized
target: UNTESTED_p8z77-m_pro-tpm1-hotp-maximized
subcommand: ""
requires:
- x230-hotp-maximized

#Coreboot 4.17 boards
- build:
name: librem_13v2
target: librem_13v2
Expand Down Expand Up @@ -523,40 +526,26 @@ workflows:
requires:
- librem_14

- build:
name: p8z77-m_pro-tpm1-maximized
target: p8z77-m_pro-tpm1-maximized
subcommand: ""
requires:
- librem_14

- build:
name: p8z77-m_pro-tpm1-hotp-maximized
target: p8z77-m_pro-tpm1-hotp-maximized
subcommand: ""
requires:
- librem_14

# - build:
# name: kgpe-d16_workstation-usb_keyboard
# target: kgpe-d16_workstation-usb_keyboard
# name: UNTESTED_kgpe-d16_workstation-usb_keyboard
# target: UNTESTED_kgpe-d16_workstation-usb_keyboard
# subcommand: ""
# requires:
# - kgpe-d16_workstation
# - UNTESTED_kgpe-d16_workstation

# - build:
# name: kgpe-d16_server
# target: kgpe-d16_server
# name: UNTESTED_kgpe-d16_server
# target: UNTESTED_kgpe-d16_server
# subcommand: ""
# requires:
# - kgpe-d16_workstation
# - UNTESTED_kgpe-d16_workstation

# - build:
# name: kgpe-d16_server-whiptail
# target: kgpe-d16_server-whiptail
# name: UNTESTED_kgpe-d16_server-whiptail
# target: UNTESTED_kgpe-d16_server-whiptail
# subcommand: ""
# requires:
# - kgpe-d16_workstation
# - UNTESTED_kgpe-d16_workstation

# - build:
# name: librem_l1um
Expand All @@ -573,24 +562,24 @@ workflows:
# linuxboot steps need something to pass in the kernel header path
# skipping for now
# - run:
# name: qemu-linuxboot-edk2
# name: UNTESTED_qemu-linuxboot-edk2
# command: |
# ./build/make-4.2.1/make \
# CROSS=/cross/bin/x86_64-linux-musl- \
# BOARD=qemu-linuxboot \
# BOARD=UNTESTED_qemu-linuxboot \
# `/bin/pwd`/build/linuxboot-git/build/qemu/.configured \
# # Run first to avoid too many processes
#
# - run:
# name: qemu-linuxboot
# name: UNTESTED_qemu-linuxboot
# command: |
# ./build/make-4.2.1/make \
# CROSS=/cross/bin/x86_64-linux-musl- \
# CPUS=16 \
# V=1 \
# BOARD=qemu-linuxboot \
# BOARD=UNTESTED_qemu-linuxboot \
#
# - store-artifacts:
# path: build/qemu-linuxboot/linuxboot.rom
# path: build/UNTESTED_qemu-linuxboot/linuxboot.rom
# - store-artifacts:
# path: build/qemu-linuxboot/hashes.txt
# path: build/UNTESTED_qemu-linuxboot/hashes.txt
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ WGET ?= wget
# Timestamps should be in ISO format
DATE=`date --rfc-3339=seconds`

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

ifneq "y" "$(shell [ -r '$(CONFIG)' ] && echo y)"
Expand Down
Binary file added blobs/ThePlexus-bootsplash-1024x768.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added blobs/ThePlexus-logo.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions blobs/bootsplash-1024x768.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added blobs/d-dwid-janus-hexa_background-logo.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Inherit the rest from the base Asus P8Z77-M Pro config.
include $(pwd)/boards/p8z77-m_pro-tpm1-maximized/p8z77-m_pro-tpm1-maximized.config
include $(pwd)/boards/UNTESTED_p8z77-m_pro-tpm1-maximized/UNTESTED_p8z77-m_pro-tpm1-maximized.config

CONFIG_HOTPKEY=y

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ CONFIG_LINUX_CONFIG=config/linux-x230-maximized.config
CONFIG_COREBOOT_CONFIG=config/coreboot-p8z77-m_pro-tpm1.config

export CONFIG_COREBOOT=y
export CONFIG_COREBOOT_VERSION=4.17
export CONFIG_LINUX_VERSION=4.14.62
export CONFIG_COREBOOT_VERSION=4.19
export CONFIG_LINUX_VERSION=5.10.5

CONFIG_CRYPTSETUP2=y
CONFIG_FLASHROM=y
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

export CONFIG_COREBOOT=y
export CONFIG_COREBOOT_VERSION=4.19
export CONFIG_LINUX_VERSION=4.14.62
export CONFIG_LINUX_VERSION=5.10.5

CONFIG_COREBOOT_CONFIG=config/coreboot-t420-maximized.config
CONFIG_LINUX_CONFIG=config/linux-x230-maximized.config
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# - dropbear
export CONFIG_COREBOOT=y
export CONFIG_COREBOOT_VERSION=4.19
export CONFIG_LINUX_VERSION=4.14.62
export CONFIG_LINUX_VERSION=5.10.5

CONFIG_COREBOOT_CONFIG=config/coreboot-t420-maximized.config
CONFIG_LINUX_CONFIG=config/linux-x230-maximized.config
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Configuration for a t420 running Qubes 4.1 and other OS, X220 is identical to X230 on the Linux Side of things.
export CONFIG_COREBOOT=y
export CONFIG_COREBOOT_VERSION=4.19
export CONFIG_LINUX_VERSION=4.14.62
export CONFIG_LINUX_VERSION=5.10.5

CONFIG_COREBOOT_CONFIG=config/coreboot-t420.config
CONFIG_LINUX_CONFIG=config/linux-x230-legacy.config
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# - Note that this MAC address can be modified under build/coreboot-VER/util/bincfg/gbe-82579LM.set
export CONFIG_COREBOOT=y
export CONFIG_COREBOOT_VERSION=4.19
export CONFIG_LINUX_VERSION=4.14.62
export CONFIG_LINUX_VERSION=5.10.5

CONFIG_COREBOOT_CONFIG=config/coreboot-t520-maximized.config
CONFIG_LINUX_CONFIG=config/linux-x230-maximized.config
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# - Note that this MAC address can be modified under build/coreboot-VER/util/bincfg/gbe-82579LM.set
export CONFIG_COREBOOT=y
export CONFIG_COREBOOT_VERSION=4.19
export CONFIG_LINUX_VERSION=4.14.62
export CONFIG_LINUX_VERSION=5.10.5

CONFIG_COREBOOT_CONFIG=config/coreboot-t520-maximized.config
CONFIG_LINUX_CONFIG=config/linux-x230-maximized.config
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# 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).
export CONFIG_COREBOOT=y
export CONFIG_COREBOOT_VERSION=4.19
export CONFIG_LINUX_VERSION=4.14.62
export CONFIG_LINUX_VERSION=5.10.5

CONFIG_COREBOOT_CONFIG=config/coreboot-t530-dgpu-maximized.config
CONFIG_LINUX_CONFIG=config/linux-x230-maximized.config
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# 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).
export CONFIG_COREBOOT=y
export CONFIG_COREBOOT_VERSION=4.19
export CONFIG_LINUX_VERSION=4.14.62
export CONFIG_LINUX_VERSION=5.10.5

CONFIG_COREBOOT_CONFIG=config/coreboot-t530-dgpu-maximized.config
CONFIG_LINUX_CONFIG=config/linux-x230-maximized.config
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# This board is designed for a t530 without a dGPU. It will work just fine for a board with a dGPU, except you will not be able to use an external monitor via the mini-displayport or the dock's displayport, though external monitors will work via VGA ports. To initialize the dGPU please use one of the dgpu boards.
export CONFIG_COREBOOT=y
export CONFIG_COREBOOT_VERSION=4.19
export CONFIG_LINUX_VERSION=4.14.62
export CONFIG_LINUX_VERSION=5.10.5

CONFIG_COREBOOT_CONFIG=config/coreboot-t530-maximized.config
CONFIG_LINUX_CONFIG=config/linux-x230-maximized.config
Expand Down
Loading