diff mbox series

[Concept,06/18] efi: Move loaded-image, fs and device-path GUIDs to common

Message ID 20250902152158.2285264-7-sjg@u-boot.org
State New
Headers
Series efi: Improve integration of the app with a Shim environment |

Commit Message

Simon Glass Sept. 2, 2025, 3:21 p.m. UTC 
  From: Simon Glass <sjg@chromium.org>

Allow these to be used from the app, when EFI_LOADER is disabled.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

 include/efi.h        | 6 ++++++
 include/efi_loader.h | 4 ----
 2 files changed, 6 insertions(+), 4 deletions(-)
diff mbox series

Patch

diff --git a/include/efi.h b/include/efi.h
index 6caa51c38a7..e9ca4840352 100644
--- a/include/efi.h
+++ b/include/efi.h
@@ -171,6 +171,12 @@  extern const efi_guid_t efi_guid_image_security_database;
 /* Access to Shim variables */
 extern const efi_guid_t efi_shim_lock;
 
+extern const efi_guid_t efi_guid_loaded_image;
+extern const efi_guid_t efi_guid_loaded_image_device_path;
+extern const efi_guid_t efi_guid_device_path;
+
+extern const efi_guid_t efi_simple_file_system_protocol_guid;
+
 /* Generic EFI table header */
 struct efi_table_hdr {
 	u64 signature;
diff --git a/include/efi_loader.h b/include/efi_loader.h
index 57bf508adb9..2caaaf56e3e 100644
--- a/include/efi_loader.h
+++ b/include/efi_loader.h
@@ -316,7 +316,6 @@  extern const efi_guid_t efi_block_io_guid;
 /* GUID of the EFI_SIMPLE_NETWORK_PROTOCOL */
 extern const efi_guid_t efi_net_guid;
 extern const efi_guid_t efi_guid_console_control;
-extern const efi_guid_t efi_guid_device_path;
 /* GUID of the EFI system partition */
 extern const efi_guid_t efi_system_partition_guid;
 /* event group ExitBootServices() invoked */
@@ -331,10 +330,7 @@  extern const efi_guid_t efi_guid_event_group_ready_to_boot;
 extern const efi_guid_t efi_guid_event_group_reset_system;
 /* event group return to efibootmgr */
 extern const efi_guid_t efi_guid_event_group_return_to_efibootmgr;
-extern const efi_guid_t efi_guid_loaded_image;
-extern const efi_guid_t efi_guid_loaded_image_device_path;
 extern const efi_guid_t efi_guid_device_path_to_text_protocol;
-extern const efi_guid_t efi_simple_file_system_protocol_guid;
 extern const efi_guid_t efi_file_info_guid;
 /* GUID for file system information */
 extern const efi_guid_t efi_file_system_info_guid;