diff options
| author | Tom Rini <trini@konsulko.com> | 2024-06-11 07:42:55 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-06-11 07:42:55 -0600 |
| commit | 9cf83a7da95b70a37d0d2aba79439dc8a2944fe3 (patch) | |
| tree | 31681d2bbebaa2e40b32fb4a35034b6e683d8410 /lib/efi_loader/efi_device_path_utilities.c | |
| parent | f9886bc60f42d5bcfcfa4e474af7dc230400b6be (diff) | |
| parent | 535321c2ea76de44896330040d2e43aa4645d026 (diff) | |
Merge tag 'efi-next-20240611' of https://source.denx.de/u-boot/custodians/u-boot-efi into next
Pull request efi-next-20240611
UEFI:
* Allow specifying a device-tree in an EFI load option
using the efidebug or eficonfig command.
* Let the EFI boot manager fall back to an OS provided device-tree
if no device-tree is specified.
Diffstat (limited to 'lib/efi_loader/efi_device_path_utilities.c')
| -rw-r--r-- | lib/efi_loader/efi_device_path_utilities.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/efi_loader/efi_device_path_utilities.c b/lib/efi_loader/efi_device_path_utilities.c index c95dbfa9b5f..ac250bbfcc9 100644 --- a/lib/efi_loader/efi_device_path_utilities.c +++ b/lib/efi_loader/efi_device_path_utilities.c @@ -76,7 +76,7 @@ static struct efi_device_path * EFIAPI append_device_path( const struct efi_device_path *src2) { EFI_ENTRY("%pD, %pD", src1, src2); - return EFI_EXIT(efi_dp_concat(src1, src2, false)); + return EFI_EXIT(efi_dp_concat(src1, src2, 0)); } /* |