michael/u-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'v2026.01-rc4' into next

Browse Source 
Prepare v2026.01-rc4
This commit is contained in:
Tom Rini
2025-12-08 13:17:27 -06:00
parent 8e12d6ccb3 0e0a198a68
commit 59202e5ae7
201 changed files with 7926 additions and 376 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
lib/efi_loader/efi_capsule.c
View File

@@ -857,18 +857,9 @@ static efi_status_t get_dp_device(u16 *boot_var,
struct efi_device_path *file_dp;
efi_status_t ret;
size = 0;
ret = efi_get_variable_int(boot_var, &efi_global_variable_guid,
NULL, &size, NULL, NULL);
if (ret == EFI_BUFFER_TOO_SMALL) {
buf = malloc(size);
if (!buf)
return EFI_OUT_OF_RESOURCES;
ret = efi_get_variable_int(boot_var, &efi_global_variable_guid,
NULL, &size, buf, NULL);
}
if (ret != EFI_SUCCESS)
return ret;
buf = efi_get_var(boot_var, &efi_global_variable_guid, &size);
if (!buf)
return EFI_NOT_FOUND;
efi_deserialize_load_option(&lo, buf, &size);
@@ -960,22 +951,11 @@ static efi_status_t find_boot_device(void)
skip:
/* find active boot device in BootOrder */
size = 0;
ret = efi_get_variable_int(u"BootOrder", &efi_global_variable_guid,
NULL, &size, NULL, NULL);
if (ret == EFI_BUFFER_TOO_SMALL) {
boot_order = malloc(size);
if (!boot_order) {
ret = EFI_OUT_OF_RESOURCES;
goto out;
}
ret = efi_get_variable_int(u"BootOrder",
&efi_global_variable_guid,
NULL, &size, boot_order, NULL);
}
if (ret != EFI_SUCCESS)
boot_order = efi_get_var(u"BootOrder", &efi_global_variable_guid, &size);
if (!boot_order) {
ret = EFI_NOT_FOUND;
goto out;
}
/* check in higher order */
num = size / sizeof(u16);