Skip to content

Commit c3e138c

Browse files
tlauriontlaurion
committed
MSI board configs: clarify requirements, DDR4/DDR5 board names, unify config layout against qemu-coreboot-fbwhiptail-tpm2
Signed-off-by: Thierry Laurion <insurgo@riseup.net>
1 parent cf638cc commit c3e138c

4 files changed

Lines changed: 226 additions & 98 deletions

File tree

‎boards/msi_z690a_ddr4/msi_z690a_ddr4.config‎

Lines changed: 56 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
# MSI PRO Z690-A DDR4 board configuration
2+
# This version requires
3+
# - A supported HOTP Security dongle (Nitrokey Pro/Storage or Librem Key)
4+
# - A supported dTPM module
5+
#Notes:
6+
# - dGPU support known to be problematic, look for Dasharo HCL
27

38
export CONFIG_COREBOOT=y
49
export CONFIG_COREBOOT_VERSION=dasharo
@@ -7,43 +12,70 @@ export CONFIG_LINUX_VERSION=6.1.8
712
CONFIG_COREBOOT_CONFIG=config/coreboot-msi_z690a_ddr4.config
813
CONFIG_LINUX_CONFIG=config/linux-msi-z690-z790.config
914

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
15+
#Enable DEBUG output
16+
#export CONFIG_DEBUG_OUTPUT=y
17+
#export CONFIG_ENABLE_FUNCTION_TRACING_OUTPUT=y
18+
#Enable TPM2 pcap output under /tmp
19+
#export CONFIG_TPM2_CAPTURE_PCAP=y
20+
21+
22+
#Additional hardware support
23+
CONFIG_LINUX_USB=y
24+
CONFIG_LINUX_IGC=y
25+
#CONFIG_MOBILE_TETHERING=y
26+
export CONFIG_USB_KEYBOARD=y
27+
1828
CONFIG_CRYPTSETUP2=y
29+
CONFIG_FLASHROM=y
30+
CONFIG_FLASHTOOLS=y
1931
CONFIG_GPG2=y
32+
CONFIG_KEXEC=y
33+
CONFIG_UTIL_LINUX=y
2034
CONFIG_LVM2=y
2135
CONFIG_MBEDTLS=y
36+
CONFIG_PCIUTILS=y
2237

23-
CONFIG_DROPBEAR=y
24-
38+
#Remote attestation support
39+
# TPM2 requirements
40+
CONFIG_TPM2_TSS=y
41+
CONFIG_OPENSSL=y
42+
#Remote Attestation common tools
43+
CONFIG_POPT=y
44+
CONFIG_QRENCODE=y
45+
CONFIG_TPMTOTP=y
46+
#HOTP based remote attestation for supported USB Security dongle
47+
#With/Without TPM support
2548
CONFIG_HOTPKEY=y
26-
49+
#Nitrokey Storage admin tool (deprecated)
50+
#CONFIG_NKSTORECLI=n
51+
#GUI Support
52+
#Console based Whiptail support(Console based, no FB):
53+
#CONFIG_SLANG=y
54+
#CONFIG_NEWT=y
55+
#FBWhiptail based (Graphical):
2756
CONFIG_CAIRO=y
2857
CONFIG_FBWHIPTAIL=y
2958

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=""
59+
#Additional tools (tools.cpio):
60+
#SSH server (requires ethernet drivers, eg: CONFIG_LINUX_E1000E)
61+
CONFIG_DROPBEAR=y
3962

40-
# TPM2 requirements
63+
#Runtime configuration
64+
#Automatically boot if HOTP is valid
65+
export CONFIG_AUTO_BOOT_TIMEOUT=5
66+
#TPM2 requirements
4167
export CONFIG_TPM2_TOOLS=y
4268
export CONFIG_PRIMARY_KEY_TYPE=ecc
43-
CONFIG_TPM2_TSS=y
44-
CONFIG_OPENSSL=y
45-
69+
#TPM1 requirements
70+
#export CONFIG_TPM=y
71+
export CONFIG_BOOTSCRIPT=/bin/gui-init
72+
#text-based original init:
73+
#export CONFIG_BOOTSCRIPT=/bin/generic-init
74+
export CONFIG_BOOT_REQ_HASH=n
75+
export CONFIG_BOOT_REQ_ROLLBACK=n
4676
export CONFIG_BOOT_DEV="/dev/nvme0n1"
77+
export CONFIG_BOOT_KERNEL_ADD=""
78+
export CONFIG_BOOT_KERNEL_REMOVE=""
4779
export CONFIG_BOARD_NAME="MSI PRO Z690-A DDR4"
4880
export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
4981

