diff mbox series

[Concept,10/18] efi: Move FDT and global-variable GUIDs to common files

Message ID 20250820004039.3920254-11-sjg@u-boot.org
State New
Headers
Series efi: Move towards the EFI app booting EFI applications |

Commit Message

Simon Glass Aug. 20, 2025, 12:40 a.m. UTC 
  From: Simon Glass <sjg@chromium.org>

The global-variable GUID is already set in the common device_path.c file
but its declaration is only in the efi_loader header.

Move it and also move over the FDT GUIDs.

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

 include/efi.h                 | 3 +++
 include/efi_loader.h          | 3 ---
 lib/efi/device_path.c         | 2 ++
 lib/efi_loader/efi_boottime.c | 2 --
 4 files changed, 5 insertions(+), 5 deletions(-)
diff mbox series

Patch

diff --git a/include/efi.h b/include/efi.h
index 742c40bfd8c..ed22ff9a5a4 100644
--- a/include/efi.h
+++ b/include/efi.h
@@ -152,6 +152,9 @@  typedef struct efi_object *efi_handle_t;
 		(c) & 0xff, ((c) >> 8) & 0xff, \
 		(d0), (d1), (d2), (d3), (d4), (d5), (d6), (d7) } }
 
+extern const efi_guid_t efi_global_variable_guid;
+extern const efi_guid_t efi_guid_fdt;
+
 /* Generic EFI table header */
 struct efi_table_hdr {
 	u64 signature;
diff --git a/include/efi_loader.h b/include/efi_loader.h
index b57196da8da..c4d9c4f1c7c 100644
--- a/include/efi_loader.h
+++ b/include/efi_loader.h
@@ -317,7 +317,6 @@  extern const efi_guid_t efi_guid_host_dev;
 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_global_variable_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 */
@@ -336,8 +335,6 @@  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;
-/* GUID of the device tree table */
-extern const efi_guid_t efi_guid_fdt;
 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;
diff --git a/lib/efi/device_path.c b/lib/efi/device_path.c
index fb6653b23a3..db5a686ccb2 100644
--- a/lib/efi/device_path.c
+++ b/lib/efi/device_path.c
@@ -32,6 +32,8 @@  const efi_guid_t efi_simple_file_system_protocol_guid =
 		EFI_SIMPLE_FILE_SYSTEM_PROTOCOL_GUID;
 const efi_guid_t efi_file_info_guid = EFI_FILE_INFO_GUID;
 const efi_guid_t efi_u_boot_guid = U_BOOT_GUID;
+/* GUID of the device tree table */
+const efi_guid_t efi_guid_fdt = EFI_FDT_GUID;
 
 /* template EFI_DP_END node: */
 const struct efi_device_path EFI_DP_END = {
diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c
index 8ba42ec4544..0f9a654ca03 100644
--- a/lib/efi_loader/efi_boottime.c
+++ b/lib/efi_loader/efi_boottime.c
@@ -68,8 +68,6 @@  efi_status_t efi_uninstall_protocol
 /* 1 if inside U-Boot code, 0 if inside EFI payload code */
 static int entry_count = 1;
 static int nesting_level;
-/* GUID of the device tree table */
-const efi_guid_t efi_guid_fdt = EFI_FDT_GUID;
 /* GUID of the EFI_DRIVER_BINDING_PROTOCOL */
 const efi_guid_t efi_guid_driver_binding_protocol =
 			EFI_DRIVER_BINDING_PROTOCOL_GUID;