Skip to content

Commit b991db0

Browse files
tlauriontlaurion
committed
Bring dasharo+heads MSI boards + code changes from downstream Dasharo/heads fork to upstream
- files: boards + coreboot + linux, borrowed directly from Dasharo@cb43039 tip - cbfs-init modified as per downstream fork dasharo+heads used modifications (flashrom) - ash_functions modified as per downstream fork dasharo+heads used modifications (CBFS) - network-init-recovery modified as per downstream fork dasharo+heads used modifications (igc) - Circleci: added boards being dependent of nv41 This requires Nk3 firmware to be 1.7.1+ as per https://www.nitrokey.com/blog/2024/heads-v25-and-nitrokey-3-firmware-v171-security-updatehttps://www.nitrokey.com/blog/2024/heads-v25-and-nitrokey-3-firmware-v171-security-update DISCLAIMER: UNTESTED Sorry, not gonna cherry-pick commits here, way too messy. Signed-off-by: Thierry Laurion <[email protected]>
1 parent d9e5087 commit b991db0

13 files changed

+7089
-5
lines changed

‎.circleci/config.yml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -499,6 +499,34 @@ workflows:
499499
requires:
500500
- nitropad-nv41
501501

502+
- build:
503+
name: msi_z690a_ddr4
504+
target: msi_z690a_ddr4
505+
subcommand: ""
506+
requires:
507+
- nitropad-nv41
508+
509+
- build:
510+
name: msi_z690a_ddr5
511+
target: msi_z690a_ddr5
512+
subcommand: ""
513+
requires:
514+
- nitropad-nv41
515+
516+
- build:
517+
name: msi_z790p_ddr4
518+
target: msi_z790p_ddr4
519+
subcommand: ""
520+
requires:
521+
- nitropad-nv41
522+
523+
- build:
524+
name: msi_z790p_ddr5
525+
target: msi_z790p_ddr5
526+
subcommand: ""
527+
requires:
528+
- nitropad-nv41
529+
502530
# coreboot 4.11
503531
- build:
504532
name: UNMAINTAINED_kgpe-d16_workstation

‎boards/msi_z690a_ddr4/msi_z690a_ddr4.config‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
# MSI PRO Z690-A DDR4 board configuration
2+
3+
export CONFIG_COREBOOT=y
4+
export CONFIG_COREBOOT_VERSION=dasharo
5+
export CONFIG_LINUX_VERSION=6.1.8
6+
7+
CONFIG_COREBOOT_CONFIG=config/coreboot-msi_z690a_ddr4.config
8+
CONFIG_LINUX_CONFIG=config/linux-msi-z690-z790.config
9+
10+
CONFIG_KEXEC=y
11+
CONFIG_QRENCODE=y
12+
CONFIG_TPMTOTP=y
13+
CONFIG_POPT=y
14+
CONFIG_FLASHTOOLS=y
15+
CONFIG_FLASHROM=y
16+
CONFIG_PCIUTILS=y
17+
CONFIG_UTIL_LINUX=y
18+
CONFIG_CRYPTSETUP2=y
19+
CONFIG_GPG2=y
20+
CONFIG_LVM2=y
21+
CONFIG_MBEDTLS=y
22+
23+
CONFIG_DROPBEAR=y
24+
25+
CONFIG_HOTPKEY=y
26+
27+
CONFIG_CAIRO=y
28+
CONFIG_FBWHIPTAIL=y
29+
30+
CONFIG_LINUX_USB=y
31+
CONFIG_LINUX_IGC=y
32+
33+
export CONFIG_USB_KEYBOARD=y
34+
35+
export CONFIG_BOOTSCRIPT=/bin/gui-init
36+
37+
export CONFIG_BOOT_KERNEL_ADD=""
38+
export CONFIG_BOOT_KERNEL_REMOVE=""
39+
40+
# TPM2 requirements
41+
export CONFIG_TPM2_TOOLS=y
42+
export CONFIG_PRIMARY_KEY_TYPE=ecc
43+
CONFIG_TPM2_TSS=y
44+
CONFIG_OPENSSL=y
45+
46+
export CONFIG_BOOT_DEV="/dev/nvme0n1"
47+
export CONFIG_BOARD_NAME="MSI PRO Z690-A DDR4"
48+
export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
49+
50+
# Workaround to access > 16MiB BIOS region on ADL+
51+
export CONFIG_CBFS_VIA_FLASHROM=y

‎boards/msi_z690a_ddr5/msi_z690a_ddr5.config‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
# MSI PRO Z690-A (DDR5) board configuration
2+
3+
export CONFIG_COREBOOT=y
4+
export CONFIG_COREBOOT_VERSION=dasharo
5+
export CONFIG_LINUX_VERSION=6.1.8
6+
7+
CONFIG_COREBOOT_CONFIG=config/coreboot-msi_z690a_ddr5.config
8+
CONFIG_LINUX_CONFIG=config/linux-msi-z690-z790.config
9+
10+
CONFIG_KEXEC=y
11+
CONFIG_QRENCODE=y
12+
CONFIG_TPMTOTP=y
13+
CONFIG_POPT=y
14+
CONFIG_FLASHTOOLS=y
15+
CONFIG_FLASHROM=y
16+
CONFIG_PCIUTILS=y
17+
CONFIG_UTIL_LINUX=y
18+
CONFIG_CRYPTSETUP2=y
19+
CONFIG_GPG2=y
20+
CONFIG_LVM2=y
21+
CONFIG_MBEDTLS=y
22+
23+
CONFIG_DROPBEAR=y
24+
25+
CONFIG_HOTPKEY=y
26+
27+
CONFIG_CAIRO=y
28+
CONFIG_FBWHIPTAIL=y
29+
30+
CONFIG_LINUX_USB=y
31+
CONFIG_LINUX_IGC=y
32+
33+
export CONFIG_USB_KEYBOARD=y
34+
35+
export CONFIG_BOOTSCRIPT=/bin/gui-init
36+
37+
export CONFIG_BOOT_KERNEL_ADD=""
38+
export CONFIG_BOOT_KERNEL_REMOVE=""
39+
40+
# TPM2 requirements
41+
export CONFIG_TPM2_TOOLS=y
42+
export CONFIG_PRIMARY_KEY_TYPE=ecc
43+
CONFIG_TPM2_TSS=y
44+
CONFIG_OPENSSL=y
45+
46+
export CONFIG_BOOT_DEV="/dev/nvme0n1"
47+
export CONFIG_BOARD_NAME="MSI PRO Z690-A"
48+
export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
49+
50+
# Workaround to access > 16MiB BIOS region on ADL+
51+
export CONFIG_CBFS_VIA_FLASHROM=y

