Skip to content

Commit 77f1e34

Browse files
authored
Merge pull request #1640 from tlaurion/nitrokey_board_unification_clean-enable_htop_validated_autoboot
Nitrokey board cleaning+ unification cleanup (enable htop validated autoboot + tethering)
2 parents 165f90a + b65e8bf commit 77f1e34

File tree

14 files changed

+583
-394
lines changed

14 files changed

+583
-394
lines changed

boards/nitropad-ns50/nitropad-ns50.config

Lines changed: 50 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -7,48 +7,71 @@ export CONFIG_LINUX_VERSION=6.1.8
77
CONFIG_COREBOOT_CONFIG=config/coreboot-nitropad-ns50.config
88
CONFIG_LINUX_CONFIG=config/linux-nitropad-x.config
99

10+
#Enable blobs packed under coreboot at build time
1011
CONFIG_NITROKEY_BLOBS=y
1112

12-
CONFIG_KEXEC=y
13-
CONFIG_QRENCODE=y
14-
CONFIG_TPMTOTP=y
15-
CONFIG_POPT=y
16-
CONFIG_FLASHTOOLS=y
17-
CONFIG_FLASHROM=y
18-
CONFIG_PCIUTILS=y
19-
CONFIG_UTIL_LINUX=y
13+
#Enable DEBUG output
14+
#export CONFIG_DEBUG_OUTPUT=y
15+
#export CONFIG_ENABLE_FUNCTION_TRACING_OUTPUT=y
16+
#Enable TPM2 pcap output under /tmp
17+
#export CONFIG_TPM2_CAPTURE_PCAP=y
18+
19+
#On-demand hardware support (modules.cpio)
20+
CONFIG_LINUX_USB=y
21+
CONFIG_LINUX_E1000=y
22+
CONFIG_MOBILE_TETHERING=y
23+
24+
#Modules packed into tools.cpio
2025
CONFIG_CRYPTSETUP2=y
26+
CONFIG_FLASHROM=y
27+
CONFIG_FLASHTOOLS=y
2128
CONFIG_GPG2=y
29+
CONFIG_KEXEC=y
30+
CONFIG_UTIL_LINUX=y
2231
CONFIG_LVM2=y
2332
CONFIG_MBEDTLS=y
24-
33+
CONFIG_PCIUTILS=y
34+
#Runtime tools to write to EC/MSR
2535
CONFIG_IOTOOLS=y
26-
27-
CONFIG_DROPBEAR=y
28-
2936
CONFIG_MSRTOOLS=y
37+
#Remote attestation support
38+
# TPM2 requirements
39+
CONFIG_TPM2_TSS=y
40+
CONFIG_OPENSSL=y
41+
#Remote Attestation common tools
42+
CONFIG_POPT=y
43+
CONFIG_QRENCODE=y
44+
CONFIG_TPMTOTP=y
45+
#HOTP based remote attestation for supported USB Security dongle
46+
#With/Without TPM support
3047
CONFIG_HOTPKEY=y
31-
48+
#Nitrokey Storage admin tool (deprecated)
49+
#CONFIG_NKSTORECLI=n
50+
#GUI Support
51+
#Console based Whiptail support(Console based, no FB):
52+
#CONFIG_SLANG=y
53+
#CONFIG_NEWT=y
54+
#FBWhiptail based (Graphical):
3255
CONFIG_CAIRO=y
3356
CONFIG_FBWHIPTAIL=y
57+
#Additional tools (tools.cpio):
58+
#SSH server (requires ethernet drivers, eg: CONFIG_LINUX_E1000E)
59+
CONFIG_DROPBEAR=y
3460

35-
CONFIG_LINUX_USB=y
36-
37-
CONFIG_LINUX_E1000=y
38-
61+
#Runtime configuration
62+
#Automatically boot if HOTP is valid
63+
export CONFIG_AUTO_BOOT_TIMEOUT=5
64+
#TPM2 requirements
65+
export CONFIG_TPM2_TOOLS=y
66+
export CONFIG_PRIMARY_KEY_TYPE=ecc
67+
#TPM1 requirements
68+
#export CONFIG_TPM=y
3969
export CONFIG_BOOTSCRIPT=/bin/gui-init
40-
70+
export CONFIG_BOOT_REQ_HASH=n
71+
export CONFIG_BOOT_REQ_ROLLBACK=n
4172
export CONFIG_BOOT_KERNEL_ADD=""
4273
export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off"
43-
44-
# TPM2 requirements
45-
export CONFIG_TPM2_TOOLS=y
46-
export CONFIG_PRIMARY_KEY_TYPE=ecc
47-
CONFIG_TPM2_TSS=y
48-
CONFIG_OPENSSL=y
49-
50-
5174
export CONFIG_BOOT_DEV="/dev/nvme0n1"
5275
export CONFIG_BOARD_NAME="Nitropad NS50"
5376
export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
54-
77+
export CONFIG_AUTO_BOOT_TIMEOUT=5

