diff options
| author | Tom Rini <trini@konsulko.com> | 2021-01-14 08:50:23 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-01-14 08:50:23 -0500 |
| commit | 35772ff4f63a302e0b873096372c70292fb0af79 (patch) | |
| tree | ffa00f958cf61d12a9348b27699e3980f9d9f15d /lib/efi_loader/efi_root_node.c | |
| parent | ab1a425524a79eeca61e7b67fdf382c7a499346f (diff) | |
| parent | 8e70f1cb3f2c18d574b087d4fc1d79e68ce98fa9 (diff) | |
Merge tag 'efi-2021-04-rc1' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi
Pull request for UEFI sub-system for efi-2021-04-rc1
In the UEFI sub-system:
* implement non-blocking file services
* print boot device and file path in helloworld.efi
* improve detection of boot device
* correct argument handling in efivar.py
* implement EFI_DT_FIXUP_PROTOCOL
Bug fixes:
* adjust conitrace command for low baud rates
* check that FIT images are valid FDTs
Diffstat (limited to 'lib/efi_loader/efi_root_node.c')
| -rw-r--r-- | lib/efi_loader/efi_root_node.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/efi_loader/efi_root_node.c b/lib/efi_loader/efi_root_node.c index b17db312f7..b411a12cf6 100644 --- a/lib/efi_loader/efi_root_node.c +++ b/lib/efi_loader/efi_root_node.c @@ -7,6 +7,7 @@ #include <common.h> #include <malloc.h> +#include <efi_dt_fixup.h> #include <efi_loader.h> const efi_guid_t efi_u_boot_guid = U_BOOT_GUID; @@ -60,6 +61,11 @@ efi_status_t efi_root_node_register(void) /* Device path utilities protocol */ &efi_guid_device_path_utilities_protocol, (void *)&efi_device_path_utilities, +#if !CONFIG_IS_ENABLED(GENERATE_ACPI_TABLE) + /* Device-tree fix-up protocol */ + &efi_guid_dt_fixup_protocol, + (void *)&efi_dt_fixup_prot, +#endif #if CONFIG_IS_ENABLED(EFI_UNICODE_COLLATION_PROTOCOL2) #if CONFIG_IS_ENABLED(EFI_UNICODE_COLLATION_PROTOCOL) /* Deprecated Unicode collation protocol */ |