16395 loader.efi: update UEFI headers and clean up duplicated GUIDs

Reviewed by: Jason King <[email protected]>
Approved by: Patrick Mooney <[email protected]>

Author: tsoome

exception_lists/cstyle

@@ -1260,3 +1260,15 @@ usr/src/uts/intel/io/vmm/amd/ivrs_*.c
 usr/src/uts/intel/sys/vmm.h
 usr/src/uts/intel/sys/vmm_dev.h
 usr/src/lib/lib9p/common/*
+
+# loader UEFI headers
+usr/src/boot/efi/include/Base.h
+usr/src/boot/efi/include/amd64/*.h
+usr/src/boot/efi/include/arm/*.h
+usr/src/boot/efi/include/arm64/*.h
+usr/src/boot/efi/include/i386/*.h
+usr/src/boot/efi/include/Guid/*.h
+usr/src/boot/efi/include/IndustryStandard/*.h
+usr/src/boot/efi/include/Pi/*.h
+usr/src/boot/efi/include/Protocol/*.h
+usr/src/boot/efi/include/Uefi/*.h

exception_lists/hdrchk

@@ -439,3 +439,14 @@ usr/src/uts/intel/io/vmm/x86.h
 usr/src/uts/intel/sys/vmm.h
 usr/src/uts/intel/sys/vmm_dev.h
 usr/src/lib/lib9p/common/*
+
+# loader UEFI headers
+usr/src/boot/efi/include/amd64/*.h
+usr/src/boot/efi/include/arm/*.h
+usr/src/boot/efi/include/arm64/*.h
+usr/src/boot/efi/include/i386/*.h
+usr/src/boot/efi/include/Guid/*.h
+usr/src/boot/efi/include/IndustryStandard/*.h
+usr/src/boot/efi/include/Pi/*.h
+usr/src/boot/efi/include/Protocol/*.h
+usr/src/boot/efi/include/Uefi/*.h

usr/src/boot/Makefile.version

@@ -34,4 +34,4 @@ LOADER_VERSION = 1.1
 # Use date like formatting here, YYYY.MM.DD.XX, without leading zeroes.
 # The version is processed from left to right, the version number can only
 # be increased.
-BOOT_VERSION = $(LOADER_VERSION)-2024.03.03.1
+BOOT_VERSION = $(LOADER_VERSION)-2024.03.12.1

usr/src/boot/common/gfx_fb.c

@@ -76,6 +76,7 @@
 #if defined(EFI)
 #include <efi.h>
 #include <efilib.h>
+#include <Protocol/GraphicsOutput.h>
 #else
 #include <btxv86.h>
 #include <vbe.h>
@@ -865,7 +866,7 @@ gfxfb_blt(void *BltBuffer, GFXFB_BLT_OPERATION BltOperation,
 #if defined(EFI)
 	EFI_STATUS status;
 	EFI_TPL tpl;
-	extern EFI_GRAPHICS_OUTPUT *gop;
+	extern EFI_GRAPHICS_OUTPUT_PROTOCOL *gop;
 
 	/*
 	 * We assume Blt() does work, if not, we will need to build