boards/nitropad-nv41/nitropad-nv41.config

Lines changed: 50 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -7,48 +7,71 @@ export CONFIG_LINUX_VERSION=6.1.8
77
CONFIG_COREBOOT_CONFIG=config/coreboot-nitropad-nv41.config
88
CONFIG_LINUX_CONFIG=config/linux-nitropad-x.config
99

10+
#Enable blobs packed under coreboot at build time
1011
CONFIG_NITROKEY_BLOBS=y
1112

12-
CONFIG_KEXEC=y
13-
CONFIG_QRENCODE=y
14-
CONFIG_TPMTOTP=y
15-
CONFIG_POPT=y
16-
CONFIG_FLASHTOOLS=y
17-
CONFIG_FLASHROM=y
18-
CONFIG_PCIUTILS=y
19-
CONFIG_UTIL_LINUX=y
13+
#Enable DEBUG output
14+
#export CONFIG_DEBUG_OUTPUT=y
15+
#export CONFIG_ENABLE_FUNCTION_TRACING_OUTPUT=y
16+
#Enable TPM2 pcap output under /tmp
17+
#export CONFIG_TPM2_CAPTURE_PCAP=y
18+
19+
#On-demand hardware support (modules.cpio)
20+
CONFIG_LINUX_USB=y
21+
CONFIG_LINUX_E1000=y
22+
CONFIG_MOBILE_TETHERING=y
23+
24+
#Modules packed into tools.cpio
2025
CONFIG_CRYPTSETUP2=y
26+
CONFIG_FLASHROM=y
27+
CONFIG_FLASHTOOLS=y
2128
CONFIG_GPG2=y
29+
CONFIG_KEXEC=y
30+
CONFIG_UTIL_LINUX=y
2231
CONFIG_LVM2=y
2332
CONFIG_MBEDTLS=y
24-
33+
CONFIG_PCIUTILS=y
34+
#Runtime tools to write to EC/MSR
2535
CONFIG_IOTOOLS=y
26-
27-
CONFIG_DROPBEAR=y
28-
2936
CONFIG_MSRTOOLS=y
37+
#Remote attestation support
38+
# TPM2 requirements
39+
CONFIG_TPM2_TSS=y
40+
CONFIG_OPENSSL=y
41+
#Remote Attestation common tools
42+
CONFIG_POPT=y
43+
CONFIG_QRENCODE=y
44+
CONFIG_TPMTOTP=y
45+
#HOTP based remote attestation for supported USB Security dongle
46+
#With/Without TPM support
3047
CONFIG_HOTPKEY=y
31-
48+
#Nitrokey Storage admin tool (deprecated)
49+
#CONFIG_NKSTORECLI=n
50+
#GUI Support
51+
#Console based Whiptail support(Console based, no FB):
52+
#CONFIG_SLANG=y
53+
#CONFIG_NEWT=y
54+
#FBWhiptail based (Graphical):
3255
CONFIG_CAIRO=y
3356
CONFIG_FBWHIPTAIL=y
57+
#Additional tools (tools.cpio):
58+
#SSH server (requires ethernet drivers, eg: CONFIG_LINUX_E1000E)
59+
CONFIG_DROPBEAR=y
3460