‎boards/msi_z690a_ddr5/msi_z690a_ddr5.config‎

Lines changed: 57 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
# MSI PRO Z690-A (DDR5) board configuration
2+
# This version requires
3+
# - A supported HOTP Security dongle (Nitrokey Pro/Storage or Librem Key)
4+
# - A supported dTPM module
5+
#Notes:
6+
# - dGPU support known to be problematic, look for Dasharo HCL
27

38
export CONFIG_COREBOOT=y
49
export CONFIG_COREBOOT_VERSION=dasharo
@@ -7,44 +12,71 @@ export CONFIG_LINUX_VERSION=6.1.8
712
CONFIG_COREBOOT_CONFIG=config/coreboot-msi_z690a_ddr5.config
813
CONFIG_LINUX_CONFIG=config/linux-msi-z690-z790.config
914

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
15+
#Enable DEBUG output
16+
#export CONFIG_DEBUG_OUTPUT=y
17+
#export CONFIG_ENABLE_FUNCTION_TRACING_OUTPUT=y
18+
#Enable TPM2 pcap output under /tmp
19+
#export CONFIG_TPM2_CAPTURE_PCAP=y
20+
21+
22+
#Additional hardware support
23+
CONFIG_LINUX_USB=y
24+
CONFIG_LINUX_IGC=y
25+
#CONFIG_MOBILE_TETHERING=y
26+
export CONFIG_USB_KEYBOARD=y
27+
1828
CONFIG_CRYPTSETUP2=y
29+
CONFIG_FLASHROM=y
30+
CONFIG_FLASHTOOLS=y
1931
CONFIG_GPG2=y
32+
CONFIG_KEXEC=y
33+
CONFIG_UTIL_LINUX=y
2034
CONFIG_LVM2=y
2135
CONFIG_MBEDTLS=y
36+
CONFIG_PCIUTILS=y
2237

23-
CONFIG_DROPBEAR=y
24-
38+
#Remote attestation support
39+
# TPM2 requirements
40+
CONFIG_TPM2_TSS=y
41+
CONFIG_OPENSSL=y
42+
#Remote Attestation common tools
43+
CONFIG_POPT=y
44+
CONFIG_QRENCODE=y
45+
CONFIG_TPMTOTP=y
46+
#HOTP based remote attestation for supported USB Security dongle
47+
#With/Without TPM support
2548
CONFIG_HOTPKEY=y
26-
49+
#Nitrokey Storage admin tool (deprecated)
50+
#CONFIG_NKSTORECLI=n
51+
#GUI Support
52+
#Console based Whiptail support(Console based, no FB):
53+
#CONFIG_SLANG=y
54+
#CONFIG_NEWT=y
55+
#FBWhiptail based (Graphical):
2756
CONFIG_CAIRO=y
2857
CONFIG_FBWHIPTAIL=y
2958

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=""
59+
#Additional tools (tools.cpio):
60+
#SSH server (requires ethernet drivers, eg: CONFIG_LINUX_E1000E)
61+
CONFIG_DROPBEAR=y
3962

40-
# TPM2 requirements
63+
#Runtime configuration
64+
#Automatically boot if HOTP is valid
65+
export CONFIG_AUTO_BOOT_TIMEOUT=5
66+
#TPM2 requirements
4167
export CONFIG_TPM2_TOOLS=y
4268
export CONFIG_PRIMARY_KEY_TYPE=ecc
43-
CONFIG_TPM2_TSS=y
44-
CONFIG_OPENSSL=y
45-
69+
#TPM1 requirements
70+
#export CONFIG_TPM=y
71+
export CONFIG_BOOTSCRIPT=/bin/gui-init
72+
#text-based original init:
73+
#export CONFIG_BOOTSCRIPT=/bin/generic-init
74+
export CONFIG_BOOT_REQ_HASH=n
75+
export CONFIG_BOOT_REQ_ROLLBACK=n
4676
export CONFIG_BOOT_DEV="/dev/nvme0n1"
47-
export CONFIG_BOARD_NAME="MSI PRO Z690-A"
77+
export CONFIG_BOOT_KERNEL_ADD=""
78+
export CONFIG_BOOT_KERNEL_REMOVE=""
79+
export CONFIG_BOARD_NAME="MSI PRO Z690-A DDR5"
4880
export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
4981

