mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2026-05-09 06:36:13 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Pull request efi-2026-01-rc3

Browse Source 
Documentation:
 
 * Correct the linux/arm64 platform string for Docker builds
 * Complete pytest dependencies list with missing packages
 
 UEFI:
 
 * Use Sphinx style comments in efi_selftest_console.c
 * Don't include asm/global_data.h in lib/efi_client/efi_app.c twice
 * efi_client: correct memset() return value
 * Assure fitImage from capsule is used from 8-byte aligned address
 * Fix warning when building efi_selftest_snp with clang
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEbcT5xx8ppvoGt20zxIHbvCwFGsQFAmkYalkACgkQxIHbvCwF
 GsQuCw//Z+wUnjEvdgbWFr681qG+wJcS69DMvm5iiduAcYXg7p+om1cRcFCnukbW
 jRgXeCvV18RR9s8irvwZE8A9hd5+FSJZKTaDq8+9JDSpDQUlML7+09MJ8XXwo3By
 /6adZkWnFPiIa3dfIM0iMMS1o5znCdsyKmJ8b1mWuKEuAx/EIH8z8IUshOgfnn30
 guh49AefGXjRaW3TzoE2c1izUj+QsPK23UBB0C39IP4LeQQSXF3RntCG/R1unlQg
 nII8useDdZb+L7vs9L9un3R9tpZ+dQJxY36iLCAoKvGEMNOJkfn7FuSDP6M4fOqz
 03xFOVTDLahpVtGIAqyKWhmEsnsF41PM0OXelKxjMbU+5BIM+Rc6+xsIyZDeBvQ0
 YniPbNPdaRYLlTNlIcaHYBGRwrkH4/A9mkKMWfo3g4glVtqLNWm3g+0pHUDUPhl3
 IVGx6qoaUy8zb6gFZkFffxeyV6iC5Zx8IXvMYrYZQyoJg33Ub8lxndlz+j5We+ql
 CrqQvLI/hm9Yoy1KuB3GLU2weF0t7aPfVsu5Aq1gnmqRYYPVNRLYkHBcS1Ixh8Jh
 53toIbKlNHo2wT/sLTFllnBPtTjbpQJQHWHvrU3bFxHZU09ebv2C8STuzicPgAG+
 oCuAhqETebd5T/64gEI8v5XXUc8fCSOX0qMhphweyyrCP3I94c4=
 =2nFm
 -----END PGP SIGNATURE-----

Merge tag 'efi-2026-01-rc3' of https://source.denx.de/u-boot/custodians/u-boot-efi

Pull request efi-2026-01-rc3

CI:

* https://source.denx.de/u-boot/custodians/u-boot-efi/-/pipelines/28355

Documentation:

* Correct the linux/arm64 platform string for Docker builds
* Complete pytest dependencies list with missing packages

UEFI:

* Use Sphinx style comments in efi_selftest_console.c
* Don't include asm/global_data.h in lib/efi_client/efi_app.c twice
* efi_client: correct memset() return value
* Assure fitImage from capsule is used from 8-byte aligned address
* Fix warning when building efi_selftest_snp with clang
This commit is contained in:
Tom Rini 2025-11-15 08:05:45 -06:00
commit 69cc92d686
9 changed files with 56 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/build/docker.rst vendored
View File

@ -36,7 +36,7 @@ To build the image yourself:
.. code-block:: bash
sudo docker buildx build --platform linux/arm64/v8,linux/amd64 -t your-namespace:your-tag .
sudo docker buildx build --platform linux/arm64,linux/amd64 -t your-namespace:your-tag .
Or to use an existing container

21
doc/develop/pytest/usage.rst
View File

@ -35,21 +35,26 @@ can be installed via the command
pip install -r requirements.txt
In order to execute certain tests on their supported platforms other tools
will be required. The following is an incomplete list:
will be required. The following packages may be needed:
* gdisk
* dfu-util
* dtc
* openssl
* e2fsprogs
* util-linux
* cgpt
* coreutils
* device-tree-compiler
* dfu-util
* dosfstools
* e2fsprogs
* efitools
* fdisk
* gdisk
* libgnutls28-dev / gnutls-devel
* mount
* mtools
* openssl
* sbsigntool
* swig
* udisks2
* util-linux
* vboot-kernel-utils / vboot-utils
Please use the appropriate commands for your distribution to match these tools
up with the package that provides them.
@ -63,7 +68,7 @@ The test script supports either:
Further details are described later.
The usage of the command ``sudo`` is not allowed in tests. Using elevated
priviledges can lead to security concerns. Furthermore not all users may have
privileges can lead to security concerns. Furthermore not all users may have
administrator rights. Therefore the command ``sudo`` must not be used in tests.
To create disk images we have helper functions located in
``test/py/tests/fs_helper.py`` which shall be used in any tests that require

1
lib/efi_client/efi_app.c
View File

@ -21,7 +21,6 @@
#include <asm/global_data.h>
#include <linux/err.h>
#include <linux/types.h>
#include <asm/global_data.h>
#include <dm/device-internal.h>
#include <dm/lists.h>
#include <dm/root.h>

2
lib/efi_client/efi_stub.c
View File

@ -110,7 +110,7 @@ void *memset(void *inptr, int ch, size_t size)
while (ptr < end)
*ptr++ = ch;
return ptr;
return inptr;
}
static void jump_to_uboot(ulong cs32, ulong addr, ulong info)

16
lib/efi_loader/efi_firmware.c
View File