35-
CONFIG_LINUX_USB=y
36-
37-
CONFIG_LINUX_E1000=y
38-
61+
#Runtime configuration
62+
#Automatically boot if HOTP is valid
63+
export CONFIG_AUTO_BOOT_TIMEOUT=5
64+
#TPM2 requirements
65+
export CONFIG_TPM2_TOOLS=y
66+
export CONFIG_PRIMARY_KEY_TYPE=ecc
67+
#TPM1 requirements
68+
#export CONFIG_TPM=y
3969
export CONFIG_BOOTSCRIPT=/bin/gui-init
40-
70+
export CONFIG_BOOT_REQ_HASH=n
71+
export CONFIG_BOOT_REQ_ROLLBACK=n
4172
export CONFIG_BOOT_KERNEL_ADD=""
4273
export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off"
43-
44-
# TPM2 requirements
45-
export CONFIG_TPM2_TOOLS=y
46-
export CONFIG_PRIMARY_KEY_TYPE=ecc
47-
CONFIG_TPM2_TSS=y
48-
CONFIG_OPENSSL=y
49-
50-
5174
export CONFIG_BOOT_DEV="/dev/nvme0n1"
5275
export CONFIG_BOARD_NAME="Nitropad NV41"
5376
export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
54-
77+
export CONFIG_AUTO_BOOT_TIMEOUT=5

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

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,16 @@ export CONFIG_ENABLE_FUNCTION_TRACING_OUTPUT=y
2828
CONFIG_LINUX_USB=y
2929
CONFIG_LINUX_E1000=y
3030
#CONFIG_MOBILE_TETHERING=y
31+
#Runtime on-demand additional hardware support (modules.cpio)
32+
export CONFIG_LINUX_USB_COMPANION_CONTROLLER=y
3133

3234

3335

3436
#Modules packed into tools.cpio
3537
ifeq "$(CONFIG_UROOT)" "y"
3638
CONFIG_BUSYBOX=n
3739
else
40+
#Modules packed into tools.cpio
3841
CONFIG_CRYPTSETUP2=y
3942
CONFIG_FLASHROM=y
4043
CONFIG_FLASHTOOLS=y
@@ -45,8 +48,8 @@ CONFIG_LVM2=y
4548
CONFIG_MBEDTLS=y
4649
CONFIG_PCIUTILS=y
4750
#Runtime tools to write to EC/MSR
48-
CONFIG_IOTOOLS=y
49-
CONFIG_MSRTOOLS=y
51+
#CONFIG_IOTOOLS=y
52+
#CONFIG_MSRTOOLS=y
5053
#Remote attestation support
5154
# TPM2 requirements
5255
#CONFIG_TPM2_TSS=y
@@ -61,21 +64,17 @@ CONFIG_HOTPKEY=y
6164
#Nitrokey Storage admin tool (deprecated)
6265
#CONFIG_NKSTORECLI=n
6366
#GUI Support
67+
#Console based Whiptail support(Console based, no FB):
68+
#CONFIG_SLANG=y
69+
#CONFIG_NEWT=y
6470
#FBWhiptail based (Graphical):
6571
CONFIG_CAIRO=y
6672
CONFIG_FBWHIPTAIL=y
67-
#text-based init (generic-init and gui-init)
68-
#CONFIG_NEWT=y
69-
#CONFIG_SLANG=y
7073
#Additional tools (tools.cpio):
7174
#SSH server (requires ethernet drivers, eg: CONFIG_LINUX_E1000E)
7275
CONFIG_DROPBEAR=y
7376
endif
7477

75-
#Runtime on-demand additional hardware support (modules.cpio)
76-
export CONFIG_LINUX_USB_COMPANION_CONTROLLER=y
77-
78-
7978
#Runtime configuration
8079
#Automatically boot if HOTP is valid
8180
export CONFIG_AUTO_BOOT_TIMEOUT=5
@@ -94,5 +93,7 @@ export CONFIG_BOOT_KERNEL_ADD="console=ttyS0 console=tty systemd.zram=0"
9493
export CONFIG_BOOT_KERNEL_REMOVE="quiet rhgb splash"
9594
export CONFIG_BOOT_DEV="/dev/vda1"
9695
export CONFIG_BOARD_NAME="qemu-coreboot-fbwhiptail-tpm1-hotp"
96+
#export CONFIG_FLASHROM_OPTIONS="-p internal"
97+
export CONFIG_AUTO_BOOT_TIMEOUT=5
9798

9899
BOARD_TARGETS := qemu

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,16 @@ export CONFIG_ENABLE_FUNCTION_TRACING_OUTPUT=y
2626
CONFIG_LINUX_USB=y
2727
CONFIG_LINUX_E1000=y
2828
#CONFIG_MOBILE_TETHERING=y
29+
#Runtime on-demand additional hardware support (modules.cpio)
30+
export CONFIG_LINUX_USB_COMPANION_CONTROLLER=y
2931

3032

3133

