diff options
| author | Tom Rini <trini@konsulko.com> | 2024-07-19 08:53:23 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-07-19 08:53:23 -0600 |
| commit | cb0b7ab607aa71ae4b77a2b4d30d3d604c8324af (patch) | |
| tree | dc3702be4e5ca6bdcf2ca66d4948bc44cf72a36a /boot/bootmeth_efi.c | |
| parent | 459560000736ac7c9c8b04522789c20fb45ff95a (diff) | |
| parent | 38b000881ebc0a48b0a814fce9f52dfe62ac644b (diff) | |
Merge tag 'efi-2024-10-rc1-3' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request efi-2024-10-rc1-3
Documentation:
* Move out-of-tree building info to HTML
* Enable ReadTheDocs addon management
* Remove FIT documentation that is elsewhere
* Update table of contents for FIT images
* Add description for more boot methods
UEFI:
* Correct finding distro device-path for media devices
* Fix typo in EFI_RT_VOLATILE_STORE description
Other:
* MAINTAINERS: Rename BOOTDEVICE
Diffstat (limited to 'boot/bootmeth_efi.c')
| -rw-r--r-- | boot/bootmeth_efi.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/boot/bootmeth_efi.c b/boot/bootmeth_efi.c index 5a4c125835a..39232eb2e25 100644 --- a/boot/bootmeth_efi.c +++ b/boot/bootmeth_efi.c @@ -265,7 +265,7 @@ static int distro_efi_read_bootflow_net(struct bootflow *bflow) return log_msg_ret("sz", -EINVAL); bflow->size = size; - /* bootfile should be setup by dhcp*/ + /* bootfile should be setup by dhcp */ bootfile_name = env_get("bootfile"); if (!bootfile_name) return log_msg_ret("bootfile_name", ret); @@ -394,6 +394,7 @@ static const struct udevice_id distro_efi_bootmeth_ids[] = { { } }; +/* Put a number before 'efi' to provide a default ordering */ U_BOOT_DRIVER(bootmeth_4efi) = { .name = "bootmeth_efi", .id = UCLASS_BOOTMETH, |