- Concept - U-Boot List

[PATCH 00/30] fit: Improve and test the code to print FIT info
by Simon Glass 20 Nov '25

20 Nov '25

From: Simon Glass <simon.glass(a)canonical.com> The code for printing information about FITs is fairly old and not that easy to maintain. It also lacks tests. This series adds some tests, moves the code into its own file and then adds a series of helpers to deal with the intricacies of printing each item. This provides a binary-size reduction of about 320 bytes on aarch64. Simon Glass (30): docs: Merge .claude/README.md into CLAUDE.md tools: Fix debug() to avoid unused-variable warnings test: Increase expect_str/actual_str buffer size fit: Remove unused len parameter from fit_get_name() test: Add a test for FIT image printing test: Add signature-testing to the FIT-printing test test: fit: Test printing a FIT with multiple FDTs test: fit: Test the remaining features and edge cases test: fit: Add test for missing FIT description test: fit: Add pytest for mkimage output fit: Refactor fit_print_contents() to use new fit_print() fit: Move printing code to its own file fit: Drop showing an unused 'required' property fit: Add a context struct for FIT-printing fit: Put the indent string into print context fit: Create some helpers for printing fit: Use emit_label() helper in fit_image_print() fit: Use emit_label() helper in fit_conf_print() fit: Add a a function to print labels with values fit: Change indent from string to int fit: Move values one column to the right fit: Use emit_label_val() where possible fit: Add a helper to output optional properties fit: Add a helper for timestamp printing fit: Add a helper for stringlist properties fit: Add a helper for printing descriptions fit: Add a helper for address printing fit: Use a boolean to simplify type checks fit: Add a helper to iterate through hash/signature nodes fit: Use the libfdt subnode iterator .claude/README.md => CLAUDE.md | 3 + boot/Makefile | 1 + boot/fit_print.c | 494 ++++++++++++++++++++++++++++++++ boot/image-cipher.c | 2 +- boot/image-fit-sig.c | 24 +- boot/image-fit.c | 442 +--------------------------- common/spl/spl_fit.c | 12 +- common/update.c | 4 +- drivers/fpga/socfpga_arria10.c | 2 +- include/image.h | 84 +++++- include/test/test.h | 4 +- test/boot/Makefile | 1 + test/boot/fit_print.c | 192 +++++++++++++ test/py/tests/test_fit_print.py | 431 ++++++++++++++++++++++++++++ tools/Makefile | 1 + tools/fit_image.c | 15 +- tools/fit_info.c | 2 +- tools/image-host.c | 30 +- tools/mkimage.h | 8 +- 19 files changed, 1272 insertions(+), 480 deletions(-) rename .claude/README.md => CLAUDE.md (93%) create mode 100644 boot/fit_print.c create mode 100644 test/boot/fit_print.c create mode 100644 test/py/tests/test_fit_print.py -- 2.43.0 base-commit: adf71f6928469e3854448b7a58f26235852bd6d7 branch: fita

1 30

[PATCH 00/14] luks: Integrate support for a TKey
by Simon Glass 16 Nov '25

16 Nov '25

This series illustrates how to use a Tillitis TKey to unlock an encrypted disk. This has the advantage that the key depends on a physical key in the user's posession as well as the usual passphrase. The TKey handles the key derivation, so this series includes logic to skip that step when a TKey is used. The 'luks unlock' command provides a -t flag to use a TKey. It also provides a small pytest fix to ease conflicts with Labgrid integration. Simon Glass (14): test/py: Avoid pulling in Labgrid with tests luks: Make essiv_decrypt() a shared function luks: Tidy up debugging of unlock luks: Update try_keyslot() to allow a bytestring luks: Update unlock_luks2() to take binary passphrase luks: Update luks_unlock() to take binary passphrase luks: Extract PBKDF2 key derivation into separate function luks: Move key derivation to the caller of try_keyslot() luks: Split LUKSv1 unlock code into a separate function luks: Support a pre-derived key with LUKSv1 luks: Support a pre-derived key with LUKSv2 luks: Support a pre-derived key luks: Check for out-of-memory with Argon2 luks: Support disk unlock using a TKey cmd/luks.c | 94 +++++++++- doc/usage/cmd/luks.rst | 36 +++- drivers/block/luks.c | 316 ++++++++++++++++++++-------------- drivers/block/luks2.c | 141 ++++++--------- drivers/block/luks_internal.h | 28 ++- include/luks.h | 4 +- test/boot/luks.c | 4 +- test/py/pytest.ini | 1 + 8 files changed, 384 insertions(+), 240 deletions(-) -- 2.43.0 base-commit: 826b435241a60310f663a88b148912a9ab727b76 branch: secg

