diff options
| author | Heinrich Schuchardt <xypron.glpk@gmx.de> | 2019-04-20 07:39:11 +0200 |
|---|---|---|
| committer | Heinrich Schuchardt <xypron.glpk@gmx.de> | 2019-04-23 00:37:27 +0200 |
| commit | dec88e41e022ac06c0054ca48807db0d95f917f6 (patch) | |
| tree | 2fb2e6ba1db459cd39566bd24ce9489ad8309e38 /lib/efi | |
| parent | a2a4bc3b09fc956ae58572430a019781425baf9c (diff) | |
| download | u-boot-dec88e41e022ac06c0054ca48807db0d95f917f6.tar.gz u-boot-dec88e41e022ac06c0054ca48807db0d95f917f6.tar.bz2 u-boot-dec88e41e022ac06c0054ca48807db0d95f917f6.zip | |
efi_loader: consistent naming of protocol GUIDs
We should consistently use the same name for protocol GUIDs as defined in
the UEFI specification. Not adhering to this rule has led to duplicate
definitions for the EFI_LOADED_IMAGE_PROTOCOL_GUID.
Adjust misnamed protocol GUIDs.
Adjust the text for the graphics output protocol in the output of the
`efidebug dh` command.
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Diffstat (limited to 'lib/efi')
| -rw-r--r-- | lib/efi/efi.c | 2 | ||||
| -rw-r--r-- | lib/efi/efi_stub.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/efi/efi.c b/lib/efi/efi.c index 2c6a50824f..7cba57b131 100644 --- a/lib/efi/efi.c +++ b/lib/efi/efi.c @@ -53,7 +53,7 @@ void efi_puts(struct efi_priv *priv, const char *str) int efi_init(struct efi_priv *priv, const char *banner, efi_handle_t image, struct efi_system_table *sys_table) { - efi_guid_t loaded_image_guid = LOADED_IMAGE_PROTOCOL_GUID; + efi_guid_t loaded_image_guid = EFI_LOADED_IMAGE_PROTOCOL_GUID; struct efi_boot_services *boot = sys_table->boottime; struct efi_loaded_image *loaded_image; int ret; diff --git a/lib/efi/efi_stub.c b/lib/efi/efi_stub.c index 12e3d637dd..6dd93ff435 100644 --- a/lib/efi/efi_stub.c +++ b/lib/efi/efi_stub.c @@ -278,7 +278,7 @@ efi_status_t EFIAPI efi_main(efi_handle_t image, struct efi_gop *gop; struct efi_entry_gopmode mode; struct efi_entry_systable table; - efi_guid_t efi_gop_guid = EFI_GOP_GUID; + efi_guid_t efi_gop_guid = EFI_GRAPHICS_OUTPUT_PROTOCOL_GUID; efi_uintn_t key, desc_size, size; efi_status_t ret; u32 version; |