Index: head/stand/efi/include/efi.h
===================================================================
--- head/stand/efi/include/efi.h	(revision 330969)
+++ head/stand/efi/include/efi.h	(revision 330970)
@@ -1,65 +1,63 @@
 /* $FreeBSD$ */
 /*++
 
 Copyright (c)  1999 - 2002 Intel Corporation. All rights reserved
 This software and associated documentation (if any) is furnished
 under a license and may only be used or copied in accordance
 with the terms of the license. Except as permitted by such
 license, no part of this software or documentation may be
 reproduced, stored in a retrieval system, or transmitted in any
 form or by any means without the express written consent of
 Intel Corporation.
 
 Module Name:
 
     efi.h
 
 Abstract:
 
     Public EFI header files
 
 
 
 Revision History
 
 --*/
 
 //
 // Build flags on input
 //  EFI32
 //  EFI_DEBUG               - Enable debugging code
 //  EFI_NT_EMULATOR         - Building for running under NT
 //
 
 
 #ifndef _EFI_INCLUDE_
 #define _EFI_INCLUDE_
 
 #define EFI_FIRMWARE_VENDOR         L"INTEL"
 #define EFI_FIRMWARE_MAJOR_REVISION 14
 #define EFI_FIRMWARE_MINOR_REVISION 62
 #define EFI_FIRMWARE_REVISION ((EFI_FIRMWARE_MAJOR_REVISION <<16) | (EFI_FIRMWARE_MINOR_REVISION))
 
 #include "efibind.h"
 #include "efidef.h"
 #include "efidevp.h"
 #include "efiprot.h"
 #include "eficon.h"
 #include "efiser.h"
 #include "efi_nii.h"
 #include "efipxebc.h"
 #include "efinet.h"
 #include "efiapi.h"
 #include "efifs.h"
 #include "efierr.h"
 #include "efigop.h"
 
 /*
  * FreeBSD UUID
  */
 #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
Index: head/stand/efi/libefi/efienv.c
===================================================================
--- head/stand/efi/libefi/efienv.c	(revision 330969)
+++ head/stand/efi/libefi/efienv.c	(revision 330970)
@@ -1,87 +1,87 @@
 /*-
  * Copyright (c) 2018 Netflix, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
 #include <stand.h>
 #include <efi.h>
 #include <efichar.h>
 #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)
 {
 	size_t ul;
 	CHAR16 *uv;
 	UINT32 attr;
 	UINTN dl;
 	EFI_STATUS rv;
 
 	uv = NULL;
 	if (utf8_to_ucs2(v, &uv, &ul) != 0)
 		return (EFI_OUT_OF_RESOURCES);
 	dl = *len;
 	rv = RS->GetVariable(uv, g, &attr, &dl, data);
 	if (rv == EFI_SUCCESS)
 		*len = dl;
 	free(uv);
 	return (rv);
 }
 
 EFI_STATUS
 efi_global_getenv(const char *v, void *data, size_t *len)
 {
 
 	return (efi_getenv(&GlobalBootVarGUID, v, data, len));
 }
 
 EFI_STATUS
 efi_freebsd_getenv(const char *v, void *data, size_t *len)
 {
 
 	return (efi_getenv(&FreeBSDBootVarGUID, v, data, len));
 }
 
 EFI_STATUS
 efi_setenv_freebsd_wcs(const char *varname, CHAR16 *valstr)
 {
 	CHAR16 *var = NULL;
 	size_t len;
 	EFI_STATUS rv;
 
 	if (utf8_to_ucs2(varname, &var, &len) != 0)
 		return (EFI_OUT_OF_RESOURCES);
 	rv = RS->SetVariable(var, &FreeBSDBootVarGUID,
 	    EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,
 	    (ucs2len(valstr) + 1) * sizeof(efi_char), valstr);
 	free(var);
 	return (rv);
 }