1 14

[PATCH 00/16] Continue TKey development
by Simon Glass 15 Nov '25

15 Nov '25

From: Simon Glass <simon.glass(a)canonical.com> This series adds the ability to provide a user-supplied secret to the TKey and use that to obtain a disk-encryption key. Expo is enhanced to support password entry and bootflows can now record whether the root disk is encrypted or not. Further work will enable the TKey in the UI and actually unlock an encrypted disk. Simon Glass (16): aes: Use const pointers for read-only parameters emulation: Support the bootcmd more generally input: Provide a way for tests to register a mouse click expo: Support hiding password entry expo: Support disk-passphrase entry in the menu expo: Allow entering text into textline in non-popup expos tkey: Allow modelling the tkey being disconnected tkey: Support loading an app with a user-supplied secret tkey: Provide some back-door functions for TKey tests tkey: Use SHA256 to obtain the disk-encryption key tkey: sandbox: Avoid returning -ENODEV from the driver tkey: Allow selecting the TKey device by name tkey: Provide a real tkey device with test.dts boot: Use constants for a few common strings boot: Show an indication for encrypted bootflows boot: Detect encrypted partitions with extlinux arch/sandbox/dts/test.dts | 5 + arch/x86/cpu/qemu/qemu.c | 28 ----- board/emulation/common/Makefile | 3 + board/emulation/common/bootcmd.c | 37 +++++++ boot/bootflow.c | 5 +- boot/bootflow_internal.h | 11 ++ boot/bootflow_menu.c | 31 ++++++ boot/bootmeth_extlinux.c | 54 ++++++++++ boot/scene.c | 28 ++++- cmd/bootflow.c | 15 ++- cmd/tkey.c | 36 ++++++- doc/board/emulation/common.rst | 28 +++++ doc/board/emulation/index.rst | 1 + doc/board/emulation/qemu-x86.rst | 18 +--- doc/usage/cmd/tkey.rst | 24 ++++- drivers/crypto/nuvoton/npcm_aes.c | 22 ++-- drivers/input/mouse-uclass.c | 13 +++ drivers/misc/tkey-uclass.c | 174 +++++++++++++++++------------- drivers/misc/tkey_emul.c | 82 +++++++++++++- drivers/misc/tkey_sandbox.c | 12 +-- include/bootflow.h | 4 + include/expo.h | 2 + include/mouse.h | 14 +++ include/tkey.h | 98 +++++++++++++++++ include/uboot_aes.h | 42 ++++---- lib/aes.c | 22 ++-- test/boot/bootflow.c | 111 +++++++++++++------ test/boot/cedit.c | 11 ++ test/cmd/tkey.c | 11 +- test/dm/tkey.c | 41 +++---- 30 files changed, 739 insertions(+), 244 deletions(-) create mode 100644 board/emulation/common/bootcmd.c create mode 100644 doc/board/emulation/common.rst -- 2.43.0 base-commit: 33f5f5cb3f175edb3b1ded10f091706aefda0d84 branch: secf

1 16

[PATCH 0/6] fat: Some code improvements
by Simon Glass 13 Nov '25

13 Nov '25

From: Simon Glass <simon.glass(a)canonical.com> This is an attempt to improve the structure of the FAT code, since it doesn't fully follow the U-Boot conventions: - fat_write.c includes fat.c which is odd - use of __u32 and its ilk - use of typedef - old-style struct comments This series resolves these problems, making it easier to take on other improvements in future. Simon Glass (6): fat: Create an internal header file fat: Separate fat.c from fat_write.c fat: Update struct fat_itr to kernel-doc style fat: Remove typedefs in fat.h fat: Convert fat.h to kernel-doc style fat: Use standard types for fixed-size values fs/fat/Makefile | 2 +- fs/fat/fat.c | 316 +++++++++------------------------- fs/fat/fat_internal.h | 171 +++++++++++++++++++ fs/fat/fat_write.c | 246 ++++++++++++++------------- include/fat.h | 385 +++++++++++++++++++++++++++++++++--------- 5 files changed, 677 insertions(+), 443 deletions(-) create mode 100644 fs/fat/fat_internal.h -- 2.43.0 base-commit: d3df5a8ca108c08f2136cf04f4f47bd8bd268031 branch: fat

