From 334997356e6c394d0898bdb746e7794f4b226ef3 Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Wed, 8 May 2019 23:24:26 +0200 Subject: efi_loader: make Unicode collation protocol customizable The Unicode collation protocol is not needed for EBBR compliance. So let's make it a customizable option. The Unicode capitalization table is only needed by this protocol. So let it depend on the Unicode collation protocol. Signed-off-by: Heinrich Schuchardt --- lib/efi_loader/efi_root_node.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'lib/efi_loader/efi_root_node.c') diff --git a/lib/efi_loader/efi_root_node.c b/lib/efi_loader/efi_root_node.c index 38514e08209..f36ca3456e2 100644 --- a/lib/efi_loader/efi_root_node.c +++ b/lib/efi_loader/efi_root_node.c @@ -58,9 +58,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(EFI_UNICODE_COLLATION_PROTOCOL) /* Unicode collation protocol */ &efi_guid_unicode_collation_protocol, (void *)&efi_unicode_collation_protocol, +#endif #if CONFIG_IS_ENABLED(EFI_LOADER_HII) /* HII string protocol */ &efi_guid_hii_string_protocol, -- cgit v1.2.3 From 64b5ba4d293ac9b5416c286aa2d0051b6a9594d6 Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Sat, 11 May 2019 09:53:33 +0200 Subject: efi_loader: make device path to text protocol customizable The device path to text protocol is not needed for EBBR compliance. So let's make it a customizable option. Signed-off-by: Heinrich Schuchardt --- lib/efi_loader/efi_root_node.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'lib/efi_loader/efi_root_node.c') diff --git a/lib/efi_loader/efi_root_node.c b/lib/efi_loader/efi_root_node.c index f36ca3456e2..d8496cc3c27 100644 --- a/lib/efi_loader/efi_root_node.c +++ b/lib/efi_loader/efi_root_node.c @@ -52,9 +52,11 @@ efi_status_t efi_root_node_register(void) (&efi_root, /* Device path protocol */ &efi_guid_device_path, dp, +#if CONFIG_IS_ENABLED(EFI_DEVICE_PATH_TO_TEXT) /* Device path to text protocol */ &efi_guid_device_path_to_text_protocol, (void *)&efi_device_path_to_text, +#endif /* Device path utilities protocol */ &efi_guid_device_path_utilities_protocol, (void *)&efi_device_path_utilities, -- cgit v1.2.3