From 4cb07d8d93215820dc55a7fe19d617338358f1f7 Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Sat, 16 Jan 2021 09:33:24 +0100 Subject: efi_loader: make EFI_DT_FIXUP_PROTOCOL configurable Allow EFI_DT_FIXUP_PROTOCOL to be disabled via configuration. Signed-off-by: Heinrich Schuchardt --- lib/efi_loader/efi_root_node.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (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 b411a12cf66..8383fce9435 100644 --- a/lib/efi_loader/efi_root_node.c +++ b/lib/efi_loader/efi_root_node.c @@ -61,7 +61,7 @@ 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) +#ifdef CONFIG_EFI_DT_FIXUP /* Device-tree fix-up protocol */ &efi_guid_dt_fixup_protocol, (void *)&efi_dt_fixup_prot, -- cgit v1.2.3 From 59593a52a3438d163904079ae9c5d4d7c69675bb Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Sat, 16 Jan 2021 09:44:25 +0100 Subject: efi_loader: EFI_DEVICE_PATH_UTILITIES_PROTOCOL configurable Allow the EFI_DEVICE_PATH_UTILITIES_PROTOCOL to be disabled via configuration. On systems that are very tight on U-Boot image size we may want to disable the protocol. As it is required to run the UEFI Shell enable it by default. 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 8383fce9435..bfa57c97fc3 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) &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, +#endif #ifdef CONFIG_EFI_DT_FIXUP /* Device-tree fix-up protocol */ &efi_guid_dt_fixup_protocol, -- cgit v1.2.3 From 19ea5e66de3b68fc12533a32c412bfe0594f9ea0 Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Sat, 16 Jan 2021 09:58:06 +0100 Subject: efi_loader: remove EFI_UNICODE_COLLATION_PROTOCOL In EFI 1.10 a version of the Unicode collation protocol using ISO 639-2 language codes existed. This protocol is not part of the UEFI specification any longer. It was however required to run the UEFI Self Certification Test (SCT) II, version 2.6, 2017. So we implemented it for the sole purpose of running the SCT. As the SCT does not need the protocol anymore it is time for removal. Signed-off-by: Heinrich Schuchardt --- lib/efi_loader/efi_root_node.c | 6 ------ 1 file changed, 6 deletions(-) (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 bfa57c97fc3..739c6867f41 100644 --- a/lib/efi_loader/efi_root_node.c +++ b/lib/efi_loader/efi_root_node.c @@ -69,12 +69,6 @@ efi_status_t efi_root_node_register(void) (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 -- cgit v1.2.3