From 255b83725c8815308540ea316d2c18993b12b838 Mon Sep 17 00:00:00 2001
From: Toomas Soome <tsoome@FreeBSD.org>
Date: Thu, 15 Mar 2018 05:58:35 +0000
Subject: [PATCH] libefi: UEFI_BOOT_VAR_GUID duplicates EFI_GLOBAL_VARIABLE

Drop UEFI_BOOT_VAR_GUID and use EFI_GLOBAL_VARIABLE.

Reviewed by:	imp
Differential Revision:	https://reviews.freebsd.org/D14696
---
 stand/efi/include/efi.h   | 2 --
 stand/efi/libefi/efienv.c | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/stand/efi/include/efi.h b/stand/efi/include/efi.h
index 9164ec9d644f..a91e8813c184 100644
--- a/stand/efi/include/efi.h
+++ b/stand/efi/include/efi.h
@@ -59,7 +59,5 @@ Revision History
  */
 #define FREEBSD_BOOT_VAR_GUID \
 	{ 0xCFEE69AD, 0xA0DE, 0x47A9, {0x93, 0xA8, 0xF6, 0x31, 0x06, 0xF8, 0xAE, 0x99} }
-#define UEFI_BOOT_VAR_GUID \
-	{ 0x8be4df61, 0x93ca, 0x11d2, {0xaa, 0x0d, 0x00, 0xe0, 0x98, 0x03, 0x2b, 0x8c} }
 
 #endif
diff --git a/stand/efi/libefi/efienv.c b/stand/efi/libefi/efienv.c
index cc9f370c2ffc..1ee6beeb518f 100644
--- a/stand/efi/libefi/efienv.c
+++ b/stand/efi/libefi/efienv.c
@@ -33,7 +33,7 @@ __FBSDID("$FreeBSD$");
 #include <efilib.h>
 
 static EFI_GUID FreeBSDBootVarGUID = FREEBSD_BOOT_VAR_GUID;
-static EFI_GUID GlobalBootVarGUID = UEFI_BOOT_VAR_GUID;
+static EFI_GUID GlobalBootVarGUID = EFI_GLOBAL_VARIABLE;
 
 EFI_STATUS
 efi_getenv(EFI_GUID *g, const char *v, void *data, size_t *len)