Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-27 16:01:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

efi_loader: rename Unicode collation protocol 2 variables

Browse source 
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 <xypron.glpk@gmx.de>
This commit is contained in:
Heinrich Schuchardt 2019-05-16 07:52:58 +02:00
parent f005f573a8
commit 95ab381676
6 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/efi_loader.h
View file

@ -108,7 +108,7 @@ extern const struct efi_device_path_utilities_protocol
efi_device_path_utilities; efi_device_path_utilities;
/* Implementation of the EFI_UNICODE_COLLATION_PROTOCOL */ /* Implementation of the EFI_UNICODE_COLLATION_PROTOCOL */
extern const struct efi_unicode_collation_protocol extern const struct efi_unicode_collation_protocol
efi_unicode_collation_protocol; efi_unicode_collation_protocol2;
extern const struct efi_hii_config_routing_protocol efi_hii_config_routing; extern const struct efi_hii_config_routing_protocol efi_hii_config_routing;
extern const struct efi_hii_config_access_protocol efi_hii_config_access; extern const struct efi_hii_config_access_protocol efi_hii_config_access;
extern const struct efi_hii_database_protocol efi_hii_database; extern const struct efi_hii_database_protocol efi_hii_database;
@ -146,7 +146,7 @@ extern const efi_guid_t efi_file_info_guid;
extern const efi_guid_t efi_file_system_info_guid; extern const efi_guid_t efi_file_system_info_guid;
extern const efi_guid_t efi_guid_device_path_utilities_protocol; extern const efi_guid_t efi_guid_device_path_utilities_protocol;
/* GUID of the Unicode collation protocol */ /* GUID of the Unicode collation protocol */
extern const efi_guid_t efi_guid_unicode_collation_protocol; extern const efi_guid_t efi_guid_unicode_collation_protocol2;
extern const efi_guid_t efi_guid_hii_config_routing_protocol; extern const efi_guid_t efi_guid_hii_config_routing_protocol;
extern const efi_guid_t efi_guid_hii_config_access_protocol; extern const efi_guid_t efi_guid_hii_config_access_protocol;
extern const efi_guid_t efi_guid_hii_database_protocol; extern const efi_guid_t efi_guid_hii_database_protocol;

4
lib/efi_loader/Kconfig
View file

@ -36,14 +36,14 @@ config EFI_LOADER_HII
U-Boot implements enough of its features to be able to run the UEFI U-Boot implements enough of its features to be able to run the UEFI
Shell, but not more than that. Shell, but not more than that.
config EFI_UNICODE_COLLATION_PROTOCOL config EFI_UNICODE_COLLATION_PROTOCOL2
bool "Unicode collation protocol" bool "Unicode collation protocol"
default y default y
help help
The Unicode collation protocol is used for lexical comparisons. It is The Unicode collation protocol is used for lexical comparisons. It is
required to run the UEFI shell. required to run the UEFI shell.
if EFI_UNICODE_COLLATION_PROTOCOL if EFI_UNICODE_COLLATION_PROTOCOL2
config EFI_UNICODE_CAPITALIZATION config EFI_UNICODE_CAPITALIZATION
bool "Support Unicode capitalization" bool "Support Unicode capitalization"

2
lib/efi_loader/Makefile
View file

@ -30,7 +30,7 @@ obj-y += efi_memory.o
obj-y += efi_root_node.o obj-y += efi_root_node.o
obj-y += efi_runtime.o obj-y += efi_runtime.o
obj-y += efi_setup.o obj-y += efi_setup.o
obj-$(CONFIG_EFI_UNICODE_COLLATION_PROTOCOL) += efi_unicode_collation.o obj-$(CONFIG_EFI_UNICODE_COLLATION_PROTOCOL2) += efi_unicode_collation.o
obj-y += efi_variable.o obj-y += efi_variable.o
obj-y += efi_watchdog.o obj-y += efi_watchdog.o
obj-$(CONFIG_LCD) += efi_gop.o obj-$(CONFIG_LCD) += efi_gop.o

6
lib/efi_loader/efi_root_node.c
View file

@ -60,10 +60,10 @@ efi_status_t efi_root_node_register(void)
/* Device path utilities protocol */ /* Device path utilities protocol */
&efi_guid_device_path_utilities_protocol, &efi_guid_device_path_utilities_protocol,
(void *)&efi_device_path_utilities, (void *)&efi_device_path_utilities,
#if CONFIG_IS_ENABLED(EFI_UNICODE_COLLATION_PROTOCOL) #if CONFIG_IS_ENABLED(EFI_UNICODE_COLLATION_PROTOCOL2)
/* Unicode collation protocol */ /* Unicode collation protocol */
&efi_guid_unicode_collation_protocol, &efi_guid_unicode_collation_protocol2,
(void *)&efi_unicode_collation_protocol, (void *)&efi_unicode_collation_protocol2,
#endif #endif
#if CONFIG_IS_ENABLED(EFI_LOADER_HII) #if CONFIG_IS_ENABLED(EFI_LOADER_HII)
/* HII string protocol */ /* HII string protocol */

6
lib/efi_loader/efi_unicode_collation.c
View file

@ -26,8 +26,8 @@ static const u16 codepage[] = CP1250;
static const u16 codepage[] = CP437; static const u16 codepage[] = CP437;
#endif #endif
/* GUID of the EFI_UNICODE_COLLATION_PROTOCOL */ /* GUID of the EFI_UNICODE_COLLATION_PROTOCOL2 */
const efi_guid_t efi_guid_unicode_collation_protocol = const efi_guid_t efi_guid_unicode_collation_protocol2 =
EFI_UNICODE_COLLATION_PROTOCOL2_GUID; EFI_UNICODE_COLLATION_PROTOCOL2_GUID;
/** /**
@ -318,7 +318,7 @@ static bool EFIAPI efi_str_to_fat(struct efi_unicode_collation_protocol *this,
return ret; return ret;
} }
const struct efi_unicode_collation_protocol efi_unicode_collation_protocol = { const struct efi_unicode_collation_protocol efi_unicode_collation_protocol2 = {
.stri_coll = efi_stri_coll, .stri_coll = efi_stri_coll,
.metai_match = efi_metai_match, .metai_match = efi_metai_match,
.str_lwr = efi_str_lwr, .str_lwr = efi_str_lwr,

3
lib/efi_selftest/Makefile
View file

@ -38,7 +38,8 @@ efi_selftest_variables.o \
efi_selftest_watchdog.o efi_selftest_watchdog.o
obj-$(CONFIG_EFI_DEVICE_PATH_TO_TEXT) += efi_selftest_devicepath.o obj-$(CONFIG_EFI_DEVICE_PATH_TO_TEXT) += efi_selftest_devicepath.o
obj-$(CONFIG_EFI_UNICODE_COLLATION_PROTOCOL) += efi_selftest_unicode_collation.o obj-$(CONFIG_EFI_UNICODE_COLLATION_PROTOCOL2) += \
efi_selftest_unicode_collation.o
obj-$(CONFIG_CPU_V7) += efi_selftest_unaligned.o obj-$(CONFIG_CPU_V7) += efi_selftest_unaligned.o
obj-$(CONFIG_EFI_LOADER_HII) += efi_selftest_hii.o obj-$(CONFIG_EFI_LOADER_HII) += efi_selftest_hii.o