5082
# Workaround to access > 16MiB BIOS region on ADL+

‎boards/msi_z790p_ddr4/msi_z790p_ddr4.config‎

Lines changed: 56 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
# MSI PRO Z790-P DDR4 board configuration
2+
# This version requires
3+
# - A supported HOTP Security dongle (Nitrokey Pro/Storage or Librem Key)
4+
# - A supported dTPM module
5+
#Notes:
6+
# - dGPU support known to be problematic, look for Dasharo HCL
27

38
export CONFIG_COREBOOT=y
49
export CONFIG_COREBOOT_VERSION=dasharo
@@ -7,43 +12,70 @@ export CONFIG_LINUX_VERSION=6.1.8
712
CONFIG_COREBOOT_CONFIG=config/coreboot-msi_z790p_ddr4.config
813
CONFIG_LINUX_CONFIG=config/linux-msi-z690-z790.config
914

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
15+
#Enable DEBUG output
16+
#export CONFIG_DEBUG_OUTPUT=y
17+
#export CONFIG_ENABLE_FUNCTION_TRACING_OUTPUT=y
18+
#Enable TPM2 pcap output under /tmp
19+
#export CONFIG_TPM2_CAPTURE_PCAP=y
20+
21+
22+
#Additional hardware support
23+
CONFIG_LINUX_USB=y
24+
CONFIG_LINUX_IGC=y
25+
#CONFIG_MOBILE_TETHERING=y
26+
export CONFIG_USB_KEYBOARD=y
27+
1828
CONFIG_CRYPTSETUP2=y
29+
CONFIG_FLASHROM=y
30+
CONFIG_FLASHTOOLS=y
1931
CONFIG_GPG2=y
32+
CONFIG_KEXEC=y
33+
CONFIG_UTIL_LINUX=y
2034
CONFIG_LVM2=y
2135
CONFIG_MBEDTLS=y
36+
CONFIG_PCIUTILS=y
2237

23-
CONFIG_DROPBEAR=y
24-
38+
#Remote attestation support
39+
# TPM2 requirements
40+
CONFIG_TPM2_TSS=y
41+
CONFIG_OPENSSL=y
42+
#Remote Attestation common tools
43+
CONFIG_POPT=y
44+
CONFIG_QRENCODE=y
45+
CONFIG_TPMTOTP=y
46+
#HOTP based remote attestation for supported USB Security dongle
47+
#With/Without TPM support
2548
CONFIG_HOTPKEY=y
26-
49+
#Nitrokey Storage admin tool (deprecated)
50+
#CONFIG_NKSTORECLI=n
51+
#GUI Support
52+
#Console based Whiptail support(Console based, no FB):
53+
#CONFIG_SLANG=y
54+
#CONFIG_NEWT=y
55+
#FBWhiptail based (Graphical):
2756
CONFIG_CAIRO=y
2857
CONFIG_FBWHIPTAIL=y
2958

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=""
59+
#Additional tools (tools.cpio):
60+
#SSH server (requires ethernet drivers, eg: CONFIG_LINUX_E1000E)
61+
CONFIG_DROPBEAR=y
3962

40-
# TPM2 requirements
63+
#Runtime configuration
64+
#Automatically boot if HOTP is valid
65+
export CONFIG_AUTO_BOOT_TIMEOUT=5
66+
#TPM2 requirements
4167
export CONFIG_TPM2_TOOLS=y
4268
export CONFIG_PRIMARY_KEY_TYPE=ecc
43-
CONFIG_TPM2_TSS=y
44-
CONFIG_OPENSSL=y
45-
69+
#TPM1 requirements
70+
#export CONFIG_TPM=y
71+
export CONFIG_BOOTSCRIPT=/bin/gui-init
72+
#text-based original init:
73+
#export CONFIG_BOOTSCRIPT=/bin/generic-init
74+
export CONFIG_BOOT_REQ_HASH=n
75+
export CONFIG_BOOT_REQ_ROLLBACK=n
4676
export CONFIG_BOOT_DEV="/dev/nvme0n1"
77+
export CONFIG_BOOT_KERNEL_ADD=""
78+
export CONFIG_BOOT_KERNEL_REMOVE=""
4779
export CONFIG_BOARD_NAME="MSI PRO Z790-P DDR4"
4880
export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
4981

0 commit comments

Comments
 (0)