Skip to content

Commit e704db8

Browse files
committed
Moved boards to 5.10.5 kernel configs to not cause regression on crypto backend, both with cryptsetup and current gpg toolstack modules/linux added 5.10.178 but nothing migrated at this stage. modules/linux includes Android tethering modules to be packed when needed per board configs (maximized only) Kernel configs for x230 good to go. - Removed unneedead crypto support for ivy and sandy bridge (no AVX2, and AVX support needed only for AES (ctypestup is XTS-AES on most deployments) - Added required crypto hash HMAC Note: those two commands are really useful to analyse in-kernel sizes. Summary, to dig down in directory reported as being biggest: user@heads-tests:~/heads/build/x86/linux-5.10.5/linux-x230-maximized$ for f in */built-in.a; do size -t $f | tail -1 | sed "s|(TOTALS)|$f|"; done | sort -nr Detailed view of biggest built-in components and objects linked: user@heads-tests:~/heads/build/x86/linux-5.10.5/linux-x230-maximized$ size -t $(find ./ -name built-in.a) | tail -n +2 | sort -n -r -k 4|less Then follow those amazing guides to axe/hammer kernel size: Axing: https://lwn.net/Articles/746780/ General: https://elinux.org/Kernel_Size_Tuning_Guide And analyse needs of each module/kernel config option: https://www.kernelconfig.io u-root module containing bases for using exp/tcz and wget (with only root ca module included) qemu kernel config includes changes needed to support CGROUPS and busybox upgraded and config changed to include adduser/addgroup/delgoup/deluser per determist/systems requirements, but still failing Makefile: adds packing of u-root under initrd if requested initrd/bin/tinycorePoC: requires manual activation of libraries under u-root module kexec patch still carries old multiboot patch. Not sure wasa good idea to remove since user could decide to use old default multiboot1 (default is now multiboot2 under kexec 2.0.26 under master) CircleCI changes revisioning to 4.19 (textual, not changing any behavior)
1 parent 400f71d commit e704db8

80 files changed

Lines changed: 860 additions & 297 deletions

File tree

Some content is hidden

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

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ workflows:
209209
# version. The last board in the sequence is the dependency
210210
# for the parallel boards built at the end, and also save_cache.
211211

212-
# Coreboot 4.13
212+
# Coreboot 4.19
213213
- build_and_persist:
214214
name: x230-hotp-maximized
215215
target: x230-hotp-maximized

Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ include $(CONFIG)
5151

5252
# Unless otherwise specified, we are building for heads
5353
CONFIG_HEADS ?= y
54+
CONFIG_UROOT ?= n
5455

5556
# Unless otherwise specified, we are building bash to have non-interactive shell for scripts (arrays and bashisms)
5657
CONFIG_BASH ?= y
@@ -529,6 +530,7 @@ initrd-y += $(pwd)/blobs/dev.cpio
529530
initrd-y += $(build)/$(initrd_dir)/modules.cpio
530531
initrd-y += $(build)/$(initrd_dir)/tools.cpio
531532
initrd-$(CONFIG_HEADS) += $(build)/$(initrd_dir)/heads.cpio
533+
initrd-$(CONFIG_UROOT) += $(build)/$(initrd_dir)/u-root.cpio
532534

533535
#$(build)/$(initrd_dir)/.build: $(build)/$(initrd_dir)/initrd.cpio.xz
534536

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ 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
42+
export CONFIG_COREBOOT_VERSION=4.19
4343
export CONFIG_LINUX_VERSION=5.10.5
4444

4545
CONFIG_CRYPTSETUP2=y

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Nitrokey Pro can also be used by forwarding the USB device from the host to
66
# the VM.
77
export CONFIG_COREBOOT=y
8-
export CONFIG_COREBOOT_VERSION=4.13
8+
export CONFIG_COREBOOT_VERSION=4.19
99
export CONFIG_LINUX_VERSION=5.10.5
1010

1111
#Enable DEBUG output

boards/qemu-coreboot-fbwhiptail-tpm1/qemu-coreboot-fbwhiptail-tpm1.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, 1.2).
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-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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# Note that the TPM does not work.
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
CONFIG_COREBOOT_CONFIG=config/coreboot-qemu-fbwhiptail.config

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Nitrokey Pro can also be used by forwarding the USB device from the host to
66
# the VM.
77
export CONFIG_COREBOOT=y
8-
export CONFIG_COREBOOT_VERSION=4.13
8+
export CONFIG_COREBOOT_VERSION=4.19
99
export CONFIG_LINUX_VERSION=5.10.5
1010

1111
#Enable DEBUG output

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,22 @@
33
#
44
# TPM can be used with a qemu software TPM (TIS, 1.2).
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

9+
910
#Enable DEBUG output
1011
export CONFIG_DEBUG_OUTPUT=y
1112
export CONFIG_ENABLE_FUNCTION_TRACING_OUTPUT=y
1213

1314
CONFIG_COREBOOT_CONFIG=config/coreboot-qemu-tpm1.config
1415
CONFIG_LINUX_CONFIG=config/linux-qemu.config
1516

16-
ifeq "$(CONFIG_UROOT)" "y"
17-
CONFIG_BUSYBOX=n
18-
else
17+
#Testing
18+
CONFIG_UROOT=y
19+
#CONFIG_TINYCORE_ROOTFS=y
20+
export CONFIG_SYNC_TIME_ON_NETWORK_INIT=n
21+
1922
CONFIG_KEXEC=y
2023
CONFIG_QRENCODE=y
2124
CONFIG_TPMTOTP=y
@@ -41,8 +44,6 @@ CONFIG_MSRTOOLS=y
4144
CONFIG_NEWT=y
4245
CONFIG_SLANG=y
4346

44-
endif
45-
4647
export CONFIG_LINUX_USB_COMPANION_CONTROLLER=y
4748
CONFIG_LINUX_USB=y
4849
CONFIG_LINUX_E1000=y

0 commit comments

Comments
 (0)