[efi] Centralise EFI file system info GUIDs

Signed-off-by: Michael Brown <mcb30@ipxe.org>

diff --git a/src/include/ipxe/efi/efi.h b/src/include/ipxe/efi/efi.h
index 40d3beb12f42057be660182ae695cea64605a34a..390d4e6e65979a3321649ecb6c026f0bef006636 100644 (file)
--- a/src/include/ipxe/efi/efi.h
+++ b/src/include/ipxe/efi/efi.h
@@ -205,6 +205,9 @@ extern EFI_GUID efi_usb2_hc_protocol_guid;
 extern EFI_GUID efi_usb_io_protocol_guid;
 extern EFI_GUID efi_vlan_config_protocol_guid;
 
+extern EFI_GUID efi_file_info_id;
+extern EFI_GUID efi_file_system_info_id;
+
 extern EFI_HANDLE efi_image_handle;
 extern EFI_LOADED_IMAGE_PROTOCOL *efi_loaded_image;
 extern EFI_DEVICE_PATH_PROTOCOL *efi_loaded_image_path;

diff --git a/src/interface/efi/efi_file.c b/src/interface/efi/efi_file.c
index 05eadc97141bb4344b3a9a81bbf5809b2c49d09c..52de0987cea28b9a20d698b1757ccdf99cb5c08c 100644 (file)
--- a/src/interface/efi/efi_file.c
+++ b/src/interface/efi/efi_file.c
@@ -47,12 +47,6 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 #include <ipxe/efi/efi_strings.h>
 #include <ipxe/efi/efi_file.h>
 
-/** EFI file information GUID */
-static EFI_GUID efi_file_info_id = EFI_FILE_INFO_ID;
-
-/** EFI file system information GUID */
-static EFI_GUID efi_file_system_info_id = EFI_FILE_SYSTEM_INFO_ID;
-
 /** EFI media ID */
 #define EFI_MEDIA_ID_MAGIC 0x69505845
 

diff --git a/src/interface/efi/efi_guid.c b/src/interface/efi/efi_guid.c
index 8ec5e541d9770c9a3316268f55d6a76c0c5046b0..39da5efe04d98a4a5d2d257b6e2ced7ba68c1d2a 100644 (file)
--- a/src/interface/efi/efi_guid.c
+++ b/src/interface/efi/efi_guid.c
@@ -66,6 +66,8 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 #include <ipxe/efi/Protocol/Usb2HostController.h>
 #include <ipxe/efi/Protocol/UsbIo.h>
 #include <ipxe/efi/Protocol/VlanConfig.h>
+#include <ipxe/efi/Guid/FileInfo.h>
+#include <ipxe/efi/Guid/FileSystemInfo.h>
 
 /** @file
  *
@@ -281,3 +283,9 @@ EFI_GUID efi_usb_io_protocol_guid
 /** VLAN configuration protocol GUID */
 EFI_GUID efi_vlan_config_protocol_guid
        = EFI_VLAN_CONFIG_PROTOCOL_GUID;
+
+/** File information GUID */
+EFI_GUID efi_file_info_id = EFI_FILE_INFO_ID;
+
+/** File system information GUID */
+EFI_GUID efi_file_system_info_id = EFI_FILE_SYSTEM_INFO_ID;