3234
#Modules packed into tools.cpio
3335
ifeq "$(CONFIG_UROOT)" "y"
3436
CONFIG_BUSYBOX=n
3537
else
38+
#Modules packed into tools.cpio
3639
CONFIG_CRYPTSETUP2=y
3740
CONFIG_FLASHROM=y
3841
CONFIG_FLASHTOOLS=y
@@ -59,21 +62,17 @@ CONFIG_TPMTOTP=y
5962
#Nitrokey Storage admin tool (deprecated)
6063
#CONFIG_NKSTORECLI=n
6164
#GUI Support
65+
#Console based Whiptail support(Console based, no FB):
66+
#CONFIG_SLANG=y
67+
#CONFIG_NEWT=y
6268
#FBWhiptail based (Graphical):
6369
CONFIG_CAIRO=y
6470
CONFIG_FBWHIPTAIL=y
65-
#text-based init (generic-init and gui-init)
66-
#CONFIG_NEWT=y
67-
#CONFIG_SLANG=y
6871
#Additional tools (tools.cpio):
6972
#SSH server (requires ethernet drivers, eg: CONFIG_LINUX_E1000E)
7073
CONFIG_DROPBEAR=y
7174
endif
7275

73-
#Runtime on-demand additional hardware support (modules.cpio)
74-
export CONFIG_LINUX_USB_COMPANION_CONTROLLER=y
75-
76-
7776
#Runtime configuration
7877
#Automatically boot if HOTP is valid
7978
export CONFIG_AUTO_BOOT_TIMEOUT=5
@@ -92,5 +91,7 @@ export CONFIG_BOOT_KERNEL_ADD="console=ttyS0 console=tty systemd.zram=0"
9291
export CONFIG_BOOT_KERNEL_REMOVE="quiet rhgb splash"
9392
export CONFIG_BOOT_DEV="/dev/vda1"
9493
export CONFIG_BOARD_NAME="qemu-coreboot-fbwhiptail-tpm1"
94+
#export CONFIG_FLASHROM_OPTIONS="-p internal"
95+
#export CONFIG_AUTO_BOOT_TIMEOUT=5
9596

9697
BOARD_TARGETS := qemu

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,16 @@ export CONFIG_TPM2_CAPTURE_PCAP=y
2727
CONFIG_LINUX_USB=y
2828
CONFIG_LINUX_E1000=y
2929
#CONFIG_MOBILE_TETHERING=y
30+
#Runtime on-demand additional hardware support (modules.cpio)
31+
export CONFIG_LINUX_USB_COMPANION_CONTROLLER=y
3032

3133

3234

3335
#Modules packed into tools.cpio
3436
ifeq "$(CONFIG_UROOT)" "y"
3537
CONFIG_BUSYBOX=n
3638
else
39+
#Modules packed into tools.cpio
3740
CONFIG_CRYPTSETUP2=y
3841
CONFIG_FLASHROM=y
3942
CONFIG_FLASHTOOLS=y
@@ -60,21 +63,17 @@ CONFIG_HOTPKEY=y
6063
#Nitrokey Storage admin tool (deprecated)
6164
#CONFIG_NKSTORECLI=n
6265
#GUI Support
66+
#Console based Whiptail support(Console based, no FB):
67+
#CONFIG_SLANG=y
68+
#CONFIG_NEWT=y
6369
#FBWhiptail based (Graphical):
6470
CONFIG_CAIRO=y
6571
CONFIG_FBWHIPTAIL=y
66-
#text-based init (generic-init and gui-init)
67-
#CONFIG_NEWT=y
68-
#CONFIG_SLANG=y
6972
#Additional tools (tools.cpio):
7073
#SSH server (requires ethernet drivers, eg: CONFIG_LINUX_E1000E)
7174
CONFIG_DROPBEAR=y
7275
endif
7376

74-
#Runtime on-demand additional hardware support (modules.cpio)
75-
export CONFIG_LINUX_USB_COMPANION_CONTROLLER=y
76-
77-
7877
#Runtime configuration
7978
#Automatically boot if HOTP is valid
8079
export CONFIG_AUTO_BOOT_TIMEOUT=5
@@ -93,5 +92,7 @@ export CONFIG_BOOT_KERNEL_ADD="console=ttyS0 console=tty systemd.zram=0"
9392
export CONFIG_BOOT_KERNEL_REMOVE="quiet rhgb splash"
9493
export CONFIG_BOOT_DEV="/dev/vda1"
9594
export CONFIG_BOARD_NAME="qemu-coreboot-fbwhiptail-tpm2-hotp"
95+
#export CONFIG_FLASHROM_OPTIONS="-p internal"
96+
export CONFIG_AUTO_BOOT_TIMEOUT=5
9697

9798
BOARD_TARGETS := qemu

0 commit comments

Comments
 (0)