diff options
| author | Peter Jones <pjones@redhat.com> | 2021-02-14 14:48:10 -0500 |
|---|---|---|
| committer | Peter Jones <pjones@redhat.com> | 2021-02-25 10:15:14 -0500 |
| commit | 46adaaf3cf7cc853790343dd7f14a42c80078b28 (patch) | |
| tree | d2cc135a9f1a46b570ef9bc75febc83020cc0e9d | |
| parent | 1a6f9b807d2fad469035b25156cac94afda28751 (diff) | |
| download | efi-boot-shim-46adaaf3cf7cc853790343dd7f14a42c80078b28.tar.gz efi-boot-shim-46adaaf3cf7cc853790343dd7f14a42c80078b28.zip | |
includes: include all gnu-efi includes at one place.
Signed-off-by: Peter Jones <pjones@redhat.com>
| -rw-r--r-- | include/errors.h | 2 | ||||
| -rw-r--r-- | include/guid.h | 2 | ||||
| -rw-r--r-- | include/ip4config2.h | 2 | ||||
| -rw-r--r-- | include/ip6config.h | 2 | ||||
| -rw-r--r-- | include/tpm.h | 2 | ||||
| -rw-r--r-- | shim.h | 3 | ||||
| -rw-r--r-- | version.c.in | 2 | ||||
| -rw-r--r-- | version.h | 2 |
8 files changed, 4 insertions, 13 deletions
diff --git a/include/errors.h b/include/errors.h index 1c6cf528..67d821e0 100644 --- a/include/errors.h +++ b/include/errors.h @@ -3,8 +3,6 @@ #ifndef SHIM_ERRORS_H #define SHIM_ERRORS_H -#include <efierr.h> - #ifndef EFI_INCOMPATIBLE_VERSION #define EFI_INCOMPATIBLE_VERSION EFIERR(25) #endif diff --git a/include/guid.h b/include/guid.h index 114e8707..07a19a91 100644 --- a/include/guid.h +++ b/include/guid.h @@ -3,8 +3,6 @@ #ifndef SHIM_GUID_H #define SHIM_GUID_H -#include <efi.h> - extern EFI_GUID BDS_GUID; extern EFI_GUID GV_GUID; extern EFI_GUID SIG_DB; diff --git a/include/ip4config2.h b/include/ip4config2.h index 0955bc26..8fd8dfcb 100644 --- a/include/ip4config2.h +++ b/include/ip4config2.h @@ -9,8 +9,6 @@ #ifndef SHIM_IP4CONFIG2_H #define SHIM_IP4CONFIG2_H -#include <efiip.h> - typedef struct _EFI_IP4_CONFIG2_PROTOCOL EFI_IP4_CONFIG2_PROTOCOL; diff --git a/include/ip6config.h b/include/ip6config.h index 8d9025b7..58cef532 100644 --- a/include/ip6config.h +++ b/include/ip6config.h @@ -8,8 +8,6 @@ #ifndef SHIM_IP6CONFIG_H #define SHIM_IP6CONFIG_H -#include <efiip.h> - typedef struct _EFI_IP6_CONFIG_PROTOCOL EFI_IP6_CONFIG_PROTOCOL; /// diff --git a/include/tpm.h b/include/tpm.h index cab1939a..877d4f93 100644 --- a/include/tpm.h +++ b/include/tpm.h @@ -3,8 +3,6 @@ #ifndef SHIM_TPM_H #define SHIM_TPM_H -#include <efilib.h> - #define TPM_ALG_SHA 0x00000004 EFI_STATUS tpm_log_event(EFI_PHYSICAL_ADDRESS buf, UINTN size, UINT8 pcr, @@ -29,6 +29,8 @@ #include <efi.h> #include <efilib.h> #undef uefi_call_wrapper +#include <efierr.h> +#include <efiip.h> #include <stddef.h> #include <stdint.h> @@ -146,7 +148,6 @@ #include "include/tpm.h" #include "include/ucs2.h" #include "include/variables.h" -#include "include/sbat.h" #include "version.h" diff --git a/version.c.in b/version.c.in index 71509cdf..134acc0c 100644 --- a/version.c.in +++ b/version.c.in @@ -1,5 +1,7 @@ // SPDX-License-Identifier: BSD-2-Clause-Patent +#include <efi.h> + #include "version.h" CHAR8 shim_version[] __attribute__((section (".data.ident"))) = @@ -3,8 +3,6 @@ #ifndef _SHIM_VERSION_H #define _SHIM_VERSION_H 1 -#include <efi.h> - extern CHAR8 shim_version[]; #endif /* SHIM_VERSION_H */ |