2 8

[PATCH] expo: Ensure that cyclic tasks can run
by Simon Glass 12 Nov '25

12 Nov '25

From: Simon Glass <sjg(a)chromium.org> Since expo now runs with no delays it can trigger the watchdog on sandbox. Add a call to schedule() to avoid this. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- boot/expo.c | 1 + 1 file changed, 1 insertion(+) diff --git a/boot/expo.c b/boot/expo.c index 30f3cbeb9ef..842bacae163 100644 --- a/boot/expo.c +++ b/boot/expo.c @@ -538,6 +538,7 @@ int expo_poll(struct expo *exp, struct expo_action *act) { int key, ret = -EAGAIN; + schedule(); expo_test_mark(exp); /* update mouse position if mouse is enabled */ -- 2.43.0 base-commit: 69d20a8abc56fcfec305967816e4d93fed75a0d8 branch: edc

1 0

[PATCH 0/5] luks: Support the AES-XTS cipher mode
by Simon Glass 12 Nov '25

12 Nov '25

From: Simon Glass <simon.glass(a)canonical.com> This series finishes off the implementation of LUKSv2, adding support for the common cipher mode and testing that files can be read from the disk. It includes a fix for using the correct size when mapping the crypt, as well as some refactoring to split up the code a little better. Simon Glass (5): luks: Exclude the payload from the size calculation luks: test: Check file access in the decryption tests luks: Move blkmap crypt code into a separate file luks: Split out crypt reading into its own function luks: Add XTS cipher mode support for LUKS2 drivers/block/Makefile | 1 + drivers/block/blkmap.c | 204 +---------------- drivers/block/blkmap_crypt.c | 394 ++++++++++++++++++++++++++++++++ drivers/block/blkmap_internal.h | 74 ++++++ drivers/block/luks.c | 50 +++- include/blkmap.h | 13 +- include/luks.h | 10 +- test/boot/luks.c | 41 +++- 8 files changed, 568 insertions(+), 219 deletions(-) create mode 100644 drivers/block/blkmap_crypt.c create mode 100644 drivers/block/blkmap_internal.h -- 2.43.0 base-commit: b68c8fb93b11ce80b683e06d09de74266e4e53f6 branch: sece-fix

1 5

[PATCH 00/24] luks: Provide basic support for unlocking a LUKS1 partition
by Simon Glass 31 Oct '25

31 Oct '25

From: Simon Glass <sjg(a)chromium.org> With full-disk encryption (FDE) it is traditional to unlock a LUKS partition within userspace as part of the initial ramdisk passed to Linux. The user is prompted for a passphrase and then the disk is unlocked. This works well but does have some drawbacks: - firmware has no way of knowing whether the boot will success - the 'passphrase' prompt comes quite late in the boot, which can be confusing for the user - specifically it is not possible to provide an integrated 'boot' UI in firmware where the user can enter the passphrase - in a VM environment, the key may be known in advance, but there is no way to take advantage of this - it is not possible to use an encryted disk unless also using a ramdisk This series makes a small step towards improving U-Boot in this area. It allows a passphrase to be checked against a LUKS1-encrypted partition. It also provides read-only access to the unencrypted data, so that files can be read. Simon Glass (24): aes: Fix key size handling for AES-192 and AES-256 doc: Provide documentation for the blkmap command log: Provide a macro to log a hex string panic: Provide a way to poweroff on panic sandbox: Enable CONFIG_PANIC_POWEROFF sandbox: Add devon and devoff subcommands to sb command mbedtls: hash: Provide the mbedtls hash type in the hash interface mbedtls: Allow use of PKCS#5 functions test/py: Support creating space after a filesystem test/py: Support FDE with the extlinux image test/py: Set up an Ubuntu image with space for FDE docker: Add cryptsetup package for LUKS testing CI: Update Docker image to including luks tools luks: Add a way to create an encrypted partition luks: Encrypt the mmc11 test image luks: Add the beginning of LUKS support luks: Add a simple command luks: Create a very simple JSON library luks: Create a disk image with LUKS2 encryption luks: Show the JSON information for LUKSv2 luks: Enhance blkmap to support LUKSv1 luks: Provide a way to unlock and map encrypted partitions luks: Add a subcommand to unlock an encrypted partition luks: Add detection of LUKS partition .gitlab-ci.yml | 6 +- MAINTAINERS | 14 + arch/sandbox/dts/test.dts | 8 + cmd/Kconfig | 9 + cmd/Makefile | 1 + cmd/luks.c | 133 +++++++ cmd/sb.c | 107 ++++- common/hash.c | 5 + configs/sandbox_defconfig | 2 + doc/usage/blkmap.rst | 5 + doc/usage/cmd/blkmap.rst | 323 +++++++++++++++ doc/usage/cmd/luks.rst | 254 ++++++++++++ doc/usage/cmd/sb.rst | 40 +- doc/usage/index.rst | 3 + doc/usage/luks.rst | 340 ++++++++++++++++ drivers/block/Kconfig | 22 ++ drivers/block/Makefile | 1 + drivers/block/blkmap.c | 152 +++++++ drivers/block/luks.c | 656 +++++++++++++++++++++++++++++++ include/blkmap.h | 24 ++ include/hash.h | 33 +- include/json.h | 23 ++ include/log.h | 16 + include/luks.h | 175 +++++++++ lib/Kconfig | 15 + lib/Makefile | 1 + lib/aes.c | 15 +- lib/json.c | 122 ++++++ lib/mbedtls/Kconfig | 14 + lib/mbedtls/Makefile | 2 + lib/mbedtls/mbedtls_def_config.h | 4 + lib/panic.c | 8 + test/boot/Makefile | 1 + test/boot/luks.c | 241 ++++++++++++ test/cmd/Makefile | 1 + test/cmd/sb.c | 123 ++++++ test/lib/Makefile | 1 + test/lib/json.c | 211 ++++++++++ test/py/img/common.py | 18 +- test/py/img/ubuntu.py | 12 +- test/py/tests/fs_helper.py | 142 ++++++- test/py/tests/test_ut.py | 3 +- tools/docker/Dockerfile | 1 + 43 files changed, 3262 insertions(+), 25 deletions(-) create mode 100644 cmd/luks.c create mode 100644 doc/usage/cmd/blkmap.rst create mode 100644 doc/usage/cmd/luks.rst create mode 100644 doc/usage/luks.rst create mode 100644 drivers/block/luks.c create mode 100644 include/json.h create mode 100644 include/luks.h create mode 100644 lib/json.c create mode 100644 test/boot/luks.c create mode 100644 test/cmd/sb.c create mode 100644 test/lib/json.c -- 2.43.0 base-commit: 2ee77c0b8cb36f203fa3b1436ae3e8f07a054347 branch: secc

1 24

[PATCH 1/1] bloblist: adjust default bloblist size after reloc
by Heinrich Schuchardt 30 Oct '25

30 Oct '25

If neither CONFIG_BLOBLIST_FIXED NOR CONFIG_BLOBLIST_ALLOC is set, currently CONFIG_BLOBLIST_SIZE_RELOC defaults to 0 except if * CONFIG_ARM=y && CONFIG_EFI_LOADER=y && GENERATE_ACPI_TABLE=y. A size of zero never makes sense for a bloblist. When using QFW we need more than 64 KiB to host the ACPI table. In this case CONFIG_BLOBLIST_ALLOC is used. Set a reasonable default. Remove the CONFIG_BLOBLIST_SIZE_RELOC in ARM QEMU defconfigs which are not compatible with ACPI tables passed from QEMU. Fixes: 6f9b015c138b ("common: Enable BLOBLIST_TABLES on arm") Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- common/Kconfig | 4 ++-- configs/qemu_arm64_defconfig | 1 - configs/qemu_arm_defconfig | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/common/Kconfig b/common/Kconfig index 3bd11f44c51..1665d34fac5 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -1129,8 +1129,8 @@ config BLOBLIST_SIZE config BLOBLIST_SIZE_RELOC hex "Size of bloblist after relocation" - default BLOBLIST_SIZE if BLOBLIST_FIXED || BLOBLIST_ALLOC - default 0x20000 if (ARM && EFI_LOADER && GENERATE_ACPI_TABLE) + default BLOBLIST_SIZE if BLOBLIST_FIXED + default 0x20000 help Sets the size of the bloblist in bytes after relocation. Since U-Boot has a lot more memory available then, it is possible to use a larger diff --git a/configs/qemu_arm64_defconfig b/configs/qemu_arm64_defconfig index e6555b6d3d3..4fff61d7675 100644 --- a/configs/qemu_arm64_defconfig +++ b/configs/qemu_arm64_defconfig @@ -2,7 +2,6 @@ CONFIG_ARM=y CONFIG_POSITION_INDEPENDENT=y CONFIG_ARCH_QEMU_ARM=y CONFIG_SYS_MALLOC_LEN=0x1000000 -CONFIG_BLOBLIST_SIZE_RELOC=0x2000 CONFIG_NR_DRAM_BANKS=1 CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x40200000 CONFIG_ENV_SIZE=0x40000 diff --git a/configs/qemu_arm_defconfig b/configs/qemu_arm_defconfig index 22781226efb..50046e2fbf2 100644 --- a/configs/qemu_arm_defconfig +++ b/configs/qemu_arm_defconfig @@ -2,7 +2,6 @@ CONFIG_ARM=y CONFIG_ARM_SMCCC=y CONFIG_ARCH_QEMU_ARM=y CONFIG_SYS_MALLOC_LEN=0x1000000 -CONFIG_BLOBLIST_SIZE_RELOC=0x2000 CONFIG_NR_DRAM_BANKS=1 CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x40200000 CONFIG_ENV_SIZE=0x40000 -- 2.51.0

2 3

[PATCH 0/7] efi: Minor improvements to QEMU and build scripts
by Simon Glass 29 Oct '25

29 Oct '25

From: Simon Glass <sjg(a)chromium.org> This series introduces a few improvements: - passing a boot command to the EFI app - FPDT support for EFI app Simon Glass (7): acpi: qfw: Add FPDT support for QEMU builds qfw: Silence the message when opt/u-boot/bootcmd is not found doc: qemu-x86: Document opt/u-boot/bootcmd feature scripts: Support --bootcmd more generally scripts: build-efi: Write uboot.env file for bootcmd support efi-x86_app64: Use bootflow scan for boot command efi-x86_app64: Enable environment in FAT filesystem configs/efi-x86_app64_defconfig | 5 +- doc/board/emulation/qemu-x86.rst | 20 +++++++ drivers/qfw/qfw.c | 26 ++++++--- drivers/qfw/qfw_acpi.c | 10 ++++ include/qfw.h | 20 ++++++- lib/acpi/acpi_extra.c | 92 ++++++++++++++++++++++++++++++++ lib/acpi/acpi_table.c | 90 ------------------------------- scripts/build-efi | 34 ++++++++++++ scripts/build-qemu | 7 --- scripts/build_helper.py | 7 +++ 10 files changed, 204 insertions(+), 107 deletions(-) -- 2.43.0 base-commit: 1002f1fc35605c58cfacd955ac4780bf046d4109 branch: secd

1 7

[PATCH 00/11] Bootstage and script enhancements
by Simon Glass 23 Oct '25

23 Oct '25

From: Simon Glass <sjg(a)chromium.org> This series collects together a few improvements to the bootstage subsystem, principally some new tests. It also adds support for ACPI FPDT which is a way of passing timing information to the OS. A bug fix is provided for mouse clicks with expo. Finally the series includes some new options for the build-efi script for networking, spice, etc. Simon Glass (11): expo: Correct handling of mouse clicks bootstage: Move the bootstage record to the header file bootstage: Add some more tests bootstage: Add a way to read the time from a record acpi: Add support for Firmware Performance Data Table acpi: fpdt: Generate the table bootm: Update FPDT boot times before handing off to OS scripts: build-efi: Support spice integration scripts: build-efi: Allow enabling networking scripts: build-efi: Flush output before running QEMU scripts: build-qemu: Allow enabling TKey access boot/bootflow_menu.c | 1 + boot/bootm_final.c | 17 ++++ common/bootstage.c | 59 +++++++++-- include/acpi/acpi_table.h | 76 ++++++++++++++ include/bootstage.h | 55 +++++++++++ lib/acpi/acpi_table.c | 86 ++++++++++++++++ scripts/build-efi | 18 +++- scripts/build-qemu | 5 + test/cmd/Makefile | 1 + test/cmd/bootstage.c | 32 ++++++ test/common/Makefile | 2 + test/common/bootstage.c | 201 ++++++++++++++++++++++++++++++++++++++ test/dm/acpi.c | 73 ++++++++++++++ 13 files changed, 617 insertions(+), 9 deletions(-) create mode 100644 test/cmd/bootstage.c create mode 100644 test/common/bootstage.c -- 2.43.0 base-commit: 7c50fc5afa29cee5782b2a8bac3271b12023af0d branch: secb

1 11