diff options
| author | Tom Rini <trini@konsulko.com> | 2019-05-19 16:46:24 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-05-19 16:46:24 -0400 |
| commit | ab487c8568fe35e97943d121e9b9192884cc0d1d (patch) | |
| tree | 2615e6d8b29b7dae50854381509a049e6d2c2ced /lib/efi_loader/efi_root_node.c | |
| parent | e14d9ca4919e5bc987fc628135104f2b2c91af90 (diff) | |
| parent | b31ca6bf8484ca10bab4ae544698294a4197bef9 (diff) | |
Merge tag 'efi-2019-07-rc3-2' of git://git.denx.de/u-boot-efi
Pull request for UEFI sub-system for v2019.07-rc3 (2)
Minor patches to improve UEFI specification compliance are provided.
To allow running the UEFI self compliance tests an outdated version of
the Unicode collation protocol has been added as a configuration option
(disabled by default).
Diffstat (limited to 'lib/efi_loader/efi_root_node.c')
| -rw-r--r-- | lib/efi_loader/efi_root_node.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/efi_loader/efi_root_node.c b/lib/efi_loader/efi_root_node.c index d8496cc3c27..f68b0fdc610 100644 --- a/lib/efi_loader/efi_root_node.c +++ b/lib/efi_loader/efi_root_node.c @@ -60,11 +60,16 @@ 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(EFI_UNICODE_COLLATION_PROTOCOL2) #if CONFIG_IS_ENABLED(EFI_UNICODE_COLLATION_PROTOCOL) - /* Unicode collation protocol */ + /* Deprecated Unicode collation protocol */ &efi_guid_unicode_collation_protocol, (void *)&efi_unicode_collation_protocol, #endif + /* Current Unicode collation protocol */ + &efi_guid_unicode_collation_protocol2, + (void *)&efi_unicode_collation_protocol2, +#endif #if CONFIG_IS_ENABLED(EFI_LOADER_HII) /* HII string protocol */ &efi_guid_hii_string_protocol, |