@ -651,6 +651,7 @@ efi_status_t EFIAPI efi_firmware_fit_set_image(
efi_status_t status;
struct fmp_state state = { 0 };
char *orig_dfu_env;
void *img;
EFI_ENTRY("%p %d %p %zu %p %p %p\n", this, image_index, image,
image_size, vendor_code, progress, abort_reason);
@ -677,7 +678,20 @@ efi_status_t EFIAPI efi_firmware_fit_set_image(
return EFI_EXIT(EFI_DEVICE_ERROR);
}
ret = fit_update(image);
/* Make sure the update fitImage is properly aligned to 8-bytes */
if (!IS_ALIGNED((uintptr_t)image, 8)) {
img = memalign(8, image_size);
if (!img)
return EFI_EXIT(EFI_BAD_BUFFER_SIZE);
memcpy(img, image, image_size);
} else {
img = (void *)image;
}
ret = fit_update(img);
if (!IS_ALIGNED((uintptr_t)image, 8))
free(img);
if (env_set("dfu_alt_info", orig_dfu_env))
log_warning("Unable to restore env variable \"dfu_alt_info\". Further DFU operations may fail!\n");

4
lib/efi_loader/efi_ipconfig.c
View File

@ -168,8 +168,8 @@ static efi_status_t EFIAPI efi_ip4_config2_register_notify(struct efi_ip4_config
}
/*
* efi_ip4_config2_unregister_notify() - Remove a previously registered eventfor
* the specified configuration data
* efi_ip4_config2_unregister_notify() - Remove a previously registered event
* for the specified configuration data
*
* This function implements EFI_IP4_CONFIG2_PROTOCOL.UnregisterDataNotify()
* See the Unified Extensible Firmware Interface

44
lib/efi_selftest/efi_selftest_console.c
View File

@ -12,12 +12,12 @@
struct efi_simple_text_output_protocol *con_out;
struct efi_simple_text_input_protocol *con_in;
/*
* Print a MAC address to an u16 string
/**
* mac() - print a MAC address to an u16 string
*
* @pointer: mac address
* @buf: pointer to buffer address
* on return position of terminating zero word
* @pointer: mac address
* @buf: pointer to buffer address,
* on return position of terminating zero word
*/
static void mac(void *pointer, u16 **buf)
{
@ -43,7 +43,7 @@ static void mac(void *pointer, u16 **buf)
*buf = pos;
}
/*
/**
* printx() - print hexadecimal number to an u16 string
*
* @p: value to print
@ -71,7 +71,7 @@ static void printx(u64 p, int prec, u16 **buf)
}
/**
* print_guid() - print GUID to an u16 string
* print_uuid() - print GUID to an u16 string
*
* @p: GUID to print
* @buf: pointer to buffer address,
@ -92,12 +92,12 @@ static void print_uuid(u8 *p, u16 **buf)
}
}
/*
* Print an unsigned 32bit value as decimal number to an u16 string
/**
* uint2dec() - print an unsigned 32bit value as decimal number to an u16 string
*
* @value: value to be printed
* @prec: minimum number of digits to display
* @buf: pointer to buffer address
* @buf: pointer to buffer address,
* on return position of terminating zero word
*/
static void uint2dec(u32 value, int prec, u16 **buf)
@ -132,13 +132,13 @@ static void uint2dec(u32 value, int prec, u16 **buf)
*buf = pos;
}
/*
* Print a signed 32bit value as decimal number to an u16 string
/**
* int2dec() - print a signed 32bit value as decimal number to an u16 string
*
* @value: value to be printed
* @prec: minimum number of digits to display
* @buf: pointer to buffer address
* on return position of terminating zero word
* @buf: pointer to buffer address,
* on return position of terminating zero word
*/
static void int2dec(s32 value, int prec, u16 **buf)
{
@ -155,12 +155,12 @@ static void int2dec(s32 value, int prec, u16 **buf)
*buf = pos;
}
/*
* Print a colored formatted string to the EFI console
/**
* efi_st_printc() - print a colored message
*
* @color color, see constants in efi_api.h, use -1 for no color
* @fmt format string
* @... optional arguments
* @color: color, see constants in efi_api.h, use -1 for no color
* @fmt: printf style format string
* @...: arguments to be printed
*/
void efi_st_printc(int color, const char *fmt, ...)
{
@ -271,10 +271,10 @@ void efi_st_printc(int color, const char *fmt, ...)
con_out->set_attribute(con_out, EFI_LIGHTGRAY);
}
/*
* Reads an Unicode character from the input device.
/**
* efi_st_get_key() - read an Unicode character from the input device
*
* Return: Unicode character
* Return: Unicode character
*/
u16 efi_st_get_key(void)
{

2
lib/efi_selftest/efi_selftest_snp.c
View File

@ -43,7 +43,7 @@ struct dhcp_hdr {
u8 chaddr[16];
u8 sname[64];
u8 file[128];
};
} __packed;
/*
* Message type option.

2
tools/docker/Dockerfile
View File

@ -6,7 +6,7 @@ FROM ubuntu:jammy-20251001
LABEL org.opencontainers.image.authors="Tom Rini <trini@konsulko.com>"
LABEL org.opencontainers.image.description=" This image is for building U-Boot inside a container"
# Used by docker to set the target platform: valid values are linux/arm64/v8
# Used by Docker to set the target platform: valid values are linux/arm64
# and linux/amd64
ARG TARGETPLATFORM