‎boards/msi_z790p_ddr4/msi_z790p_ddr4.config‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
# MSI PRO Z790-P DDR4 board configuration
2+
3+
export CONFIG_COREBOOT=y
4+
export CONFIG_COREBOOT_VERSION=dasharo
5+
export CONFIG_LINUX_VERSION=6.1.8
6+
7+
CONFIG_COREBOOT_CONFIG=config/coreboot-msi_z790p_ddr4.config
8+
CONFIG_LINUX_CONFIG=config/linux-msi-z690-z790.config
9+
10+
CONFIG_KEXEC=y
11+
CONFIG_QRENCODE=y
12+
CONFIG_TPMTOTP=y
13+
CONFIG_POPT=y
14+
CONFIG_FLASHTOOLS=y
15+
CONFIG_FLASHROM=y
16+
CONFIG_PCIUTILS=y
17+
CONFIG_UTIL_LINUX=y
18+
CONFIG_CRYPTSETUP2=y
19+
CONFIG_GPG2=y
20+
CONFIG_LVM2=y
21+
CONFIG_MBEDTLS=y
22+
23+
CONFIG_DROPBEAR=y
24+
25+
CONFIG_HOTPKEY=y
26+
27+
CONFIG_CAIRO=y
28+
CONFIG_FBWHIPTAIL=y
29+
30+
CONFIG_LINUX_USB=y
31+
CONFIG_LINUX_IGC=y
32+
33+
export CONFIG_USB_KEYBOARD=y
34+
35+
export CONFIG_BOOTSCRIPT=/bin/gui-init
36+
37+
export CONFIG_BOOT_KERNEL_ADD=""
38+
export CONFIG_BOOT_KERNEL_REMOVE=""
39+
40+
# TPM2 requirements
41+
export CONFIG_TPM2_TOOLS=y
42+
export CONFIG_PRIMARY_KEY_TYPE=ecc
43+
CONFIG_TPM2_TSS=y
44+
CONFIG_OPENSSL=y
45+
46+
export CONFIG_BOOT_DEV="/dev/nvme0n1"
47+
export CONFIG_BOARD_NAME="MSI PRO Z790-P DDR4"
48+
export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
49+
50+
# Workaround to access > 16MiB BIOS region on ADL+
51+
export CONFIG_CBFS_VIA_FLASHROM=y

‎boards/msi_z790p_ddr5/msi_z790p_ddr5.config‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
# MSI PRO Z790-P (DDR5) board configuration
2+
3+
export CONFIG_COREBOOT=y
4+
export CONFIG_COREBOOT_VERSION=dasharo
5+
export CONFIG_LINUX_VERSION=6.1.8
6+
7+
CONFIG_COREBOOT_CONFIG=config/coreboot-msi_z790p_ddr5.config
8+
CONFIG_LINUX_CONFIG=config/linux-msi-z690-z790.config
9+
10+
CONFIG_KEXEC=y
11+
CONFIG_QRENCODE=y
12+
CONFIG_TPMTOTP=y
13+
CONFIG_POPT=y
14+
CONFIG_FLASHTOOLS=y
15+
CONFIG_FLASHROM=y
16+
CONFIG_PCIUTILS=y
17+
CONFIG_UTIL_LINUX=y
18+
CONFIG_CRYPTSETUP2=y
19+
CONFIG_GPG2=y
20+
CONFIG_LVM2=y
21+
CONFIG_MBEDTLS=y
22+
23+
CONFIG_DROPBEAR=y
24+
25+
CONFIG_HOTPKEY=y
26+
27+
CONFIG_CAIRO=y
28+
CONFIG_FBWHIPTAIL=y
29+
30+
CONFIG_LINUX_USB=y
31+
CONFIG_LINUX_IGC=y
32+
33+
export CONFIG_USB_KEYBOARD=y
34+
35+
export CONFIG_BOOTSCRIPT=/bin/gui-init
36+
37+
export CONFIG_BOOT_KERNEL_ADD=""
38+
export CONFIG_BOOT_KERNEL_REMOVE=""
39+
40+
# TPM2 requirements
41+
export CONFIG_TPM2_TOOLS=y
42+
export CONFIG_PRIMARY_KEY_TYPE=ecc
43+
CONFIG_TPM2_TSS=y
44+
CONFIG_OPENSSL=y
45+
46+
export CONFIG_BOOT_DEV="/dev/nvme0n1"
47+
export CONFIG_BOARD_NAME="MSI PRO Z790-P"
48+
export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
49+
50+
# Workaround to access > 16MiB BIOS region on ADL+
51+
export CONFIG_CBFS_VIA_FLASHROM=y

0 commit comments

Comments
 (0)