From 95ab3816769827f73960f9c4347839e380c15c17 Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Thu, 16 May 2019 07:52:58 +0200 Subject: efi_loader: rename Unicode collation protocol 2 variables Rename variables to make it clear they refer to the Unicode collation protocol identified by the EFI_UNICODE_PROTOCOL2_GUID. Signed-off-by: Heinrich Schuchardt --- lib/efi_loader/efi_root_node.c | 6 +++--- 1 file changed, 3 insertions(+), 3 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 d8496cc3c27..2b7277de05b 100644 --- a/lib/efi_loader/efi_root_node.c +++ b/lib/efi_loader/efi_root_node.c @@ -60,10 +60,10 @@ 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) +#if CONFIG_IS_ENABLED(EFI_UNICODE_COLLATION_PROTOCOL2) /* Unicode collation protocol */ - &efi_guid_unicode_collation_protocol, - (void *)&efi_unicode_collation_protocol, + &efi_guid_unicode_collation_protocol2, + (void *)&efi_unicode_collation_protocol2, #endif #if CONFIG_IS_ENABLED(EFI_LOADER_HII) /* HII string protocol */ -- cgit v1.2.3 From b1b782d30608701d1901c1a83702ee9671a1d012 Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Thu, 16 May 2019 18:19:00 +0200 Subject: efi_loader: implement deprecated 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. Unfortunately it is required to run the UEFI Self Certification Test (SCT) II, version 2.6, 2017. So we implement it here for the sole purpose of running the SCT. It can be removed once a compliant SCT is available. The configuration option defaults to no. Signed-off-by: Rob Clark Most of Rob's original patch is already merged. Only the deprecated protocol is missing. Rebase it and make it configurable. Signed-off-by: Heinrich Schuchardt --- lib/efi_loader/efi_root_node.c | 7 ++++++- 1 file changed, 6 insertions(+), 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 2b7277de05b..f68b0fdc610 100644 --- a/lib/efi_loader/efi_root_node.c +++ b/lib/efi_loader/efi_root_node.c @@ -61,7 +61,12 @@ efi_status_t efi_root_node_register(void) &efi_guid_device_path_utilities_protocol, (void *)&efi_device_path_utilities, #if CONFIG_IS_ENABLED(EFI_UNICODE_COLLATION_PROTOCOL2) - /* Unicode collation protocol */ +#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