diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-11-07 14:26:41 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-11-07 14:26:41 +0100 |
| commit | a2de36d8ce58e815dcfea081414b42e0956d5637 (patch) | |
| tree | a05fdff8080ca8c460dbed399dad0a7ef567d939 /common | |
| parent | 760bc83263877de1c49598ad6bdc6aecaf772d07 (diff) | |
| parent | 6ab809a3d5b6ddec6e0dd12096fd0ce6bab66006 (diff) | |
| download | barebox-a2de36d8ce58e815dcfea081414b42e0956d5637.tar.gz barebox-a2de36d8ce58e815dcfea081414b42e0956d5637.tar.xz | |
Merge branch 'for-next/efi'
Diffstat (limited to 'common')
| -rw-r--r-- | common/efi-devicepath.c | 2 | ||||
| -rw-r--r-- | common/efi-guid.c | 2 | ||||
| -rw-r--r-- | common/efi/efi.c | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/common/efi-devicepath.c b/common/efi-devicepath.c index 24722284b4..3db2cea061 100644 --- a/common/efi-devicepath.c +++ b/common/efi-devicepath.c @@ -572,7 +572,7 @@ dev_path_vendor(struct string *str, void *dev_path) } cprintf(str, "Ven%s(%pU", type, &Vendor->Guid); - if (efi_compare_guid(&Vendor->Guid, &efi_unknown_device_guid) == 0) { + if (efi_guidcmp(Vendor->Guid, efi_unknown_device_guid) == 0) { /* GUID used by EFI to enumerate an EDD 1.1 device */ unknown_dev_path = (struct unknown_device_vendor_device_path *) Vendor; diff --git a/common/efi-guid.c b/common/efi-guid.c index 1e45ccf4d2..2bf2395e85 100644 --- a/common/efi-guid.c +++ b/common/efi-guid.c @@ -52,7 +52,7 @@ const char *efi_guid_string(efi_guid_t *g) EFI_GUID_STRING(EFI_ISA_IO_PROTOCOL_GUID, "ISA IO Protocol", "ISA IO Protocol"); EFI_GUID_STRING(EFI_STANDARD_ERROR_DEVICE_GUID, "Standard Error Device Guid", "EFI Standard Error Device Guid"); EFI_GUID_STRING(EFI_CONSOLE_OUT_DEVICE_GUID, "Console Out Device Guid", "EFI Console Out Device Guid"); - EFI_GUID_STRING(EFI_CONSOLE_IN_DEVICE_GUID, "Console In Device Guid", "EFI Conosle In Device Guid"); + EFI_GUID_STRING(EFI_CONSOLE_IN_DEVICE_GUID, "Console In Device Guid", "EFI Console In Device Guid"); EFI_GUID_STRING(EFI_SIMPLE_TEXT_OUT_PROTOCOL_GUID, "Simple Text Out Protocol", "EFI 1.0 Simple Text Out Protocol"); EFI_GUID_STRING(EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL_GUID, "Simple Text Input Ex Protocol", "UEFI 2.1 Simple Text Input Ex Protocol"); EFI_GUID_STRING(EFI_SIMPLE_TEXT_IN_PROTOCOL_GUID, "Simple Text In Protocol", "EFI 1.0 Simple Text In Protocol"); diff --git a/common/efi/efi.c b/common/efi/efi.c index a7b25cbbe2..73cea37036 100644 --- a/common/efi/efi.c +++ b/common/efi/efi.c @@ -17,6 +17,7 @@ * */ +#include <linux/linkage.h> #include <common.h> #include <linux/sizes.h> #include <memory.h> @@ -318,6 +319,8 @@ static int efi_init(void) } device_initcall(efi_init); +asmlinkage efi_status_t efi_main(efi_handle_t, efi_system_table_t *); + /** * efi-main - Entry point for EFI images */ |