diff options
| author | Tom Rini <[email protected]> | 2025-06-09 16:28:28 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-06-09 16:28:28 -0600 |
| commit | 59d00e20fced23e6463aa09db889dd548baee677 (patch) | |
| tree | 2502afc87e22058b3efd0a5c3d878e62ba52e96e /lib | |
| parent | 865130b7308453b9436942f01cc4481124b820eb (diff) | |
| parent | d7c449c3d83a986d61e38d1762433c0607caf5c5 (diff) | |
Merge tag 'v2025.07-rc4' into next
Prepare v2025.07-rc4
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/efi/efi_stub.c | 2 | ||||
| -rw-r--r-- | lib/efi_loader/Kconfig | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/lib/efi/efi_stub.c b/lib/efi/efi_stub.c index 40fc29d9adf..a083c7f1e9b 100644 --- a/lib/efi/efi_stub.c +++ b/lib/efi/efi_stub.c @@ -83,7 +83,7 @@ void puts(const char *str) putc(*str++); } -static void _debug_uart_putc(int ch) +static inline void _debug_uart_putc(int ch) { putc(ch); } diff --git a/lib/efi_loader/Kconfig b/lib/efi_loader/Kconfig index 7f02a83e2a2..3dadbc54b58 100644 --- a/lib/efi_loader/Kconfig +++ b/lib/efi_loader/Kconfig @@ -443,10 +443,9 @@ config EFI_TCG2_PROTOCOL_MEASURE_DTB help When enabled, the DTB image passed to the booted EFI image is measured using the EFI TCG2 protocol. Do not enable this feature if - the passed DTB contains data that change across platform reboots - and cannot be used has a predictable measurement. Otherwise - this feature allows better measurement of the system boot - sequence. + the passed DTB contains data that changes across platform reboots + and cannot be used for a predictable measurement. Otherwise, this + feature allows for better measurement of the system boot sequence. config EFI_LOAD_FILE2_INITRD bool "EFI_FILE_LOAD2_PROTOCOL for Linux initial ramdisk" |