From 09e48b3d17468d15e89f023c5086f0d9425a3003 Mon Sep 17 00:00:00 2001 From: Ahmad Fatoum Date: Mon, 22 Nov 2021 09:47:15 +0100 Subject: efi: rename to The split between and is confusing: The former contains universal definitions, while the latter contains barebox utilities on top. To make the distinction clear, rename to as it's used for EFI payloads. Signed-off-by: Ahmad Fatoum Link: https://lore.barebox.org/20211122084732.2597109-14-a.fatoum@pengutronix.de Signed-off-by: Sascha Hauer --- include/efi/debug_ll.h | 2 +- include/efi/efi-payload.h | 24 ++++++++++++++++++++++++ include/efi/efi.h | 24 ------------------------ 3 files changed, 25 insertions(+), 25 deletions(-) create mode 100644 include/efi/efi-payload.h delete mode 100644 include/efi/efi.h (limited to 'include') diff --git a/include/efi/debug_ll.h b/include/efi/debug_ll.h index 905f1c43cd..279e8995f2 100644 --- a/include/efi/debug_ll.h +++ b/include/efi/debug_ll.h @@ -6,7 +6,7 @@ #define EFI_DEBUG_CLEAR_MEMORY 0 #include -#include +#include static inline void PUTC_LL(char c) { diff --git a/include/efi/efi-payload.h b/include/efi/efi-payload.h new file mode 100644 index 0000000000..a2daff08bb --- /dev/null +++ b/include/efi/efi-payload.h @@ -0,0 +1,24 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef __EFI_PAYLOAD_H +#define __EFI_PAYLOAD_H + +#include +#include + +extern efi_system_table_t *efi_sys_table; +extern efi_handle_t efi_parent_image; +extern struct efi_device_path *efi_device_path; +extern efi_loaded_image_t *efi_loaded_image; + +void *efi_get_variable(char *name, efi_guid_t *vendor, int *var_size); + +static inline void *efi_get_global_var(char *name, int *var_size) +{ + return efi_get_variable(name, &efi_global_variable_guid, var_size); +} + +int efi_set_variable(char *name, efi_guid_t *vendor, uint32_t attributes, + void *buf, unsigned long size); +int efi_set_variable_usec(char *name, efi_guid_t *vendor, uint64_t usec); + +#endif diff --git a/include/efi/efi.h b/include/efi/efi.h deleted file mode 100644 index e77b1c5feb..0000000000 --- a/include/efi/efi.h +++ /dev/null @@ -1,24 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -#ifndef __MACH_EFI_H -#define __MACH_EFI_H - -#include -#include - -extern efi_system_table_t *efi_sys_table; -extern efi_handle_t efi_parent_image; -extern struct efi_device_path *efi_device_path; -extern efi_loaded_image_t *efi_loaded_image; - -void *efi_get_variable(char *name, efi_guid_t *vendor, int *var_size); - -static inline void *efi_get_global_var(char *name, int *var_size) -{ - return efi_get_variable(name, &efi_global_variable_guid, var_size); -} - -int efi_set_variable(char *name, efi_guid_t *vendor, uint32_t attributes, - void *buf, unsigned long size); -int efi_set_variable_usec(char *name, efi_guid_t *vendor, uint64_t usec); - -#endif /* __MACH_EFI_H */ -- cgit v1.2.3