diff options
| author | Tom Rini <trini@konsulko.com> | 2021-01-20 10:49:23 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-01-20 10:49:23 -0500 |
| commit | 404bbc809da50fcf0b63566803d5061f80d93885 (patch) | |
| tree | 8c1ab4fbb0e4a5a929b53f4d702e4acb3b001611 /lib/efi_loader/efi_root_node.c | |
| parent | 63f2607bc8012f5f0e20005a7bc2285ebb5248d4 (diff) | |
| parent | 53e54bf50d285597c1553cdf2bd0e646fcd4dd60 (diff) | |
Merge tag 'efi-2021-04-rc1-2' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi
Pull request for UEFI sub-system for efi-2021-04-rc1-2
* Provide a test tool for initial RAM disk provided via load file2 protocol.
* Make more items configurable to reduce code size:
* Boot manager
* EFI_DT_FIXUP_PROTOCOL
* EFI_DEVICE_PATH_UTILITIES_PROTOCOL
* Bug fixes
* avoid EFI runtime symbols in global symbol table
Diffstat (limited to 'lib/efi_loader/efi_root_node.c')
| -rw-r--r-- | lib/efi_loader/efi_root_node.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/lib/efi_loader/efi_root_node.c b/lib/efi_loader/efi_root_node.c index b411a12cf66..739c6867f41 100644 --- a/lib/efi_loader/efi_root_node.c +++ b/lib/efi_loader/efi_root_node.c @@ -58,21 +58,17 @@ efi_status_t efi_root_node_register(void) &efi_guid_device_path_to_text_protocol, (void *)&efi_device_path_to_text, #endif +#ifdef CONFIG_EFI_DEVICE_PATH_UTIL /* Device path utilities protocol */ &efi_guid_device_path_utilities_protocol, (void *)&efi_device_path_utilities, -#if !CONFIG_IS_ENABLED(GENERATE_ACPI_TABLE) +#endif +#ifdef CONFIG_EFI_DT_FIXUP /* 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 */ - &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 |